feat: ✨ Implement co-location using markers

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["alvr/*"]
 
 [workspace.package]
-version = "21.0.0-dev12"
+version = "21.0.0-dev13"
 edition = "2024"
 rust-version = "1.88"
 authors = ["alvr-org"]

alvr/client_core/src/c_api.rs

@@ -498,6 +498,7 @@ pub extern "C" fn alvr_send_tracking(
                 ..Default::default()
             },
             body: None,
+            markers: Vec::new(),
         });
     }
 }
@@ -750,7 +751,7 @@ pub extern "C" fn alvr_render_lobby_opengl(
                     },
                 ],
                 None,
-                None,
+                vec![],
                 render_background,
                 false,
             );

alvr/client_mock/src/main.rs

@@ -176,6 +176,7 @@ fn tracking_thread(
             hand_skeletons: [None, None],
             face: FaceData::default(),
             body: None,
+            markers: vec![],
         });
 
         drop(input_lock);

alvr/client_openxr/Cargo.toml

@@ -17,7 +17,7 @@ alvr_packets.workspace = true
 alvr_session.workspace = true
 alvr_system_info.workspace = true
 
-openxr = { git = "https://github.com/zmerp/openxrs", rev = "e7c1b155e79ff8b58c2f6558d28e1398ebe08d2d" }
+openxr = { git = "https://github.com/zmerp/openxrs", rev = "1da16a72829a2caba68aebdca44fa8605d51554d" }
 
 [target.'cfg(target_os = "android")'.dependencies]
 android-activity = { version = "0.6", features = ["native-activity"] }
@@ -125,6 +125,10 @@ name = "com.oculus.permission.FACE_TRACKING"
 [[package.metadata.android.uses_permission]]
 name = "com.oculus.permission.HAND_TRACKING"
 [[package.metadata.android.uses_permission]]
+name = "com.oculus.permission.USE_ANCHOR_API"
+[[package.metadata.android.uses_permission]]
+name = "com.oculus.permission.USE_SCENE"
+[[package.metadata.android.uses_permission]]
 name = "com.oculus.permission.WIFI_LOCK"
 [[package.metadata.android.application.meta_data]]
 name = "com.oculus.intent.category.VR"
@@ -212,23 +216,24 @@ name = "com.ultraleap.openxr.api_layer"
 [[package.metadata.android.uses_feature]]
 name = "android.software.xr.api.spatial"
 required = true
-
 [[package.metadata.android.uses_feature]]
 name = "android.software.xr.api.openxr"
 required = true
-
 [[package.metadata.android.uses_feature]]
 name = "android.software.xr.input.controller"
 required = false
-
 [[package.metadata.android.uses_feature]]
 name = "android.software.xr.input.hand_tracking"
 required = false
-
 [[package.metadata.android.uses_feature]]
 name = "android.software.xr.input.eye_tracking"
 required = false
 
+[[package.metadata.android.uses_permission]]
+name = "android.permission.SCENE_UNDERSTANDING"
+[[package.metadata.android.uses_permission]]
+name = "android.permission.SCENE_UNDERSTANDING_COARSE"
+
 [[package.metadata.android.application.uses_native_library]]
 name = "libopenxr.google.so"
 required = false

alvr/client_openxr/src/extra_extensions/mod.rs

@@ -9,6 +9,7 @@ mod motion_tracking_bd;
 mod multimodal_input;
 mod passthrough_fb;
 mod passthrough_htc;
+mod spatial_marker_tracking;
 
 pub use body_tracking_bd::*;
 pub use body_tracking_fb::*;
@@ -21,10 +22,11 @@ pub use motion_tracking_bd::*;
 pub use multimodal_input::*;
 pub use passthrough_fb::*;
 pub use passthrough_htc::*;
-use std::ffi::CString;
-use std::mem;
+pub use spatial_marker_tracking::*;
 
-use openxr::{self as xr, sys};
+use openxr::{self as xr, AsHandle, sys};
+use std::ffi::CString;
+use std::{mem, ptr};
 
 fn xr_res(result: sys::Result) -> xr::Result<()> {
     if result.into_raw() >= 0 {
@@ -70,3 +72,26 @@ fn get_instance_proc<G, FnTy>(session: &xr::Session<G>, method_name: &str) -> xr
             .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)
     }
 }
+
+fn check_future(instance: &xr::Instance, future: sys::FutureEXT) -> xr::Result<bool> {
+    let future_ext = instance
+        .exts()
+        .ext_future
+        .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)?;
+
+    let future_poll_info = sys::FuturePollInfoEXT {
+        ty: xr::StructureType::FUTURE_POLL_INFO_EXT,
+        next: ptr::null(),
+        future,
+    };
+    let mut future_poll_result = sys::FuturePollResultEXT::out(ptr::null_mut());
+    unsafe {
+        xr_res((future_ext.poll_future)(
+            instance.as_handle(),
+            &future_poll_info,
+            future_poll_result.as_mut_ptr(),
+        ))?;
+
+        Ok(future_poll_result.assume_init().state == xr::FutureStateEXT::READY)
+    }
+}