diff --git a/wlx-overlay-s/src/assets/lang/en.json b/wlx-overlay-s/src/assets/lang/en.json
index 7ce93c53..ff50a6d1 100644
--- a/wlx-overlay-s/src/assets/lang/en.json
+++ b/wlx-overlay-s/src/assets/lang/en.json
@@ -1,5 +1,9 @@
{
"WATCH": {
+ "MIRROR": "Add a new mirror overlay",
+ "CLEANUP_MIRRORS": "Remove mirrors that are\nnot currently visible",
+ "RECENTER": "Recenter playspace",
+ "FIX-FLOOR": "Fix floor height",
"DASHBOARD": "Dashboard",
"EDIT_MODE": "Edit Mode",
"ADD_NEW_SET": "Add a new set",
diff --git a/wlx-overlay-s/src/assets/watch/fix-floor.svg b/wlx-overlay-s/src/assets/watch/fix-floor.svg
new file mode 100644
index 00000000..320b6e4b
--- /dev/null
+++ b/wlx-overlay-s/src/assets/watch/fix-floor.svg
@@ -0,0 +1 @@
+
diff --git a/wlx-overlay-s/src/assets/watch/mirror-off.svg b/wlx-overlay-s/src/assets/watch/mirror-off.svg
new file mode 100644
index 00000000..19ea5f01
--- /dev/null
+++ b/wlx-overlay-s/src/assets/watch/mirror-off.svg
@@ -0,0 +1 @@
+
diff --git a/wlx-overlay-s/src/assets/watch/recenter.svg b/wlx-overlay-s/src/assets/watch/recenter.svg
new file mode 100644
index 00000000..c17ecefb
--- /dev/null
+++ b/wlx-overlay-s/src/assets/watch/recenter.svg
@@ -0,0 +1 @@
+
diff --git a/wlx-overlay-s/src/assets/watch/restart.svg b/wlx-overlay-s/src/assets/watch/restart.svg
new file mode 100644
index 00000000..316abdfb
--- /dev/null
+++ b/wlx-overlay-s/src/assets/watch/restart.svg
@@ -0,0 +1 @@
+
diff --git a/wlx-overlay-s/src/backend/openvr/playspace.rs b/wlx-overlay-s/src/backend/openvr/playspace.rs
index 80bda0ee..1b5d066e 100644
--- a/wlx-overlay-s/src/backend/openvr/playspace.rs
+++ b/wlx-overlay-s/src/backend/openvr/playspace.rs
@@ -44,9 +44,12 @@ impl PlayspaceMover {
PlayspaceTask::FixFloor => {
self.fix_floor(chaperone_mgr, &app.input_state);
}
- PlayspaceTask::ResetPlayspace => {
+ PlayspaceTask::Reset => {
self.reset_offset(chaperone_mgr, &app.input_state);
}
+ PlayspaceTask::Recenter => {
+ self.recenter(chaperone_mgr, &app.input_state);
+ }
}
}
@@ -224,6 +227,28 @@ impl PlayspaceMover {
}
}
+ pub fn recenter(&mut self, chaperone_mgr: &mut ChaperoneSetupManager, input: &InputState) {
+ let Some(mut mat) = get_working_copy(&self.universe, chaperone_mgr) else {
+ log::warn!("Can't fix floor - failed to get zero pose");
+ return;
+ };
+
+ mat.translation.x += input.hmd.translation.x;
+ mat.translation.z += input.hmd.translation.z;
+
+ set_working_copy(&self.universe, chaperone_mgr, &mat);
+ chaperone_mgr.commit_working_copy(EChaperoneConfigFile::EChaperoneConfigFile_Live);
+
+ if self.drag.is_some() {
+ log::info!("Space drag interrupted by fix floor");
+ self.drag = None;
+ }
+ if self.rotate.is_some() {
+ log::info!("Space rotate interrupted by fix floor");
+ self.rotate = None;
+ }
+ }
+
pub fn playspace_changed(
&mut self,
compositor_mgr: &mut CompositorManager,
diff --git a/wlx-overlay-s/src/backend/openxr/playspace.rs b/wlx-overlay-s/src/backend/openxr/playspace.rs
index 0459cdd1..0af07da3 100644
--- a/wlx-overlay-s/src/backend/openxr/playspace.rs
+++ b/wlx-overlay-s/src/backend/openxr/playspace.rs
@@ -48,9 +48,12 @@ impl PlayspaceMover {
PlayspaceTask::FixFloor => {
self.fix_floor(&app.input_state, monado);
}
- PlayspaceTask::ResetPlayspace => {
+ PlayspaceTask::Reset => {
self.reset_offset(monado);
}
+ PlayspaceTask::Recenter => {
+ self.recenter(&app.input_state, monado);
+ }
}
}
@@ -173,6 +176,31 @@ impl PlayspaceMover {
}
}
+ pub fn recenter(&mut self, input: &InputState, monado: &mut Monado) {
+ if self.drag.is_some() {
+ log::info!("Space drag interrupted by recenter");
+ self.drag = None;
+ }
+ if self.rotate.is_some() {
+ log::info!("Space rotate interrupted by recenter");
+ self.rotate = None;
+ }
+
+ let Ok(mut pose) = monado
+ .get_reference_space_offset(ReferenceSpaceType::Stage)
+ .inspect_err(|e| log::warn!("Could not recenter due to libmonado error: {e:?}"))
+ else {
+ return;
+ };
+
+ pose.position.x += input.hmd.translation.x;
+ pose.position.z += input.hmd.translation.z;
+
+ let _ = monado
+ .set_reference_space_offset(ReferenceSpaceType::Stage, pose)
+ .inspect_err(|e| log::warn!("Could not recenter due to libmonado error: {e:?}"));
+ }
+
pub fn reset_offset(&mut self, monado: &mut Monado) {
if self.drag.is_some() {
log::info!("Space drag interrupted by manual reset");
@@ -197,11 +225,22 @@ impl PlayspaceMover {
self.rotate = None;
}
+ let Ok(mut pose) = monado
+ .get_reference_space_offset(ReferenceSpaceType::Stage)
+ .inspect_err(|e| log::warn!("Could not fix floor due to libmonado error: {e:?}"))
+ else {
+ return;
+ };
+
let y1 = input.pointers[0].raw_pose.translation.y;
let y2 = input.pointers[1].raw_pose.translation.y;
let delta = y1.min(y2) - 0.03;
- self.last_transform.translation.y += delta;
- apply_offset(self.last_transform, monado);
+
+ pose.position.y += delta;
+
+ let _ = monado
+ .set_reference_space_offset(ReferenceSpaceType::Stage, pose)
+ .inspect_err(|e| log::warn!("Could not fix floor due to libmonado error: {e:?}"));
}
}
diff --git a/wlx-overlay-s/src/backend/task.rs b/wlx-overlay-s/src/backend/task.rs
index 4f67c7ec..3385e492 100644
--- a/wlx-overlay-s/src/backend/task.rs
+++ b/wlx-overlay-s/src/backend/task.rs
@@ -49,7 +49,8 @@ pub enum OpenVrTask {
}
pub enum PlayspaceTask {
- ResetPlayspace,
+ Recenter,
+ Reset,
FixFloor,
}
@@ -61,6 +62,7 @@ pub enum OverlayTask {
DeleteActiveSet,
ToggleEditMode,
ShowHide,
+ CleanupMirrors,
Modify(OverlaySelector, Box
),
Create(OverlaySelector, Box),
Drop(OverlaySelector),
diff --git a/wlx-overlay-s/src/gui/panel/button.rs b/wlx-overlay-s/src/gui/panel/button.rs
index 0a201e4c..a62bb74a 100644
--- a/wlx-overlay-s/src/gui/panel/button.rs
+++ b/wlx-overlay-s/src/gui/panel/button.rs
@@ -2,7 +2,8 @@ use std::{
cell::RefCell,
io::BufReader,
process::{Child, ChildStdout},
- sync::Arc,
+ sync::{atomic::Ordering, Arc},
+ time::{Duration, Instant},
};
use wgui::{
@@ -11,11 +12,17 @@ use wgui::{
parser::CustomAttribsInfoOwned,
widget::EventResult,
};
+use wlx_common::overlays::ToastTopic;
use crate::{
- backend::task::{OverlayTask, TaskType},
+ backend::task::{OverlayTask, PlayspaceTask, TaskType},
+ overlays::{
+ mirror::{new_mirror, new_mirror_name},
+ toast::Toast,
+ },
state::AppState,
windowing::OverlaySelector,
+ RUNNING,
};
#[cfg(feature = "wayvr")]
@@ -87,9 +94,49 @@ pub(super) fn setup_custom_button(
.enqueue(TaskType::Overlay(OverlayTask::ToggleEditMode));
Ok(EventResult::Consumed)
}),
- "::WatchHide" => todo!(),
- "::WatchSwapHand" => todo!(),
- // TODO
+ "::NewMirror" => Box::new(move |_common, _data, app, _| {
+ let name = new_mirror_name();
+ app.tasks.enqueue(TaskType::Overlay(OverlayTask::Create(
+ OverlaySelector::Name(name.clone()),
+ Box::new(move |app| Some(new_mirror(name, &app.session))),
+ )));
+ Ok(EventResult::Consumed)
+ }),
+ "::CleanupMirrors" => Box::new(move |_common, _data, app, _| {
+ app.tasks
+ .enqueue(TaskType::Overlay(OverlayTask::CleanupMirrors));
+ Ok(EventResult::Consumed)
+ }),
+ "::PlayspaceReset" => Box::new(move |_common, _data, app, _| {
+ app.tasks.enqueue(TaskType::Playspace(PlayspaceTask::Reset));
+ Ok(EventResult::Consumed)
+ }),
+ "::PlayspaceRecenter" => Box::new(move |_common, _data, app, _| {
+ app.tasks
+ .enqueue(TaskType::Playspace(PlayspaceTask::Recenter));
+ Ok(EventResult::Consumed)
+ }),
+ "::PlayspaceFixFloor" => Box::new(move |_common, _data, app, _| {
+ for i in 0..5 {
+ Toast::new(
+ ToastTopic::System,
+ format!("Fixing floor in {}", 5 - i).into(),
+ "Touch your controller to the floor!".into(),
+ )
+ .with_timeout(1.)
+ .with_sound(true)
+ .submit_at(app, Instant::now() + Duration::from_secs(i));
+ }
+ app.tasks.enqueue_at(
+ TaskType::Playspace(PlayspaceTask::FixFloor),
+ Instant::now() + Duration::from_secs(5),
+ );
+ Ok(EventResult::Consumed)
+ }),
+ "::Shutdown" => Box::new(move |_common, _data, _app, _| {
+ RUNNING.store(false, Ordering::Relaxed);
+ Ok(EventResult::Consumed)
+ }),
#[allow(clippy::match_same_arms)]
"::OscSend" => return,
// shell
diff --git a/wlx-overlay-s/src/overlays/mirror.rs b/wlx-overlay-s/src/overlays/mirror.rs
index 08824259..451b74bb 100644
--- a/wlx-overlay-s/src/overlays/mirror.rs
+++ b/wlx-overlay-s/src/overlays/mirror.rs
@@ -1,10 +1,13 @@
use std::{
- sync::Arc,
+ sync::{
+ atomic::{AtomicUsize, Ordering},
+ Arc,
+ },
task::{Context, Poll},
};
use futures::{Future, FutureExt};
-use glam::{Affine2, Affine3A, Vec3};
+use glam::{vec3, Affine2, Affine3A, Quat, Vec3};
use wlx_capture::pipewire::{pipewire_select_screen, PipewireCapture, PipewireSelectScreenResult};
use wlx_common::windowing::OverlayWindowState;
@@ -30,6 +33,8 @@ type PinnedSelectorFuture = core::pin::Pin<
Box>>,
>;
+static MIRROR_COUNTER: AtomicUsize = AtomicUsize::new(1);
+
pub struct MirrorBackend {
name: Arc,
renderer: Option,
@@ -149,14 +154,24 @@ impl OverlayBackend for MirrorBackend {
}
}
+pub fn new_mirror_name() -> Arc {
+ format!("M-{}", MIRROR_COUNTER.fetch_add(1, Ordering::Relaxed)).into()
+}
+
pub fn new_mirror(name: Arc, session: &AppSession) -> OverlayWindowConfig {
OverlayWindowConfig {
name: name.clone(),
category: OverlayCategory::Mirror,
+ show_on_spawn: true,
default_state: OverlayWindowState {
interactable: true,
grabbable: true,
- transform: Affine3A::from_scale(Vec3::ONE * 0.5 * session.config.desktop_view_scale),
+ curvature: Some(0.15),
+ transform: Affine3A::from_scale_rotation_translation(
+ Vec3::ONE * session.config.desktop_view_scale,
+ Quat::IDENTITY,
+ vec3(0.0, 0.2, -0.35),
+ ),
..OverlayWindowState::default()
},
..OverlayWindowConfig::from_backend(Box::new(MirrorBackend::new(name)))
diff --git a/wlx-overlay-s/src/windowing/manager.rs b/wlx-overlay-s/src/windowing/manager.rs
index a888888d..31ee9405 100644
--- a/wlx-overlay-s/src/windowing/manager.rs
+++ b/wlx-overlay-s/src/windowing/manager.rs
@@ -187,6 +187,22 @@ where
.notify(app, OverlayEventData::NumSetsChanged(len))?;
}
}
+ OverlayTask::CleanupMirrors => {
+ let mut ids_to_remove = vec![];
+ for (oid, o) in self.overlays.iter() {
+ if !matches!(o.config.category, OverlayCategory::Mirror) {
+ continue;
+ }
+ if o.config.active_state.is_some() {
+ continue;
+ }
+ ids_to_remove.push(oid);
+ }
+
+ for oid in ids_to_remove {
+ self.remove_by_selector(&OverlaySelector::Id(oid), app);
+ }
+ }
OverlayTask::Modify(sel, f) => {
if let Some(o) = self.mut_by_selector(&sel) {
f(app, &mut o.config);
@@ -216,10 +232,11 @@ where
OverlayTask::Drop(sel) => {
if let Some(o) = self.mut_by_selector(&sel)
&& o.birthframe < FRAME_COUNTER.load(Ordering::Relaxed)
- && let Some(o) = self.remove_by_selector(&sel, app) {
- log::debug!("Dropping overlay {}", o.config.name);
- self.dropped_overlays.push_back(o);
- }
+ && let Some(o) = self.remove_by_selector(&sel, app)
+ {
+ log::debug!("Dropping overlay {}", o.config.name);
+ self.dropped_overlays.push_back(o);
+ }
}
}
Ok(())