From 34d44349b817a781b78609e21864f0b3a7ad9f4c Mon Sep 17 00:00:00 2001 From: Schmarni Date: Mon, 10 Jun 2024 12:41:37 +0200 Subject: [PATCH] fix system ordering Signed-off-by: Schmarni --- crates/bevy_openxr/src/openxr/action_binding.rs | 2 +- .../src/openxr/action_set_attaching.rs | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/crates/bevy_openxr/src/openxr/action_binding.rs b/crates/bevy_openxr/src/openxr/action_binding.rs index 2d5af6d..d01ad33 100644 --- a/crates/bevy_openxr/src/openxr/action_binding.rs +++ b/crates/bevy_openxr/src/openxr/action_binding.rs @@ -28,7 +28,7 @@ impl Plugin for OxrActionBindingPlugin { // This could for now be handled better with a SystemSet, but in the future we might want to add an // Event to allow requesting binding suggestion for new actions -fn run_action_binding_sugestion(world: &mut World) { +pub(crate) fn run_action_binding_sugestion(world: &mut World) { world.run_schedule(OxrSendActionBindings); world.run_system_once(bind_actions); } diff --git a/crates/bevy_openxr/src/openxr/action_set_attaching.rs b/crates/bevy_openxr/src/openxr/action_set_attaching.rs index 9eeedc8..272e8b0 100644 --- a/crates/bevy_openxr/src/openxr/action_set_attaching.rs +++ b/crates/bevy_openxr/src/openxr/action_set_attaching.rs @@ -1,17 +1,20 @@ -use crate::session::{OxrSession, OxrSessionStatusEvent}; +use crate::{action_binding::run_action_binding_sugestion, session::{OxrSession, OxrSessionStatusEvent}}; use bevy::prelude::*; -use bevy_xr::session::status_changed_to; impl Plugin for OxrActionAttachingPlugin { fn build(&self, app: &mut App) { app.add_event::(); app.add_systems( PostUpdate, - attach_sets.run_if(|mut session_status_event: EventReader| { - session_status_event - .read() - .any(|s| *s == OxrSessionStatusEvent::Created) - }), + attach_sets + .run_if( + |mut session_status_event: EventReader| { + session_status_event + .read() + .any(|s| *s == OxrSessionStatusEvent::Created) + }, + ) + .after(run_action_binding_sugestion), ); } }