feat(client_openxr): ✨ Upgrade to FB face tracking 2

alvr-org · Dec 20, 2023 · 36f7483 · 36f7483
1 parent ff7bbc7
commit 36f7483
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/alvr/client_openxr/Cargo.toml b/alvr/client_openxr/Cargo.toml
@@ -17,7 +17,7 @@ alvr_session.workspace = true
 
 glow = "0.13"
 khronos-egl = { version = "6", features = ["dynamic"] }
-openxr = { git = "https://github.com/zarik5/openxrs" }
+openxr = { git = "https://github.com/alvr-org/openxrs" }
 # openxr = { path = "../../../../openxrs/openxr" }
 
 [target.'cfg(target_os = "android")'.dependencies]

diff --git a/alvr/client_openxr/src/interaction.rs b/alvr/client_openxr/src/interaction.rs
@@ -23,7 +23,7 @@ pub struct HandInteraction {
 pub struct FaceSources {
     pub combined_eyes_source: Option<(xr::Action<xr::Posef>, xr::Space)>,
     pub eye_tracker_fb: Option<xr::EyeTrackerSocial>,
-    pub face_tracker_fb: Option<xr::FaceTrackerFB>,
+    pub face_tracker_fb: Option<xr::FaceTracker2FB>,
     pub eye_tracker_htc: Option<xr::FacialTrackerHTC>,
     pub lip_tracker_htc: Option<xr::FacialTrackerHTC>,
 }
@@ -240,12 +240,12 @@ pub fn initialize_interaction(
         .as_ref()
         .map(|s| s.face_tracking_fb)
         .unwrap_or(false)
-        && xr_ctx.instance.exts().fb_face_tracking.is_some()
+        && xr_ctx.instance.exts().fb_face_tracking2.is_some()
         && xr_ctx
             .instance
-            .supports_fb_face_tracking(xr_ctx.system)
+            .supports_fb_visual_face_tracking(xr_ctx.system)
             .unwrap())
-    .then(|| xr_ctx.session.create_face_tracker_fb().unwrap());
+    .then(|| xr_ctx.session.create_face_tracker2_fb(true, false).unwrap());
 
     let eye_tracker_htc = (face_tracking_sources
         .as_ref()

diff --git a/alvr/client_openxr/src/lib.rs b/alvr/client_openxr/src/lib.rs
@@ -607,7 +607,7 @@ pub fn entry_point() {
     exts.fb_color_space = available_extensions.fb_color_space;
     exts.fb_display_refresh_rate = available_extensions.fb_display_refresh_rate;
     exts.fb_eye_tracking_social = available_extensions.fb_eye_tracking_social;
-    exts.fb_face_tracking = available_extensions.fb_face_tracking;
+    exts.fb_face_tracking2 = available_extensions.fb_face_tracking2;
     exts.fb_foveation = available_extensions.fb_foveation;
     exts.fb_foveation_configuration = available_extensions.fb_foveation_configuration;
     exts.fb_swapchain_update_state = available_extensions.fb_swapchain_update_state;

diff --git a/alvr/server/src/face_tracking.rs b/alvr/server/src/face_tracking.rs
@@ -131,7 +131,7 @@ impl FaceTrackingSink {
                 }
 
                 if let Some(arr) = face_data.fb_face_expression {
-                    self.append_packet_vrcft(b"FaceFb\0\0", &arr);
+                    self.append_packet_vrcft(b"Face2Fb\0", &arr);
                 }
 
                 if let Some(arr) = face_data.htc_eye_expression {