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

fix osc timer and give battery parameters their own timer

Browse Source
This commit is contained in:
cubee
2024-11-24 22:44:47 +11:00
committed by galister
parent 18b2e96079
commit a71f4de0ff
2 changed files with 77 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/openvr/mod.rs
View File

@@ -324,7 +324,7 @@ pub fn openvr_run(running: Arc<AtomicBool>, show_by_default: bool) -> Result<(),
#[cfg(feature = "osc")] #[cfg(feature = "osc")]
if let Some(ref mut sender) = osc_sender { if let Some(ref mut sender) = osc_sender {
let _ = sender.send_params(&overlays, &state); // i love inconsistent naming; in openxr.rs `state` is called `app_state` let _ = sender.send_params(&overlays, &state);
}; };
#[cfg(feature = "wayvr")] #[cfg(feature = "wayvr")]

145
src/backend/osc.rs
View File

@@ -16,7 +16,8 @@ use crate::{
use super::common::OverlayContainer; use super::common::OverlayContainer;
pub struct OscSender { pub struct OscSender {
last_sent: Instant, last_sent_overlay: Instant,
last_sent_battery: Instant,
upstream: UdpSocket, upstream: UdpSocket,
} }
@@ -34,7 +35,8 @@ impl OscSender {
Ok(Self { Ok(Self {
upstream, upstream,
last_sent: Instant::now(), last_sent_overlay: Instant::now(),
last_sent_battery: Instant::now(),
}) })
} }
@@ -55,91 +57,96 @@ impl OscSender {
where where
D: Default, D: Default,
{ {
if self.last_sent.elapsed().as_millis() < 100 { // send overlay data every 0.1 seconds
return Ok(()); if self.last_sent_overlay.elapsed().as_millis() >= 100 {
} self.last_sent_overlay = Instant::now();
let mut num_overlays = 0; let mut num_overlays = 0;
let mut has_keyboard = false; let mut has_keyboard = false;
let mut has_wrist = false; let mut has_wrist = false;
for o in overlays.iter() { for o in overlays.iter() {
if !o.state.want_visible { if !o.state.want_visible {
continue; continue;
} }
match o.state.name.as_ref() { match o.state.name.as_ref() {
WATCH_NAME => has_wrist = true, WATCH_NAME => has_wrist = true,
KEYBOARD_NAME => has_keyboard = true, KEYBOARD_NAME => has_keyboard = true,
_ => { _ => {
if o.state.interactable { if o.state.interactable {
num_overlays += 1 num_overlays += 1
}
} }
} }
} }
self.send_message(
"/avatar/parameters/isOverlayOpen".into(),
vec![OscType::Bool(num_overlays > 0)],
)?;
self.send_message(
"/avatar/parameters/isKeyboardOpen".into(),
vec![OscType::Bool(has_keyboard)],
)?;
self.send_message(
"/avatar/parameters/isWristVisible".into(),
vec![OscType::Bool(has_wrist)],
)?;
self.send_message(
"/avatar/parameters/openOverlayCount".into(),
vec![OscType::Int(num_overlays)],
)?;
} }
self.send_message( // send battery levels every 10 seconds
"/avatar/parameters/isOverlayOpen".into(), if self.last_sent_battery.elapsed().as_millis() >= 10000 {
vec![OscType::Bool(num_overlays > 0)], self.last_sent_battery = Instant::now();
)?;
self.send_message(
"/avatar/parameters/isKeyboardOpen".into(),
vec![OscType::Bool(has_keyboard)],
)?;
self.send_message(
"/avatar/parameters/isWristVisible".into(),
vec![OscType::Bool(has_wrist)],
)?;
self.send_message(
"/avatar/parameters/openOverlayCount".into(),
vec![OscType::Int(num_overlays)],
)?;
// battery levels let mut tracker_idx = 0;
let mut tracker_idx = 0;
for device in &app.input_state.devices { for device in &app.input_state.devices {
// soc is the battery level (set to device status.charge) // soc is the battery level (set to device status.charge)
let level = device.soc.unwrap_or(-1.0); let level = device.soc.unwrap_or(-1.0);
let parameter; let parameter;
match device.role { match device.role {
TrackedDeviceRole::None => {parameter = String::from("")} TrackedDeviceRole::None => {parameter = String::from("")}
TrackedDeviceRole::Hmd => { TrackedDeviceRole::Hmd => {
// XSOverlay style (float) // XSOverlay style (float)
// this parameter doesn't exist, but it's a stepping stone for 0-1 values (i presume XSOverlay would use the full name headset and not the abbreviation hmd) // this parameter doesn't exist, but it's a stepping stone for 0-1 values (i presume XSOverlay would use the full name headset and not the abbreviation hmd)
parameter = String::from("headset"); parameter = String::from("headset");
// legacy OVR Toolkit style (int) // legacy OVR Toolkit style (int)
// according to their docs, OVR Toolkit is now supposed to use float 0-1. // according to their docs, OVR Toolkit is now supposed to use float 0-1.
// as of 20 Nov 2024 they still use int 0-100, but this may change in a future update. // as of 20 Nov 2024 they still use int 0-100, but this may change in a future update.
//TODO: remove once their implementation matches the docs //TODO: remove once their implementation matches the docs
self.send_message( self.send_message(
"/avatar/parameters/hmdBattery".into(), "/avatar/parameters/hmdBattery".into(),
vec![OscType::Int((level * 100.0f32).round() as i32)], vec![OscType::Int((level * 100.0f32).round() as i32)],
)?; )?;
}
TrackedDeviceRole::LeftHand => {parameter = String::from("leftController")}
TrackedDeviceRole::RightHand => {parameter = String::from("rightController")}
TrackedDeviceRole::Tracker => {parameter = format!("tracker{tracker_idx}"); tracker_idx += 1;}
} }
TrackedDeviceRole::LeftHand => {parameter = String::from("leftController")}
TrackedDeviceRole::RightHand => {parameter = String::from("rightController")}
TrackedDeviceRole::Tracker => {parameter = format!("tracker{tracker_idx}"); tracker_idx += 1;}
}
// send battery parameters // send battery parameters
if !parameter.is_empty() { if !parameter.is_empty() {
self.send_message( self.send_message(
format!("/avatar/parameters/{parameter}Battery").into(), format!("/avatar/parameters/{parameter}Battery").into(),
vec![OscType::Float(level)], vec![OscType::Float(level)],
)?; )?;
self.send_message( self.send_message(
format!("/avatar/parameters/{parameter}Charging").into(), format!("/avatar/parameters/{parameter}Charging").into(),
vec![OscType::Bool(device.charging)], vec![OscType::Bool(device.charging)],
)?; )?;
}
} }
} }
Ok(()) Ok(())
} }