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

OSC: Finish XSOverlay parity (#124)

Browse Source 
* osc-battery - utilise match return value to set parameter

this just lets parameter be a `&str` instead of a `String`, and reduces repetition.

* osc-battery - fix error where trackers were 1-indexed instead of 0-indexed

* osc-battery: xsoverlay parity! add average tracker and controller battery parameters.

this should now be in parity with xsoverlay's parameters.

gone back to 1-indexing trackers because it's more user-friendly, so other programs can standardise more easily.

* osc battery: ...that was not 1-indexed.

no idea how I made that mistake but the sent tracker parameters were actually still 0-indexed.
This commit is contained in:
Jay
2024-12-29 19:21:59 +11:00
committed by GitHub
parent 1903271d05
commit c6ff314e93
1 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/backend/osc.rs
View File

@@ -103,49 +103,67 @@ impl OscSender {
if self.last_sent_battery.elapsed().as_millis() >= 10000 { if self.last_sent_battery.elapsed().as_millis() >= 10000 {
self.last_sent_battery = Instant::now(); self.last_sent_battery = Instant::now();
let mut tracker_idx = 0; let mut tracker_count: i8 = 0;
let mut controller_count: i8 = 0;
let mut tracker_total_bat = 0.0;
let mut controller_total_bat = 0.0;
for device in &app.input_state.devices { for device in &app.input_state.devices {
let tracker_param;
// 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 {
TrackedDeviceRole::None => {continue}
match device.role {
TrackedDeviceRole::None => {parameter = String::from("")}
TrackedDeviceRole::Hmd => { TrackedDeviceRole::Hmd => {
// 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)
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. // as of 20 Nov 2024 OVR Toolkit uses 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: update this once their implementation matches their 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)],
)?; )?;
"headset"
} }
TrackedDeviceRole::LeftHand => {parameter = String::from("leftController")} TrackedDeviceRole::LeftHand => {
TrackedDeviceRole::RightHand => {parameter = String::from("rightController")} controller_count += 1;
TrackedDeviceRole::Tracker => {parameter = format!("tracker{tracker_idx}"); tracker_idx += 1;} controller_total_bat += level;
} "leftController"
}
TrackedDeviceRole::RightHand => {
controller_count += 1;
controller_total_bat += level;
"rightController"
}
TrackedDeviceRole::Tracker => {
tracker_count += 1;
tracker_total_bat += level;
tracker_param = format!("tracker{tracker_count}");
tracker_param.as_str()
}
};
// send battery parameters // send device battery parameters
if !parameter.is_empty() { self.send_message(
format!("/avatar/parameters/{parameter}Battery").into(),
self.send_message( vec![OscType::Float(level)],
format!("/avatar/parameters/{parameter}Battery").into(), )?;
vec![OscType::Float(level)], self.send_message(
)?; format!("/avatar/parameters/{parameter}Charging").into(),
self.send_message( vec![OscType::Bool(device.charging)],
format!("/avatar/parameters/{parameter}Charging").into(), )?;
vec![OscType::Bool(device.charging)],
)?;
}
} }
// send average controller and tracker battery parameters
self.send_message(
format!("/avatar/parameters/averageControllerBattery").into(),
vec![OscType::Float(controller_total_bat / controller_count as f32)],
)?;
self.send_message(
format!("/avatar/parameters/averageTrackerBattery").into(),
vec![OscType::Float(tracker_total_bat / tracker_count as f32)],
)?;
} }
Ok(()) Ok(())