Avii/bevy_oxr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix system ordering

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2024-06-10 12:41:37 +02:00
parent 6ebcd7df99
commit 34d44349b8
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bevy_openxr/src/openxr/action_binding.rs
View File

@@ -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 // 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 // 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_schedule(OxrSendActionBindings);
world.run_system_once(bind_actions); world.run_system_once(bind_actions);
} }

11
crates/bevy_openxr/src/openxr/action_set_attaching.rs
View File

@@ -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::prelude::*;
use bevy_xr::session::status_changed_to;
impl Plugin for OxrActionAttachingPlugin { impl Plugin for OxrActionAttachingPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_event::<OxrAttachActionSet>(); app.add_event::<OxrAttachActionSet>();
app.add_systems( app.add_systems(
PostUpdate, PostUpdate,
attach_sets.run_if(|mut session_status_event: EventReader<OxrSessionStatusEvent>| { attach_sets
.run_if(
|mut session_status_event: EventReader<OxrSessionStatusEvent>| {
session_status_event session_status_event
.read() .read()
.any(|s| *s == OxrSessionStatusEvent::Created) .any(|s| *s == OxrSessionStatusEvent::Created)
}), },
)
.after(run_action_binding_sugestion),
); );
} }
} }