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

fix xr_utils_actions crashing when running without an openxr runtime

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2024-06-28 16:17:36 +02:00
parent bd33adb47f
commit a7d64a07cf
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/bevy_xr_utils/src/xr_utils_actions.rs
View File

@@ -58,6 +58,7 @@ use bevy_openxr::{
action_binding::OxrSuggestActionBinding, action_set_attaching::OxrAttachActionSet, action_binding::OxrSuggestActionBinding, action_set_attaching::OxrAttachActionSet,
resources::OxrInstance, session::OxrSession, resources::OxrInstance, session::OxrSession,
}; };
use bevy_xr::session::{session_available, session_running};
use openxr::{ActiveActionSet, Path, Vector2f}; use openxr::{ActiveActionSet, Path, Vector2f};
use std::borrow::Cow; use std::borrow::Cow;
@@ -66,30 +67,29 @@ impl Plugin for XRUtilsActionsPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_systems( app.add_systems(
Startup, Startup,
create_openxr_events.in_set(XRUtilsActionSystemSet::CreateEvents), create_openxr_events
); .in_set(XRUtilsActionSystemSet::CreateEvents)
app.add_systems( .run_if(session_available),
Update,
sync_active_action_sets.run_if(resource_exists::<OxrSession>),
); );
app.add_systems(Update, sync_active_action_sets.run_if(session_running));
app.add_systems( app.add_systems(
Update, Update,
sync_and_update_action_states_f32 sync_and_update_action_states_f32
.run_if(resource_exists::<OxrSession>) .run_if(session_running)
.in_set(XRUtilsActionSystemSet::SyncActionStates) .in_set(XRUtilsActionSystemSet::SyncActionStates)
.after(sync_active_action_sets), .after(sync_active_action_sets),
); );
app.add_systems( app.add_systems(
Update, Update,
sync_and_update_action_states_bool sync_and_update_action_states_bool
.run_if(resource_exists::<OxrSession>) .run_if(session_running)
.in_set(XRUtilsActionSystemSet::SyncActionStates) .in_set(XRUtilsActionSystemSet::SyncActionStates)
.after(sync_active_action_sets), .after(sync_active_action_sets),
); );
app.add_systems( app.add_systems(
Update, Update,
sync_and_update_action_states_vector sync_and_update_action_states_vector
.run_if(resource_exists::<OxrSession>) .run_if(session_running)
.in_set(XRUtilsActionSystemSet::SyncActionStates) .in_set(XRUtilsActionSystemSet::SyncActionStates)
.after(sync_active_action_sets), .after(sync_active_action_sets),
); );