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

WayVR: attach_to, pos and rotation spawn parameters in wayvr.yaml config script

Browse Source
This commit is contained in:
Aleksander
2024-10-24 22:44:37 +02:00
parent cf03beef07
commit 8d82993704
3 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/overlays/wayvr.rs
View File

@@ -1,4 +1,4 @@
use glam::{vec3a, Affine2};
use glam::{vec3a, Affine2, Vec3, Vec3A};
use serde::Deserialize;
use std::{cell::RefCell, rc::Rc, sync::Arc};
use vulkano::image::SubresourceLayout;
@@ -314,7 +314,8 @@ where
.ok_or(anyhow::anyhow!(
"Cannot find display named \"{}\"",
app_entry.target_display
))?;
))?
.clone();
let display_handle = wayvr.create_display(
conf_display.width,
@@ -322,7 +323,7 @@ where
&app_entry.target_display,
)?;
let overlay = create_wayvr_display_overlay::<O>(
let mut overlay = create_wayvr_display_overlay::<O>(
app,
conf_display.width,
conf_display.height,
@@ -330,6 +331,21 @@ where
conf_display.scale,
)?;
if let Some(attach_to) = &conf_display.attach_to {
overlay.state.relative_to = attach_to.get_relative_to();
}
if let Some(rot) = &conf_display.rotation {
overlay.state.spawn_rotation = glam::Quat::from_axis_angle(
Vec3::from_slice(&rot.axis),
f32::to_radians(rot.angle),
);
}
if let Some(pos) = &conf_display.pos {
overlay.state.spawn_point = Vec3A::from_slice(pos);
}
let display = wayvr.displays.get_mut(&display_handle).unwrap(); // Never fails
display.overlay_id = Some(overlay.state.id);