RomanNum3ral
/
wayvr
mirror of https://github.com/wayvr-org/wayvr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make other `shift_world` obey `space_drag_affects_world`, and overlays follow `space-rotate`

This commit is contained in:
cubee 2026-07-28 17:48:47 +10:00 committed by galister
parent 44b7a2a6ab
commit 67877d6a5f
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wayvr/src/backend/openvr/playspace.rs
View File

@ -95,7 +95,11 @@ impl PlayspaceMover {
* -1.0;
space_transform.translation = offset;
let before_pose = data.pose;
data.pose *= space_transform;
if !app.session.config.space_drag_affects_world {
playspace_common::shift_world(overlays, &mut app.anchor, &before_pose, &data.pose);
}
data.hand_pose = new_hand;
if self.universe == ETrackingUniverseOrigin::TrackingUniverseStanding {
@ -243,7 +247,9 @@ impl PlayspaceMover {
set_working_copy(&self.universe, chaperone_mgr, &mat);
chaperone_mgr.commit_working_copy(EChaperoneConfigFile::EChaperoneConfigFile_Live);
playspace_common::shift_world(overlays, anchor, &before, &mat);
if !app.session.config.space_drag_affects_world {
playspace_common::shift_world(overlays, anchor, &before, &mat);
}
if self.drag.is_some() {
log::info!("Space drag interrupted by fix floor");
@ -314,7 +320,9 @@ impl PlayspaceMover {
set_working_copy(&self.universe, chaperone_mgr, &new_mat);
chaperone_mgr.commit_working_copy(EChaperoneConfigFile::EChaperoneConfigFile_Live);
playspace_common::shift_world(overlays, anchor, &before, &new_mat);
if !app.session.config.space_drag_affects_world {
playspace_common::shift_world(overlays, anchor, &before, &new_mat);
}
}
pub fn playspace_changed(

21
wayvr/src/backend/openxr/playspace.rs
View File

@ -114,7 +114,11 @@ impl PlayspaceMover {
space_transform.translation = offset;
let before_pose = data.pose;
data.pose *= space_transform;
if !app.session.config.space_drag_affects_world {
playspace_common::shift_world(overlays, &mut app.anchor, &before_pose, &data.pose);
}
data.hand_pose = new_hand;
apply_offset(data.pose, &mut monado.ipc);
@ -228,7 +232,9 @@ impl PlayspaceMover {
let after_pose = Affine3A::from_translation(res.playspace_pos.into());
apply_offset(after_pose, &mut monado.ipc);
playspace_common::shift_world(overlays, &mut app.anchor, &before_pose, &after_pose);
if !app.session.config.space_drag_affects_world {
playspace_common::shift_world(overlays, &mut app.anchor, &before_pose, &after_pose);
}
}
}
@ -300,9 +306,11 @@ impl PlayspaceMover {
self.gravity.reset();
let after =
Affine3A::from_rotation_translation(pose.orientation.into(), pose.position.into());
playspace_common::shift_world(overlays, anchor, &before, &after);
if !app.session.config.space_drag_affects_world {
let after =
Affine3A::from_rotation_translation(pose.orientation.into(), pose.position.into());
playspace_common::shift_world(overlays, anchor, &before, &after);
}
}
pub fn reset_offset(
@ -391,7 +399,10 @@ impl PlayspaceMover {
let after =
Affine3A::from_rotation_translation(pose.orientation.into(), pose.position.into());
playspace_common::shift_world(overlays, anchor, &before, &after);
if !app.session.config.space_drag_affects_world {
playspace_common::shift_world(overlays, anchor, &before, &after);
}
}
pub fn save_center(&mut self, monado: &mut Monado) {