Merge branch 'webxr-refactor' into spatial_existence

crates/bevy_openxr/src/openxr/features/overlay.rs

@@ -1,6 +1,7 @@
 use std::{mem, ptr};
 
 use bevy::prelude::*;
+use bevy_xr::session::session_available;
 use openxr::sys;
 
 use crate::{
@@ -15,7 +16,7 @@ impl Plugin for OxrOverlayPlugin {
     fn build(&self, app: &mut bevy::prelude::App) {
         app.add_event::<OxrOverlaySessionEvent>();
         app.init_resource::<OxrOverlaySettings>();
-        app.add_systems(First, add_overlay_info_to_chain);
+        app.add_systems(First, add_overlay_info_to_chain.run_if(session_available));
     }
 }
 

crates/bevy_xr_utils/src/xr_utils_actions.rs

@@ -60,7 +60,8 @@ use bevy_openxr::{
     resources::OxrInstance, session::OxrSession,
 };
 use bevy_xr::session::{session_available, session_running};
-use openxr::{Path, Vector2f};
+use openxr::{ActiveActionSet, Path, Vector2f};
+
 use std::borrow::Cow;
 
 pub struct XRUtilsActionsPlugin;
@@ -76,30 +77,30 @@ impl Plugin for XRUtilsActionsPlugin {
         );
         app.add_systems(
             Startup,
-            create_openxr_events.in_set(XRUtilsActionSystemSet::CreateEvents),
+
-        );
+            create_openxr_events
-        app.add_systems(
+                .in_set(XRUtilsActionSystemSet::CreateEvents)
-            PreUpdate,
+                .run_if(session_available),
-            sync_active_action_sets.before(OxrActionSetSyncSet),
         );
+        app.add_systems(Update, sync_active_action_sets.run_if(session_running));
         app.add_systems(
             PreUpdate,
             sync_and_update_action_states_f32
-                .run_if(resource_exists::<OxrSession>)
+                .run_if(session_running)
                 .in_set(XRUtilsActionSystemSet::SyncActionStates)
                 .after(OxrActionSetSyncSet),
         );
         app.add_systems(
             PreUpdate,
             sync_and_update_action_states_bool
-                .run_if(resource_exists::<OxrSession>)
+                .run_if(session_running)
                 .in_set(XRUtilsActionSystemSet::SyncActionStates)
                 .after(OxrActionSetSyncSet),
         );
         app.add_systems(
             PreUpdate,
             sync_and_update_action_states_vector
-                .run_if(resource_exists::<OxrSession>)
+                .run_if(session_running)
                 .in_set(XRUtilsActionSystemSet::SyncActionStates)
                 .after(OxrActionSetSyncSet),
         );