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

fixed things up for proper 0.16 release

Browse Source
This commit is contained in:
Malek
2025-04-25 17:20:05 -04:00
committed by Schmarni
parent 4528529417
commit ae54de3db9
13 changed files with 168 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/bevy_xr_utils/src/tracking_utils.rs
View File

@@ -83,7 +83,7 @@ fn update_stage(
root_query: Query<&Transform, (With<XrTrackingRoot>, Without<XrTrackedStage>)>,
mut stage_query: Query<&mut Transform, (With<XrTrackedStage>, Without<XrTrackingRoot>)>,
) {
if let Ok(root) = root_query.get_single() {
if let Ok(root) = root_query.single() {
for mut transform in &mut stage_query {
*transform = *root;
}
@@ -129,7 +129,7 @@ fn update_view(
mut head_query: Query<&mut Transform, (With<HeadXRSpace>, Without<XrTrackedView>)>,
mut view_query: Query<&mut Transform, (With<XrTrackedView>, Without<HeadXRSpace>)>,
) {
let head_transform = head_query.get_single_mut();
let head_transform = head_query.single_mut();
if let Ok(root) = head_transform {
for mut transform in &mut view_query {
*transform = *root;
@@ -142,7 +142,7 @@ fn update_local_floor_transforms(
mut head_space: Query<&mut Transform, (With<HeadXRSpace>, Without<XrTrackedLocalFloor>)>,
mut local_floor: Query<&mut Transform, (With<XrTrackedLocalFloor>, Without<HeadXRSpace>)>,
) {
let head_transform = head_space.get_single_mut();
let head_transform = head_space.single_mut();
if let Ok(head) = head_transform {
let mut calc_floor = *head;
calc_floor.translation.y = 0.0;
@@ -164,7 +164,7 @@ fn update_left_grip(
mut left_grip: Query<&mut Transform, (With<LeftGrip>, Without<XrTrackedLeftGrip>)>,
mut tracked_left_grip: Query<&mut Transform, (With<XrTrackedLeftGrip>, Without<LeftGrip>)>,
) {
let head_transform = left_grip.get_single_mut();
let head_transform = left_grip.single_mut();
if let Ok(head) = head_transform {
for mut transform in &mut tracked_left_grip {
*transform = *head;
@@ -180,7 +180,7 @@ fn update_right_grip(
mut right_grip: Query<&mut Transform, (With<RightGrip>, Without<XrTrackedRightGrip>)>,
mut tracked_right_grip: Query<&mut Transform, (With<XrTrackedRightGrip>, Without<RightGrip>)>,
) {
let head_transform = right_grip.get_single_mut();
let head_transform = right_grip.single_mut();
if let Ok(head) = head_transform {
for mut transform in &mut tracked_right_grip {
*transform = *head;
@@ -229,12 +229,12 @@ pub fn suggest_action_bindings(
actions: Res<ControllerActions>,
mut bindings: EventWriter<OxrSuggestActionBinding>,
) {
bindings.send(OxrSuggestActionBinding {
bindings.write(OxrSuggestActionBinding {
action: actions.left.as_raw(),
interaction_profile: "/interaction_profiles/oculus/touch_controller".into(),
bindings: vec!["/user/hand/left/input/grip/pose".into()],
});
bindings.send(OxrSuggestActionBinding {
bindings.write(OxrSuggestActionBinding {
action: actions.right.as_raw(),
interaction_profile: "/interaction_profiles/oculus/touch_controller".into(),
bindings: vec!["/user/hand/right/input/grip/pose".into()],
@@ -242,11 +242,11 @@ pub fn suggest_action_bindings(
}
fn sync_actions(actions: Res<ControllerActions>, mut sync: EventWriter<OxrSyncActionSet>) {
sync.send(OxrSyncActionSet(actions.set.clone()));
sync.write(OxrSyncActionSet(actions.set.clone()));
}
fn attach_set(actions: Res<ControllerActions>, mut attach: EventWriter<OxrAttachActionSet>) {
attach.send(OxrAttachActionSet(actions.set.clone()));
attach.write(OxrAttachActionSet(actions.set.clone()));
}
fn create_actions(instance: Res<OxrInstance>, mut cmds: Commands) {

2
crates/bevy_xr_utils/src/transform_utils.rs
View File

@@ -28,7 +28,7 @@ pub fn handle_transform_events(
mut position_reader: EventReader<SnapToPosition>,
mut rotation_reader: EventReader<SnapToRotation>,
) {
let result = root_query.get_single_mut();
let result = root_query.single_mut();
match result {
Ok(mut root_transform) => {
let view = views.first();

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

@@ -171,7 +171,7 @@ fn create_openxr_events(
bindings: binding,
};
//finally send the suggestion
binding_writer.send(sugestion);
binding_writer.write(sugestion);
}
}
bevy_mod_xr::actions::ActionType::Float => {
@@ -210,7 +210,7 @@ fn create_openxr_events(
bindings: binding,
};
//finally send the suggestion
binding_writer.send(sugestion);
binding_writer.write(sugestion);
}
}
bevy_mod_xr::actions::ActionType::Vector => {
@@ -249,13 +249,13 @@ fn create_openxr_events(
bindings: binding,
};
//finally send the suggestion
binding_writer.send(sugestion);
binding_writer.write(sugestion);
}
}
};
}
attach_writer.send(OxrAttachActionSet(action_set));
attach_writer.write(OxrAttachActionSet(action_set));
}
}
@@ -264,7 +264,7 @@ fn sync_active_action_sets(
active_action_set_query: Query<&XRUtilsActionSetReference, With<ActiveSet>>,
) {
for set in &active_action_set_query {
sync_set.send(OxrSyncActionSet(set.0.clone()));
sync_set.write(OxrSyncActionSet(set.0.clone()));
}
}