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

add new XrSpace and impl that

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2024-06-15 15:37:01 +02:00
parent aa2a335074
commit 6003cc7ac6
15 changed files with 860 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,42 +56,59 @@
use bevy::prelude::*;
use bevy_openxr::{
action_binding::OxrSuggestActionBinding, action_set_attaching::OxrAttachActionSet,
action_set_syncing::OxrActionSetSyncSet, action_set_syncing::OxrSyncActionSet,
resources::OxrInstance, session::OxrSession,
};
use openxr::{ActiveActionSet, Path, Vector2f};
use bevy_xr::session::{session_available, session_running};
use openxr::{Path, Vector2f};
use std::borrow::Cow;
pub struct XRUtilsActionsPlugin;
impl Plugin for XRUtilsActionsPlugin {
fn build(&self, app: &mut App) {
app.configure_sets(
Startup,
XRUtilsActionSystemSet::CreateEvents.run_if(session_available),
);
app.configure_sets(
PreUpdate,
XRUtilsActionSystemSet::SyncActionStates.run_if(session_running),
);
app.add_systems(
Startup,
create_openxr_events.in_set(XRUtilsActionSystemSet::CreateEvents),
);
<<<<<<< HEAD
app.add_systems(
Update,
sync_active_action_sets.run_if(resource_exists::<OxrSession>),
);
=======
>>>>>>> 47b64a4 (add new XrSpace and impl that)
app.add_systems(
Update,
PreUpdate,
sync_active_action_sets.before(OxrActionSetSyncSet),
);
app.add_systems(
PreUpdate,
sync_and_update_action_states_f32
.run_if(resource_exists::<OxrSession>)
.in_set(XRUtilsActionSystemSet::SyncActionStates)
.after(sync_active_action_sets),
.after(OxrActionSetSyncSet),
);
app.add_systems(
Update,
PreUpdate,
sync_and_update_action_states_bool
.run_if(resource_exists::<OxrSession>)
.in_set(XRUtilsActionSystemSet::SyncActionStates)
.after(sync_active_action_sets),
.after(OxrActionSetSyncSet),
);
app.add_systems(
Update,
PreUpdate,
sync_and_update_action_states_vector
.run_if(resource_exists::<OxrSession>)
.in_set(XRUtilsActionSystemSet::SyncActionStates)
.after(sync_active_action_sets),
.after(OxrActionSetSyncSet),
);
}
}
@@ -147,9 +164,9 @@ fn create_openxr_events(
//interaction profile
//get the binding entity and stuff
let create_binding = bindings_query.get(bind).unwrap();
let profile = Cow::from(create_binding.profile.clone());
let profile = create_binding.profile.clone();
//bindings
let binding = vec![Cow::from(create_binding.binding.clone())];
let binding = vec![create_binding.binding.clone()];
let sugestion = OxrSuggestActionBinding {
action: action.as_raw(),
interaction_profile: profile,
@@ -186,9 +203,9 @@ fn create_openxr_events(
//interaction profile
//get the binding entity and stuff
let create_binding = bindings_query.get(bind).unwrap();
let profile = Cow::from(create_binding.profile.clone());
let profile = create_binding.profile.clone();
//bindings
let binding = vec![Cow::from(create_binding.binding.clone())];
let binding = vec![create_binding.binding.clone()];
let sugestion = OxrSuggestActionBinding {
action: action.as_raw(),
interaction_profile: profile,
@@ -225,9 +242,9 @@ fn create_openxr_events(
//interaction profile
//get the binding entity and stuff
let create_binding = bindings_query.get(bind).unwrap();
let profile = Cow::from(create_binding.profile.clone());
let profile = create_binding.profile.clone();
//bindings
let binding = vec![Cow::from(create_binding.binding.clone())];
let binding = vec![create_binding.binding.clone()];
let sugestion = OxrSuggestActionBinding {
action: action.as_raw(),
interaction_profile: profile,
@@ -245,9 +262,10 @@ fn create_openxr_events(
}
fn sync_active_action_sets(
session: Res<OxrSession>,
mut sync_set: EventWriter<OxrSyncActionSet>,
active_action_set_query: Query<&XRUtilsActionSetReference, With<ActiveSet>>,
) {
<<<<<<< HEAD
let active_sets = active_action_set_query
.iter()
.map(|v| ActiveActionSet::from(&v.0))
@@ -256,6 +274,10 @@ fn sync_active_action_sets(
match sync {
Ok(_) => (),
Err(_) => error!("sync error"),
=======
for set in &active_action_set_query {
sync_set.send(OxrSyncActionSet(set.0.clone()));
>>>>>>> 47b64a4 (add new XrSpace and impl that)
}
}
@@ -336,7 +358,9 @@ fn sync_and_update_action_states_vector(
#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy, SystemSet)]
pub enum XRUtilsActionSystemSet {
/// Runs in Startup
CreateEvents,
/// Runs in PreUpdate
SyncActionStates,
}