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

openxr: playspace reset uses last fix_floor

This commit is contained in:
galister 2026-07-03 02:52:23 +09:00
parent 4daff7300f
commit db960212b6
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,23 +24,24 @@ pub(super) struct PlayspaceMover {
drag: Option<MoverData<Vec3A>>,
rotate: Option<MoverData<Quat>>,
gravity: SpaceGravity,
floor_y: f32,
}
impl PlayspaceMover {
pub fn new(monado: &mut Monado) -> anyhow::Result<Self> {
log::info!("Monado: using space offset API");
if matches!(
monado.get_reference_space_offset(ReferenceSpaceType::Stage),
Err(MndResult::ErrorInvalidVersion)
) {
anyhow::bail!("Space offsets not supported.");
}
let pose = match monado.get_reference_space_offset(ReferenceSpaceType::Stage) {
Err(MndResult::ErrorInvalidVersion) => anyhow::bail!("Space offsets not supported."),
Err(e) => anyhow::bail!("Could not initialize space mover: {e:?}"),
Ok(pose) => pose,
};
Ok(Self {
drag: None,
rotate: None,
gravity: SpaceGravity::new(),
floor_y: pose.position.y,
})
}
@ -264,7 +265,9 @@ impl PlayspaceMover {
}
self.gravity.reset();
apply_offset(Affine3A::IDENTITY, monado);
let mut offset = Affine3A::IDENTITY;
offset.translation.y = self.floor_y;
apply_offset(offset, monado);
}
pub fn fix_floor(&mut self, input: &InputState, monado: &mut Monado) {
@ -290,6 +293,8 @@ impl PlayspaceMover {
pose.position.y += delta;
self.floor_y = pose.position.y;
let _ = monado
.set_reference_space_offset(ReferenceSpaceType::Stage, pose)
.inspect_err(|e| log::warn!("Could not fix floor due to libmonado error: {e:?}"));