modular ui rework

src/backend/openvr/helpers.rs

@@ -1,8 +1,10 @@
+use std::ffi::CStr;
+
 use glam::Affine3A;
-use ovr_overlay::{pose::Matrix3x4, sys::HmdMatrix34_t};
+use ovr_overlay::{pose::Matrix3x4, settings::SettingsManager, sys::HmdMatrix34_t};
 use thiserror::Error;
 
-use crate::backend::common::BackendError;
+use crate::backend::common::{BackendError, ColorChannel};
 
 pub trait Affine3AConvert {
     fn from_affine(affine: Affine3A) -> Self;
@@ -96,3 +98,92 @@ impl From<OVRError> for BackendError {
         BackendError::Fatal(anyhow::Error::new(e))
     }
 }
+
+use cstr::cstr;
+const STEAMVR_SECTION: &CStr = cstr!("steamvr");
+const COLOR_GAIN_CSTR: [&'static CStr; 3] = [
+    cstr!("hmdDisplayColorGainR"),
+    cstr!("hmdDisplayColorGainG"),
+    cstr!("hmdDisplayColorGainB"),
+];
+
+pub(super) fn adjust_gain(
+    settings: &mut SettingsManager,
+    ch: ColorChannel,
+    delta: f32,
+) -> Option<()> {
+    let current = [
+        settings
+            .get_float(STEAMVR_SECTION, COLOR_GAIN_CSTR[0])
+            .ok()?,
+        settings
+            .get_float(STEAMVR_SECTION, COLOR_GAIN_CSTR[1])
+            .ok()?,
+        settings
+            .get_float(STEAMVR_SECTION, COLOR_GAIN_CSTR[2])
+            .ok()?,
+    ];
+
+    // prevent user from turning everything black
+    let mut min = if current[0] + current[1] + current[2] < 0.11 {
+        0.1
+    } else {
+        0.0
+    };
+
+    match ch {
+        ColorChannel::R => {
+            settings
+                .set_float(
+                    STEAMVR_SECTION,
+                    COLOR_GAIN_CSTR[0],
+                    (current[0] + delta).clamp(min, 1.0),
+                )
+                .ok()?;
+        }
+        ColorChannel::G => {
+            settings
+                .set_float(
+                    STEAMVR_SECTION,
+                    COLOR_GAIN_CSTR[1],
+                    (current[1] + delta).clamp(min, 1.0),
+                )
+                .ok()?;
+        }
+        ColorChannel::B => {
+            settings
+                .set_float(
+                    STEAMVR_SECTION,
+                    COLOR_GAIN_CSTR[2],
+                    (current[2] + delta).clamp(min, 1.0),
+                )
+                .ok()?;
+        }
+        ColorChannel::All => {
+            min *= 0.3333;
+            settings
+                .set_float(
+                    STEAMVR_SECTION,
+                    COLOR_GAIN_CSTR[0],
+                    (current[0] + delta).clamp(min, 1.0),
+                )
+                .ok()?;
+            settings
+                .set_float(
+                    STEAMVR_SECTION,
+                    COLOR_GAIN_CSTR[1],
+                    (current[1] + delta).clamp(min, 1.0),
+                )
+                .ok()?;
+            settings
+                .set_float(
+                    STEAMVR_SECTION,
+                    COLOR_GAIN_CSTR[2],
+                    (current[2] + delta).clamp(min, 1.0),
+                )
+                .ok()?;
+        }
+    }
+
+    Some(())
+}

src/backend/openvr/mod.rs

@@ -20,9 +20,11 @@ use vulkano::{
 
 use crate::{
     backend::{
+        common::SystemTask,
         input::interact,
         notifications::NotificationManager,
         openvr::{
+            helpers::adjust_gain,
             input::{set_action_manifest, OpenVrInputSource},
             lines::LinePool,
             manifest::{install_manifest, uninstall_manifest},
@@ -64,11 +66,11 @@ pub fn openvr_run(running: Arc<AtomicBool>) -> Result<(), BackendError> {
 
     log::info!("Using OpenVR runtime");
 
-    let mut overlay_mngr = context.overlay_mngr();
-    //let mut settings_mngr = context.settings_mngr();
     let mut app_mgr = context.applications_mngr();
     let mut input_mngr = context.input_mngr();
     let mut system_mngr = context.system_mngr();
+    let mut overlay_mngr = context.overlay_mngr();
+    let mut settings_mngr = context.settings_mngr();
     let mut chaperone_mgr = context.chaperone_setup_mngr();
     let mut compositor_mngr = context.compositor_mngr();
 
@@ -185,6 +187,17 @@ pub fn openvr_run(running: Arc<AtomicBool>) -> Result<(), BackendError> {
                         overlays.remove_by_selector(&sel);
                     }
                 }
+                TaskType::System(task) => match task {
+                    SystemTask::ColorGain(channel, value) => {
+                        let _ = adjust_gain(&mut settings_mngr, channel, value);
+                    }
+                    SystemTask::FixFloor => {
+                        space_mover.fix_floor(&mut chaperone_mgr, &state.input_state);
+                    }
+                    SystemTask::ResetPlayspace => {
+                        space_mover.reset_offset(&mut chaperone_mgr);
+                    }
+                },
             }
         }
 

src/backend/openvr/playspace.rs

@@ -1,7 +1,10 @@
 use glam::Vec3A;
 use ovr_overlay::{chaperone_setup::ChaperoneSetupManager, sys::EChaperoneConfigFile};
 
-use crate::{backend::common::OverlayContainer, state::AppState};
+use crate::{
+    backend::{common::OverlayContainer, input::InputState},
+    state::AppState,
+};
 
 use super::overlay::OpenVrOverlayData;
 
@@ -58,6 +61,18 @@ impl PlayspaceMover {
         }
     }
 
+    pub fn reset_offset(&mut self, chaperone_mgr: &mut ChaperoneSetupManager) {
+        self.offset = Vec3A::ZERO;
+        self.apply_offset(chaperone_mgr);
+    }
+
+    pub fn fix_floor(&mut self, chaperone_mgr: &mut ChaperoneSetupManager, input: &InputState) {
+        let y1 = input.pointers[0].pose.translation.y;
+        let y2 = input.pointers[1].pose.translation.y;
+        self.offset.y += y1.min(y2) - 0.03;
+        self.apply_offset(chaperone_mgr);
+    }
+
     pub fn reset(&mut self) {
         self.offset = Vec3A::ZERO;
         self.start_position = Vec3A::ZERO;