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

more fixin

Browse Source
This commit is contained in:
Jay Christy
2023-11-21 13:54:09 -05:00
parent e2b506181a
commit c4c8308d34
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/xr_input/trackers.rs
View File

@@ -74,7 +74,9 @@ pub fn update_open_xr_controllers(
let left_grip_space = controller.grip_space(Hand::Left); let left_grip_space = controller.grip_space(Hand::Left);
let left_aim_space = controller.aim_space(Hand::Left); let left_aim_space = controller.aim_space(Hand::Left);
let left_postion = left_grip_space.0.pose.position.to_vec3(); let left_postion = left_grip_space.0.pose.position.to_vec3();
//TODO figure out how to not get the entity multiple times
let left_aim_pose = left_controller_query.get_single_mut(); let left_aim_pose = left_controller_query.get_single_mut();
//set aim pose
match left_aim_pose { match left_aim_pose {
Ok(left_entity) => match left_entity.1 { Ok(left_entity) => match left_entity.1 {
Some(mut pose) => { Some(mut pose) => {
@@ -88,15 +90,20 @@ pub fn update_open_xr_controllers(
}, },
Err(_) => debug!("no left controlelr entity found"), Err(_) => debug!("no left controlelr entity found"),
} }
//set translation
left_controller_query let left_translation = left_controller_query.get_single_mut();
.get_single_mut() match left_translation {
.unwrap() Ok(mut left_entity) => left_entity.0.translation = left_postion,
.0 Err(_) => (),
.translation = left_postion; }
//set rotation
left_controller_query.get_single_mut().unwrap().0.rotation = let left_rotataion = left_controller_query.get_single_mut();
left_grip_space.0.pose.orientation.to_quat(); match left_rotataion {
Ok(mut left_entity) => {
left_entity.0.rotation = left_grip_space.0.pose.orientation.to_quat()
}
Err(_) => (),
}
//get right controller //get right controller
let right_grip_space = controller.grip_space(Hand::Right); let right_grip_space = controller.grip_space(Hand::Right);
let right_aim_space = controller.aim_space(Hand::Right); let right_aim_space = controller.aim_space(Hand::Right);
@@ -116,13 +123,18 @@ pub fn update_open_xr_controllers(
}, },
Err(_) => debug!("no right controlelr entity found"), Err(_) => debug!("no right controlelr entity found"),
} }
//set translation
right_controller_query let right_translation = right_controller_query.get_single_mut();
.get_single_mut() match right_translation {
.unwrap() Ok(mut right_entity) => right_entity.0.translation = right_postion,
.0 Err(_) => (),
.translation = right_postion; }
//set rotation
right_controller_query.get_single_mut().unwrap().0.rotation = let right_rotataion = right_controller_query.get_single_mut();
right_grip_space.0.pose.orientation.to_quat(); match right_rotataion {
Ok(mut right_entity) => {
right_entity.0.rotation = right_grip_space.0.pose.orientation.to_quat()
}
Err(_) => (),
}
} }