Fix impl + update every frame

zmerp · zmerp · commit bf0e6886a696 · 2025-12-08T19:56:53.000+10:00
diff --git a/alvr/client_openxr/src/extra_extensions/spatial_marker_tracking.rs b/alvr/client_openxr/src/extra_extensions/spatial_marker_tracking.rs
diff --git a/alvr/client_openxr/src/interaction.rs b/alvr/client_openxr/src/interaction.rs
@@ -8,14 +8,11 @@ use crate::{
 };
 use alvr_common::{
     glam::{Quat, Vec3},
-    settings_schema::Switch,
     *,
 };
 use alvr_graphics::HandData;
 use alvr_packets::{ButtonEntry, ButtonValue, FaceData, FaceExpressions, StreamConfig};
-use alvr_session::{
-    BodyTrackingBDConfig, BodyTrackingSourcesConfig, FaceTrackingSourcesConfig, RecenteringMode,
-};
+use alvr_session::{BodyTrackingBDConfig, BodyTrackingSourcesConfig, FaceTrackingSourcesConfig};
 use openxr as xr;
 use std::{
     collections::{HashMap, HashSet},
@@ -148,7 +145,7 @@ pub struct InteractionSourcesConfig {
     pub face_tracking: Option<FaceTrackingSourcesConfig>,
     pub body_tracking: Option<BodyTrackingSourcesConfig>,
     pub prefers_multimodal_input: bool,
-    pub initial_marker_discovery_state: bool,
+    pub markers_to_track: Option<HashSet<String>>,
 }
 
 impl InteractionSourcesConfig {
@@ -172,12 +169,12 @@ impl InteractionSourcesConfig {
                 .multimodal_tracking
                 .as_option()
                 .is_some_and(|c| c.enabled),
-            initial_marker_discovery_state: matches!(
-                config.settings.headset.recentering_mode,
-                RecenteringMode::Stage {
-                    marker_based_colocation: Switch::Enabled(_)
-                }
-            ),
+            markers_to_track: config
+                .settings
+                .headset
+                .marker_colocation
+                .as_option()
+                .map(|c| HashSet::from_iter([c.qr_code_string.clone()])),
         }
     }
 }
@@ -697,10 +694,12 @@ impl InteractionContext {
             }
         }
 
-        self.marker_spatial_context = check_ext_object(
-            "MarkerSpatialContext",
-            QRCodesSpatialContext::new(&self.xr_session, config.initial_marker_discovery_state),
-        );
+        self.marker_spatial_context = config.markers_to_track.as_ref().and_then(|strings| {
+            check_ext_object(
+                "QRCodesSpatialContext",
+                QRCodesSpatialContext::new(&self.xr_session, strings.clone()),
+            )
+        });
     }
 }
 
diff --git a/alvr/client_openxr/src/lib.rs b/alvr/client_openxr/src/lib.rs
@@ -26,7 +26,7 @@ use interaction::{InteractionContext, InteractionSourcesConfig};
 use lobby::Lobby;
 use openxr as xr;
 use passthrough::PassthroughLayer;
-use std::{ffi::CStr, path::Path, rc::Rc, sync::Arc, thread, time::Duration};
+use std::{collections::HashSet, ffi::CStr, path::Path, rc::Rc, sync::Arc, thread, time::Duration};
 use stream::StreamContext;
 
 fn from_xr_vec3(v: xr::Vector3f) -> Vec3 {
@@ -357,7 +357,7 @@ pub fn entry_point() {
             face_tracking: None,
             body_tracking: lobby_body_tracking_config,
             prefers_multimodal_input: true,
-            initial_marker_discovery_state: true,
+            markers_to_track: Some(HashSet::new()),
         };
         interaction_context
             .write()
@@ -510,9 +510,6 @@ pub fn entry_point() {
                         } else if config.passthrough.is_none() && passthrough_layer.is_some() {
                             passthrough_layer = None;
                         }
-                        if let Some(context) = &interaction_context.read().marker_spatial_context {
-                            context.set_discovery_enabled(config.marker_colocation);
-                        }
 
                         if let Some(stream) = &mut stream_context {
                             stream.update_real_time_config(&config);
diff --git a/alvr/packets/src/lib.rs b/alvr/packets/src/lib.rs
@@ -3,11 +3,9 @@ use alvr_common::{
     anyhow::Result,
     glam::{Quat, UVec2, Vec2},
     semver::Version,
-    settings_schema::Switch,
 };
 use alvr_session::{
-    ClientsidePostProcessingConfig, CodecType, PassthroughMode, RecenteringMode, SessionConfig,
-    Settings,
+    ClientsidePostProcessingConfig, CodecType, PassthroughMode, SessionConfig, Settings,
 };
 use serde::{Deserialize, Serialize};
 use serde_json as json;
@@ -330,7 +328,6 @@ pub enum FirewallRulesAction {
 pub struct RealTimeConfig {
     pub passthrough: Option<PassthroughMode>,
     pub clientside_post_processing: Option<ClientsidePostProcessingConfig>,
-    pub marker_colocation: bool,
     pub ext_str: String,
 }
 
@@ -343,12 +340,6 @@ impl RealTimeConfig {
                 .clientside_post_processing
                 .clone()
                 .into_option(),
-            marker_colocation: matches!(
-                settings.headset.recentering_mode,
-                RecenteringMode::Stage {
-                    marker_based_colocation: Switch::Enabled(_)
-                }
-            ),
             ext_str: String::new(), // No extensions for now
         }
     }
diff --git a/alvr/server_core/src/connection.rs b/alvr/server_core/src/connection.rs
@@ -25,7 +25,7 @@ use alvr_packets::{
 };
 use alvr_session::{
     BodyTrackingSinkConfig, CodecType, ControllersEmulationMode, FrameSize, H264Profile,
-    OpenvrConfig, RecenteringMode, SessionConfig, SocketProtocol,
+    OpenvrConfig, SessionConfig, SocketProtocol,
 };
 use alvr_sockets::{
     CONTROL_PORT, KEEPALIVE_INTERVAL, KEEPALIVE_TIMEOUT, PeerType, ProtoControlSocket,
@@ -1194,11 +1194,9 @@ fn connection_pipeline(
                         if !initial_settings.headset.tracking_ref_only {
                             let session_manager_lock = SESSION_MANAGER.read();
                             let config = &session_manager_lock.settings().headset;
-                            if !matches!(config.recentering_mode, RecenteringMode::Stage { .. }) {
-                                ctx.tracking_manager
-                                    .write()
-                                    .recenter(&config.recentering_mode);
-                            }
+                            ctx.tracking_manager
+                                .write()
+                                .recenter(&config.recentering_mode);
 
                             let area = packet.unwrap_or(Vec2::new(2.0, 2.0));
                             let wh = area.x * area.y;
diff --git a/alvr/server_core/src/tracking/mod.rs b/alvr/server_core/src/tracking/mod.rs
@@ -82,7 +82,7 @@ impl TrackingManager {
 
     pub fn recenter(&mut self, recentering_mode: &RecenteringMode) {
         let position = match recentering_mode {
-            RecenteringMode::Stage { .. } => Vec3::ZERO,
+            RecenteringMode::Stage => Vec3::ZERO,
             RecenteringMode::LocalFloor => {
                 let mut pos = self.last_head_pose.position;
                 pos.y = 0.0;
@@ -95,7 +95,7 @@ impl TrackingManager {
         };
 
         let orientation = match recentering_mode {
-            RecenteringMode::Stage { .. } => Quat::IDENTITY,
+            RecenteringMode::Stage => Quat::IDENTITY,
             RecenteringMode::LocalFloor | RecenteringMode::Local { .. } => {
                 let mut rot = self.last_head_pose.orientation;
                 // extract yaw rotation
@@ -452,10 +452,7 @@ pub fn tracking_loop(
             if !tracking.markers.is_empty() {
                 tracking_manager_lock.report_markers(tracking.markers);
 
-                if let RecenteringMode::Stage {
-                    marker_based_colocation: Switch::Enabled(config),
-                } = &headset_config.recentering_mode
-                {
+                if let Some(config) = headset_config.marker_colocation.as_option() {
                     tracking_manager_lock.recenter_from_marker(config);
                 };
             }
diff --git a/alvr/session/src/settings.rs b/alvr/session/src/settings.rs
@@ -1220,28 +1220,9 @@ Currently this cannot be reliably estimated automatically. The correct value sho
     pub button_mapping_config: AutomaticButtonMappingConfig,
 }
 
-#[derive(SettingsSchema, Serialize, Deserialize, Clone)]
-pub struct MarkerColocationConfig {
-    #[schema(strings(display_string = "QR Code string"))]
-    pub qr_code_string: String,
-
-    #[schema(strings(
-        help = r"Offset coordinate on the floor between the marker and the playspace origin.
-The height doesn't need to be measured"
-    ))]
-    #[schema(suffix = "m")]
-    pub floor_offset: [f32; 2],
-}
-
 #[derive(SettingsSchema, Serialize, Deserialize, Clone)]
 pub enum RecenteringMode {
-    Stage {
-        #[schema(strings(
-            help = "Use a QR code to synchronize the playspace origin between players.",
-            notice = "Print at https://www.qr-code-generator.com"
-        ))]
-        marker_based_colocation: Switch<MarkerColocationConfig>,
-    },
+    Stage,
     LocalFloor,
     Local {
         #[schema(gui(slider(min = 0.0, max = 3.0)), suffix = "m")]
@@ -1253,6 +1234,20 @@ pub enum RecenteringMode {
     },
 }
 
+#[derive(SettingsSchema, Serialize, Deserialize, Clone)]
+pub struct MarkerColocationConfig {
+    #[schema(strings(display_string = "QR Code string"))]
+    pub qr_code_string: String,
+
+    #[schema(flag = "real-time")]
+    #[schema(strings(
+        help = r"Offset coordinate on the floor between the marker and the playspace origin.
+The height of the marker doesn't need to be measured"
+    ))]
+    #[schema(suffix = "m")]
+    pub floor_offset: [f32; 2],
+}
+
 #[derive(SettingsSchema, Serialize, Deserialize, Clone, Copy)]
 pub struct MultimodalTracking {
     pub enabled: bool,
@@ -1277,6 +1272,13 @@ Tilted: the world gets tilted when long pressing the recentering button. This is
     #[schema(flag = "real-time")]
     pub recentering_mode: RecenteringMode,
 
+    #[schema(strings(
+        string = "Marker-based co-location",
+        help = "Use a QR code to synchronize the playspace origin between players.",
+        notice = "Print at https://www.qr-code-generator.com"
+    ))]
+    pub marker_colocation: Switch<MarkerColocationConfig>,
+
     #[schema(flag = "steamvr-restart")]
     pub controllers: Switch<ControllersConfig>,
 
@@ -2105,22 +2107,20 @@ pub fn session_settings_default() -> SettingsDefault {
                 },
             },
             recentering_mode: RecenteringModeDefault {
-                Stage: RecenteringModeStageDefault {
-                    marker_based_colocation: SwitchDefault {
-                        enabled: false,
-                        content: MarkerColocationConfigDefault {
-                            qr_code_string: String::new(),
-                            floor_offset: ArrayDefault {
-                                gui_collapsed: false,
-                                content: [0.0, 0.0],
-                            },
-                        },
-                    },
-                },
                 Local: RecenteringModeLocalDefault { view_height: 1.5 },
                 Tilted: RecenteringModeTiltedDefault { view_height: 1.5 },
                 variant: RecenteringModeDefaultVariant::LocalFloor,
             },
+            marker_colocation: SwitchDefault {
+                enabled: false,
+                content: MarkerColocationConfigDefault {
+                    qr_code_string: String::new(),
+                    floor_offset: ArrayDefault {
+                        gui_collapsed: false,
+                        content: [0.0, 0.0],
+                    },
+                },
+            },
             max_prediction_ms: 100,
         },
         connection: ConnectionConfigDefault {
