Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release v0.2.6

Browse Source
This commit is contained in:
galister
2024-03-09 16:54:52 +01:00
parent 85e8e80538
commit 4c91470b5c
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@@ -2198,7 +2198,7 @@ dependencies = [
[[package]] [[package]]
name = "ovr_overlay" name = "ovr_overlay"
version = "0.0.0" version = "0.0.0"
source = "git+https://github.com/galister/ovr_overlay_oyasumi#7e1c8c545dd4d7c87d0a64cc441cba498082d810" source = "git+https://github.com/galister/ovr_overlay_oyasumi#9d8a3f4017024e79b6ec7fa518b97df401bf259c"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"derive_more", "derive_more",
@@ -2213,7 +2213,7 @@ dependencies = [
[[package]] [[package]]
name = "ovr_overlay_sys" name = "ovr_overlay_sys"
version = "0.0.0" version = "0.0.0"
source = "git+https://github.com/galister/ovr_overlay_oyasumi#7e1c8c545dd4d7c87d0a64cc441cba498082d810" source = "git+https://github.com/galister/ovr_overlay_oyasumi#9d8a3f4017024e79b6ec7fa518b97df401bf259c"
dependencies = [ dependencies = [
"autocxx", "autocxx",
"autocxx-build", "autocxx-build",
@@ -3722,7 +3722,7 @@ dependencies = [
[[package]] [[package]]
name = "wlx-overlay-s" name = "wlx-overlay-s"
version = "0.2.5" version = "0.2.6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"ash", "ash",

2
Cargo.toml
View File

@@ -4,7 +4,7 @@ debug = true
[package] [package]
name = "wlx-overlay-s" name = "wlx-overlay-s"
version = "0.2.5" version = "0.2.6"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

22
src/backend/openvr/playspace.rs
View File

@@ -2,7 +2,7 @@ use glam::{Affine3A, Vec3A};
use ovr_overlay::{ use ovr_overlay::{
chaperone_setup::ChaperoneSetupManager, chaperone_setup::ChaperoneSetupManager,
compositor::CompositorManager, compositor::CompositorManager,
sys::{EChaperoneConfigFile, ETrackingUniverseOrigin, HmdMatrix34_t}, sys::{EChaperoneConfigFile, ETrackingUniverseOrigin, HmdMatrix34_t, HmdVector3_t},
}; };
use crate::{ use crate::{
@@ -56,12 +56,16 @@ impl PlayspaceMover {
return; return;
} }
let overlay_offset = data.pose.inverse().transform_vector3a(relative_pos);
overlays.iter_mut().for_each(|overlay| { overlays.iter_mut().for_each(|overlay| {
if overlay.state.grabbable { if overlay.state.grabbable {
overlay.state.dirty = true; overlay.state.dirty = true;
overlay.state.transform.translation -= relative_pos; overlay.state.transform.translation -= overlay_offset;
} }
}); });
chaperone_mgr.revert_working_copy();
apply_chaperone_offset(overlay_offset, chaperone_mgr);
data.pose.translation += relative_pos; data.pose.translation += relative_pos;
data.hand_pos = new_hand; data.hand_pos = new_hand;
@@ -171,3 +175,17 @@ fn set_working_copy(
_ => chaperone_mgr.set_working_seated_zero_pose_to_raw_tracking_pose(&mat), _ => chaperone_mgr.set_working_seated_zero_pose_to_raw_tracking_pose(&mat),
}; };
} }
fn apply_chaperone_offset(offset: Vec3A, chaperone_mgr: &mut ChaperoneSetupManager) {
let mut quads = chaperone_mgr.get_working_collision_bounds_info();
quads.iter_mut().for_each(|quad| {
quad.vCorners.iter_mut().for_each(|corner| {
corner.v[0] += offset.x;
if corner.v[1] != 0.0 {
corner.v[1] += offset.y;
}
corner.v[2] += offset.z;
});
});
chaperone_mgr.set_working_collision_bounds_info(&mut quads);
}