From 27871ccd0b7fd3860e90c4e4cbcbf0e0a43e7172 Mon Sep 17 00:00:00 2001
From: Schmarni <marnistromer@gmail.com>
Date: Mon, 29 Apr 2024 02:41:51 +0200
Subject: [PATCH] add a system to suggest action bindings and a system to
 attach action sets to the session

---
 crates/bevy_openxr/src/openxr/init.rs | 19 +++++++++++--------
 crates/bevy_openxr/src/openxr/mod.rs  |  4 ++++
 crates/bevy_xr/src/session.rs         | 11 +++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/crates/bevy_openxr/src/openxr/init.rs b/crates/bevy_openxr/src/openxr/init.rs
index 6073f33..a85f5e9 100644
--- a/crates/bevy_openxr/src/openxr/init.rs
+++ b/crates/bevy_openxr/src/openxr/init.rs
@@ -24,6 +24,7 @@ use bevy_xr::session::DestroyXrSession;
 use bevy_xr::session::EndXrSession;
 use bevy_xr::session::XrSharedStatus;
 use bevy_xr::session::XrStatus;
+use bevy_xr::session::XrStatusChanged;
 
 use crate::error::OxrError;
 use crate::graphics::*;
@@ -334,17 +335,15 @@ fn init_xr_session(
 
         preferred
     } else {
-        if let Some(config) = view_configuration_views.first() {
-            Some((
+        view_configuration_views.first().map(|config| {
+            (
                 UVec2::new(
                     config.recommended_image_rect_width,
                     config.recommended_image_rect_height,
                 ),
                 *config,
-            ))
-        } else {
-            None
-        }
+            )
+        })
     }
     .ok_or(OxrError::NoAvailableViewConfiguration)?;
 
@@ -499,7 +498,11 @@ pub fn transfer_xr_resources(mut commands: Commands, mut world: ResMut<MainWorld
 }
 
 /// Polls any OpenXR events and handles them accordingly
-pub fn poll_events(instance: Res<OxrInstance>, status: Res<XrSharedStatus>) {
+pub fn poll_events(
+    instance: Res<OxrInstance>,
+    status: Res<XrSharedStatus>,
+    mut changed_event: EventWriter<XrStatusChanged>,
+) {
     let _span = info_span!("xr_poll_events");
     let mut buffer = Default::default();
     while let Some(event) = instance
@@ -525,7 +528,7 @@ pub fn poll_events(instance: Res<OxrInstance>, status: Res<XrSharedStatus>) {
                     SessionState::EXITING | SessionState::LOSS_PENDING => XrStatus::Exiting,
                     _ => unreachable!(),
                 };
-
+                changed_event.send(XrStatusChanged(new_status));
                 status.set(new_status);
             }
             InstanceLossPending(_) => {}
diff --git a/crates/bevy_openxr/src/openxr/mod.rs b/crates/bevy_openxr/src/openxr/mod.rs
index 328c290..afd59e3 100644
--- a/crates/bevy_openxr/src/openxr/mod.rs
+++ b/crates/bevy_openxr/src/openxr/mod.rs
@@ -19,6 +19,8 @@ pub mod layer_builder;
 pub mod render;
 pub mod resources;
 pub mod types;
+pub mod action_binding;
+pub mod action_set_attaching;
 
 pub fn add_xr_plugins<G: PluginGroup>(plugins: G) -> PluginGroupBuilder {
     plugins
@@ -37,6 +39,8 @@ pub fn add_xr_plugins<G: PluginGroup>(plugins: G) -> PluginGroupBuilder {
         })
         .add(OxrRenderPlugin)
         .add(XrCameraPlugin)
+        .add(action_set_attaching::OxrActionAttachingPlugin)
+        .add(action_binding::OxrActionBindingPlugin)
         // .add(XrActionPlugin)
         .set(WindowPlugin {
             #[cfg(not(target_os = "android"))]
diff --git a/crates/bevy_xr/src/session.rs b/crates/bevy_xr/src/session.rs
index 91d45cd..8eb29cb 100644
--- a/crates/bevy_xr/src/session.rs
+++ b/crates/bevy_xr/src/session.rs
@@ -10,6 +10,7 @@ impl Plugin for XrSessionPlugin {
             .add_event::<DestroyXrSession>()
             .add_event::<BeginXrSession>()
             .add_event::<EndXrSession>()
+            .add_event::<XrStatusChanged>()
             .add_systems(
                 PreUpdate,
                 handle_session.run_if(resource_exists::<XrSharedStatus>),
@@ -17,6 +18,9 @@ impl Plugin for XrSessionPlugin {
     }
 }
 
+#[derive(Event, Clone, Copy, Deref)]
+pub struct XrStatusChanged(pub XrStatus);
+
 #[derive(Resource, Clone)]
 pub struct XrSharedStatus(Arc<RwLock<XrStatus>>);
 
@@ -84,6 +88,13 @@ pub fn handle_session(
     *previous_status = Some(current_status);
 }
 
+/// A [`Condition`](bevy::ecs::schedule::Condition) that allows the system to run when the xr status changed to a specific [`XrStatus`].
+pub fn status_changed_to(status: XrStatus) -> impl FnMut(EventReader<XrStatusChanged>) -> bool + Clone {
+    move |mut reader: EventReader<XrStatusChanged>| {
+        reader.read().count() > 0 && reader.read().any(|new_status| new_status.0 == status)
+    }
+}
+
 /// A [`Condition`](bevy::ecs::schedule::Condition) system that says if the XR session is available. Returns true as long as [`XrStatus`] exists and isn't [`Unavailable`](XrStatus::Unavailable).
 pub fn session_available(status: Option<Res<XrSharedStatus>>) -> bool {
     status.is_some_and(|s| s.get() != XrStatus::Unavailable)