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

OverlayContainer to use HopSlotMap

Browse Source
This commit is contained in:
galister
2025-10-03 12:52:29 +09:00
parent a1edc2f0b8
commit 231850cf73
19 changed files with 121 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
wlx-overlay-s/src/backend/common.rs
View File

@@ -4,17 +4,16 @@ use std::sync::{Arc, LazyLock};
use openxr as xr;
use glam::{Affine3A, Vec3, Vec3A};
use idmap::IdMap;
use serde::Deserialize;
use slotmap::HopSlotMap;
use thiserror::Error;
use crate::{
config::AStrSetExt,
overlays::{
anchor::create_anchor,
keyboard::{KEYBOARD_NAME, builder::create_keyboard},
keyboard::{builder::create_keyboard, KEYBOARD_NAME},
screen::create_screens,
watch::{WATCH_NAME, create_watch},
watch::{create_watch, WATCH_NAME},
},
state::AppState,
};
@@ -40,7 +39,7 @@ pub struct OverlayContainer<T>
where
T: Default,
{
overlays: IdMap<usize, OverlayData<T>>,
overlays: HopSlotMap<OverlayID, OverlayData<T>>,
}
impl<T> OverlayContainer<T>
@@ -48,7 +47,7 @@ where
T: Default,
{
pub fn new(app: &mut AppState, headless: bool) -> anyhow::Result<Self> {
let mut overlays = IdMap::new();
let mut overlays = HopSlotMap::with_key();
let mut show_screens = app.session.config.show_screens.clone();
let mut maybe_keymap = None;
@@ -66,13 +65,10 @@ where
if show_screens.arc_get(state.name.as_ref()) {
state.show_hide = true;
}
overlays.insert(
state.id.0,
OverlayData::<T> {
state,
..OverlayData::from_backend(backend)
},
);
overlays.insert(OverlayData::<T> {
state,
..OverlayData::from_backend(backend)
});
app.screens.push(meta);
}
@@ -83,16 +79,16 @@ where
}
let anchor = create_anchor(app)?;
overlays.insert(anchor.state.id.0, anchor);
overlays.insert(anchor);
let mut watch = create_watch::<T>(app)?;
watch.state.want_visible = true;
overlays.insert(watch.state.id.0, watch);
overlays.insert(watch);
let mut keyboard = create_keyboard(app, maybe_keymap)?;
keyboard.state.show_hide = show_screens.arc_get(KEYBOARD_NAME);
keyboard.state.want_visible = false;
overlays.insert(keyboard.state.id.0, keyboard);
overlays.insert(keyboard);
Ok(Self { overlays })
}
@@ -106,24 +102,19 @@ where
pub fn remove_by_selector(&mut self, selector: &OverlaySelector) -> Option<OverlayData<T>> {
match selector {
OverlaySelector::Id(id) => self.overlays.remove(id.0),
OverlaySelector::Id(id) => self.overlays.remove(*id),
OverlaySelector::Name(name) => {
let id = self
.overlays
.iter()
.find(|(_, o)| *o.state.name == **name)
.map(|(id, _)| *id);
id.and_then(|id| self.overlays.remove(id))
self.lookup(name).and_then(|id| self.overlays.remove(id))
}
}
}
pub fn get_by_id(&mut self, id: OverlayID) -> Option<&OverlayData<T>> {
self.overlays.get(id.0)
self.overlays.get(id)
}
pub fn mut_by_id(&mut self, id: OverlayID) -> Option<&mut OverlayData<T>> {
self.overlays.get_mut(id.0)
self.overlays.get_mut(id)
}
pub fn get_by_name<'a>(&'a mut self, name: &str) -> Option<&'a OverlayData<T>> {
@@ -134,16 +125,31 @@ where
self.overlays.values_mut().find(|o| *o.state.name == *name)
}
pub fn iter(&self) -> impl Iterator<Item = &'_ OverlayData<T>> {
pub fn iter(&self) -> impl Iterator<Item = (OverlayID, &'_ OverlayData<T>)> {
self.overlays.iter()
}
pub fn iter_mut(&mut self) -> impl Iterator<Item = (OverlayID, &'_ mut OverlayData<T>)> {
self.overlays.iter_mut()
}
pub fn values(&self) -> impl Iterator<Item = &'_ OverlayData<T>> {
self.overlays.values()
}
pub fn iter_mut(&mut self) -> impl Iterator<Item = &'_ mut OverlayData<T>> {
pub fn values_mut(&mut self) -> impl Iterator<Item = &'_ mut OverlayData<T>> {
self.overlays.values_mut()
}
pub fn add(&mut self, overlay: OverlayData<T>) {
self.overlays.insert(overlay.state.id.0, overlay);
pub fn lookup(&self, name: &str) -> Option<OverlayID> {
self.overlays
.iter()
.find(|(_, v)| v.state.name.as_ref() == name)
.map(|(k, _)| k)
}
pub fn add(&mut self, overlay: OverlayData<T>) -> OverlayID {
self.overlays.insert(overlay)
}
pub fn show_hide(&mut self, app: &mut AppState) {
@@ -177,8 +183,7 @@ where
}
}
#[derive(Clone, Deserialize, Debug)]
#[serde(untagged)]
#[derive(Clone, Debug)]
pub enum OverlaySelector {
Id(OverlayID),
Name(Arc<str>),

24
wlx-overlay-s/src/backend/input.rs
View File

@@ -4,7 +4,7 @@ use std::{collections::VecDeque, time::Instant};
use glam::{Affine3A, Vec2, Vec3, Vec3A, Vec3Swizzles};
use smallvec::{SmallVec, smallvec};
use smallvec::{smallvec, SmallVec};
use crate::backend::common::OverlaySelector;
use crate::backend::overlay::Positioning;
@@ -323,7 +323,7 @@ where
if let Some(grabbed) = overlays.mut_by_id(grab_data.grabbed_id) {
Pointer::handle_grabbed(idx, grabbed, app);
} else {
log::warn!("Grabbed overlay {} does not exist", grab_data.grabbed_id.0);
log::warn!("Grabbed overlay {:?} does not exist", grab_data.grabbed_id);
pointer.interaction.grabbed = None;
}
return (0.1, None);
@@ -364,7 +364,7 @@ where
pointer = &mut app.input_state.pointers[idx];
}
let Some(hovered) = overlays.mut_by_id(hit.overlay) else {
log::warn!("Hit overlay {} does not exist", hit.overlay.0);
log::warn!("Hit overlay {:?} does not exist", hit.overlay);
return (0.0, None); // no hit
};
@@ -385,7 +385,7 @@ where
if pointer.now.grab && !pointer.before.grab && hovered.state.grabbable {
update_focus(&mut app.hid_provider.keyboard_focus, &hovered.state);
pointer.start_grab(hovered, &mut app.tasks);
pointer.start_grab(hit.overlay, hovered, &mut app.tasks);
return (
hit.dist,
Some(Haptics {
@@ -454,13 +454,13 @@ impl Pointer {
{
let mut hits: SmallVec<[RayHit; 8]> = smallvec!();
for overlay in overlays.iter() {
for (id, overlay) in overlays.iter() {
if !overlay.state.want_visible || !overlay.state.interactable {
continue;
}
if let Some(hit) = self.ray_test(
overlay.state.id,
id,
&overlay.state.transform,
overlay.state.curvature.as_ref(),
) {
@@ -502,8 +502,12 @@ impl Pointer {
None
}
fn start_grab<O>(&mut self, overlay: &mut OverlayData<O>, tasks: &mut TaskContainer)
where
fn start_grab<O>(
&mut self,
id: OverlayID,
overlay: &mut OverlayData<O>,
tasks: &mut TaskContainer,
) where
O: Default,
{
let offset = self
@@ -513,7 +517,7 @@ impl Pointer {
self.interaction.grabbed = Some(GrabData {
offset,
grabbed_id: overlay.state.id,
grabbed_id: id,
old_curvature: overlay.state.curvature,
grab_all: matches!(self.interaction.mode, PointerMode::Right),
});
@@ -570,7 +574,7 @@ impl Pointer {
overlay.state.realign(&app.input_state.hmd);
overlay.state.dirty = true;
} else {
log::error!("Grabbed overlay {} does not exist", overlay.state.id.0);
log::error!("Grabbed overlay does not exist");
pointer.interaction.grabbed = None;
}
} else {

22
wlx-overlay-s/src/backend/openvr/mod.rs
View File

@@ -2,18 +2,18 @@ use std::{
collections::VecDeque,
ops::Add,
sync::{
Arc,
atomic::{AtomicBool, AtomicUsize, Ordering},
Arc,
},
time::{Duration, Instant},
};
use anyhow::{Result, anyhow};
use anyhow::{anyhow, Result};
use ovr_overlay::{
TrackedDeviceIndex,
sys::{ETrackedDeviceProperty, EVRApplicationType, EVREventType},
TrackedDeviceIndex,
};
use vulkano::{Handle, VulkanObject, device::physical::PhysicalDevice};
use vulkano::{device::physical::PhysicalDevice, Handle, VulkanObject};
use crate::{
backend::{
@@ -21,7 +21,7 @@ use crate::{
input::interact,
openvr::{
helpers::adjust_gain,
input::{OpenVrInputSource, set_action_manifest},
input::{set_action_manifest, OpenVrInputSource},
lines::LinePool,
manifest::{install_manifest, uninstall_manifest},
overlay::OpenVrOverlayData,
@@ -29,10 +29,10 @@ use crate::{
overlay::{OverlayData, ShouldRender},
task::{SystemTask, TaskType},
},
graphics::{CommandBuffers, init_openvr_graphics},
graphics::{init_openvr_graphics, CommandBuffers},
overlays::{
toast::{Toast, ToastTopic},
watch::{WATCH_NAME, watch_fade},
watch::{watch_fade, WATCH_NAME},
},
state::AppState,
subsystem::notifications::NotificationManager,
@@ -289,7 +289,7 @@ pub fn openvr_run(
}
overlays
.iter_mut()
.values_mut()
.for_each(|o| o.state.auto_movement(&mut state));
watch_fade(&mut state, overlays.mut_by_id(watch_id).unwrap()); // want panic
@@ -314,7 +314,7 @@ pub fn openvr_run(
lines.update(universe.clone(), &mut overlay_mgr, &mut state)?;
for o in overlays.iter_mut() {
for o in overlays.values_mut() {
o.after_input(&mut overlay_mgr, &mut state)?;
}
@@ -332,7 +332,7 @@ pub fn openvr_run(
log::trace!("Rendering frame");
for o in overlays.iter_mut() {
for o in overlays.values_mut() {
if o.state.want_visible {
let ShouldRender::Should = o.should_render(&mut state)? else {
continue;
@@ -359,7 +359,7 @@ pub fn openvr_run(
}
overlays
.iter_mut()
.values_mut()
.for_each(|o| o.after_render(universe.clone(), &mut overlay_mgr, &state.gfx));
#[cfg(feature = "wayvr")]

4
wlx-overlay-s/src/backend/openvr/playspace.rs
View File

@@ -68,7 +68,7 @@ impl PlayspaceMover {
overlay_transform.translation = offset;
space_transform.translation = offset;
overlays.iter_mut().for_each(|overlay| {
overlays.values_mut().for_each(|overlay| {
if overlay.state.grabbable {
overlay.state.dirty = true;
overlay.state.transform.translation =
@@ -125,7 +125,7 @@ impl PlayspaceMover {
let overlay_offset = data.pose.inverse().transform_vector3a(relative_pos) * -1.0;
overlays.iter_mut().for_each(|overlay| {
overlays.values_mut().for_each(|overlay| {
if overlay.state.grabbable {
overlay.state.dirty = true;
overlay.state.transform.translation += overlay_offset;

16
wlx-overlay-s/src/backend/openxr/mod.rs
View File

@@ -2,8 +2,8 @@ use std::{
collections::VecDeque,
ops::Add,
sync::{
Arc,
atomic::{AtomicBool, AtomicUsize, Ordering},
Arc,
},
time::{Duration, Instant},
};
@@ -23,10 +23,10 @@ use crate::{
overlay::{OverlayData, ShouldRender},
task::{SystemTask, TaskType},
},
graphics::{CommandBuffers, init_openxr_graphics},
graphics::{init_openxr_graphics, CommandBuffers},
overlays::{
toast::{Toast, ToastTopic},
watch::{WATCH_NAME, watch_fade},
watch::{watch_fade, WATCH_NAME},
},
state::AppState,
subsystem::notifications::NotificationManager,
@@ -155,7 +155,7 @@ pub fn openxr_run(
lines.allocate(&xr_state, app.gfx.clone())?,
];
let watch_id = overlays.get_by_name(WATCH_NAME).unwrap().state.id; // want panic
let watch_id = overlays.lookup(WATCH_NAME).unwrap(); // want panic
let mut input_source = input::OpenXrInputSource::new(&xr_state)?;
@@ -311,7 +311,7 @@ pub fn openxr_run(
);
}
for o in overlays.iter_mut() {
for o in overlays.values_mut() {
o.after_input(&mut app)?;
}
@@ -335,7 +335,7 @@ pub fn openxr_run(
}
overlays
.iter_mut()
.values_mut()
.for_each(|o| o.state.auto_movement(&mut app));
let lengths_haptics = interact(&mut overlays, &mut app);
@@ -379,7 +379,7 @@ pub fn openxr_run(
skybox.render(&xr_state, &app, &mut buffers)?;
}
for o in overlays.iter_mut() {
for o in overlays.values_mut() {
o.data.cur_visible = false;
if !o.state.want_visible {
continue;
@@ -431,7 +431,7 @@ pub fn openxr_run(
}
}
for o in overlays.iter_mut() {
for o in overlays.values_mut() {
if !o.data.cur_visible {
continue;
}

2
wlx-overlay-s/src/backend/openxr/playspace.rs
View File

@@ -128,7 +128,7 @@ impl PlayspaceMover {
let overlay_offset = data.pose.inverse().transform_vector3a(relative_pos) * -1.0;
overlays.iter_mut().for_each(|overlay| {
overlays.values_mut().for_each(|overlay| {
if overlay.state.grabbable {
overlay.state.dirty = true;
overlay.state.transform.translation += overlay_offset;

14
wlx-overlay-s/src/backend/overlay.rs
View File

@@ -1,13 +1,10 @@
use std::{
f32::consts::PI,
sync::{
Arc,
atomic::{AtomicUsize, Ordering},
},
sync::{atomic::AtomicUsize, Arc},
};
use glam::{Affine2, Affine3A, Mat3A, Quat, Vec2, Vec3, Vec3A};
use serde::Deserialize;
use slotmap::new_key_type;
use vulkano::{format::Format, image::view::ImageView};
use crate::{
@@ -21,8 +18,9 @@ use super::{
static OVERLAY_AUTO_INCREMENT: AtomicUsize = AtomicUsize::new(0);
#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Default)]
pub struct OverlayID(pub usize);
new_key_type! {
pub struct OverlayID;
}
pub const Z_ORDER_TOAST: u32 = 70;
pub const Z_ORDER_LINES: u32 = 69;
@@ -32,7 +30,6 @@ pub const Z_ORDER_DEFAULT: u32 = 0;
pub const Z_ORDER_DASHBOARD: u32 = Z_ORDER_DEFAULT;
pub struct OverlayState {
pub id: OverlayID,
pub name: Arc<str>,
pub want_visible: bool,
pub show_hide: bool,
@@ -56,7 +53,6 @@ pub struct OverlayState {
impl Default for OverlayState {
fn default() -> Self {
Self {
id: OverlayID(OVERLAY_AUTO_INCREMENT.fetch_add(1, Ordering::Relaxed)),
name: Arc::from(""),
want_visible: false,
show_hide: false,