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

Merge pull request #7 from ForTehLose/fix_handedness

Browse Source 
fixed handedness issues and made thumbstick struct members public
This commit is contained in:
piper
2023-09-17 17:19:15 -05:00
committed by GitHub
parent af749dd1d3 d1c0bc223b
commit 01ef4752e6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/xr_input/oculus_touch.rs
View File

@@ -75,7 +75,7 @@ impl OculusControllerRef<'_> {
&self.xr_input.stage, &self.xr_input.stage,
self.frame_state.predicted_display_time, self.frame_state.predicted_display_time,
), ),
Hand::Right => self.oculus_controller.aim_space.left.relate( Hand::Right => self.oculus_controller.aim_space.right.relate(
&self.xr_input.stage, &self.xr_input.stage,
self.frame_state.predicted_display_time, self.frame_state.predicted_display_time,
), ),
@@ -216,9 +216,9 @@ impl OculusControllerRef<'_> {
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
pub struct Thumbstick { pub struct Thumbstick {
x: f32, pub x: f32,
y: f32, pub y: f32,
click: bool, pub click: bool,
} }
impl OculusController { impl OculusController {
@@ -276,12 +276,12 @@ impl OculusController {
let this = OculusController { let this = OculusController {
grip_space: Handed { grip_space: Handed {
left: grip_pose.create_space(session.clone(), right_path, Posef::IDENTITY)?, left: grip_pose.create_space(session.clone(), left_path, Posef::IDENTITY)?,
right: grip_pose.create_space(session.clone(), left_path, Posef::IDENTITY)?, right: grip_pose.create_space(session.clone(), right_path, Posef::IDENTITY)?,
}, },
aim_space: Handed { aim_space: Handed {
left: aim_pose.create_space(session.clone(), right_path, Posef::IDENTITY)?, left: aim_pose.create_space(session.clone(), left_path, Posef::IDENTITY)?,
right: aim_pose.create_space(session.clone(), left_path, Posef::IDENTITY)?, right: aim_pose.create_space(session.clone(), right_path, Posef::IDENTITY)?,
}, },
grip_pose, grip_pose,
aim_pose, aim_pose,