mirrors/envision
1
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-04-19 19:14:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: use from trait for xrdevicerole to u32

Browse source
This commit is contained in:
Gabriele Musco 2024-08-27 23:22:56 +02:00
parent 828343b8ea
commit fec5473244
2 changed files with 49 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ui/factories/device_row_factory.rs
View file

@ -69,13 +69,12 @@ impl From<&XRDevice> for DeviceRowModelInit {
}),
subtitle: Some(d.name.clone()),
battery_status: d.battery.map(EnvisionBatteryStatus::from),
sort_index: d
.roles
.iter()
.min()
.unwrap_or(&XRDeviceRole::GenericTracker)
.as_number()
* 1000
sort_index: u32::from(
d.roles
.iter()
.min()
.unwrap_or(&XRDeviceRole::GenericTracker),
) * 1000
+ d.index,
..Default::default()
}

84
src/xr_devices.rs
View file

@ -65,18 +65,6 @@ impl Display for XRDeviceRole {
}
}
impl PartialOrd for XRDeviceRole {
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
Some(self.as_number().cmp(&other.as_number()))
}
}
impl Ord for XRDeviceRole {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
self.partial_cmp(other).unwrap()
}
}
impl XRDeviceRole {
pub fn iter() -> Iter<'static, Self> {
[
@ -134,35 +122,6 @@ impl XRDeviceRole {
}
}
pub fn as_number(&self) -> u32 {
match self {
Self::Head => 0,
Self::Eyes => 1,
Self::Left => 2,
Self::Right => 3,
Self::Gamepad => 4,
Self::HandTrackingLeft => 5,
Self::HandTrackingRight => 6,
// the following are not in libmonado
Self::HandheldObject => 7,
Self::LeftFoot => 8,
Self::RightFoot => 9,
Self::LeftShoulder => 10,
Self::RightShoulder => 11,
Self::LeftElbow => 12,
Self::RightElbow => 13,
Self::LeftKnee => 14,
Self::RightKnee => 15,
Self::Waist => 16,
Self::Chest => 17,
Self::Camera => 18,
Self::Keyboard => 19,
Self::GenericTracker => 20,
}
}
pub fn from_monado_str(s: &str) -> Option<Self> {
match s {
"head" => Some(Self::Head),
@ -219,6 +178,49 @@ impl XRDeviceRole {
}
}
impl From<&XRDeviceRole> for u32 {
fn from(value: &XRDeviceRole) -> Self {
match value {
XRDeviceRole::Head => 0,
XRDeviceRole::Eyes => 1,
XRDeviceRole::Left => 2,
XRDeviceRole::Right => 3,
XRDeviceRole::Gamepad => 4,
XRDeviceRole::HandTrackingLeft => 5,
XRDeviceRole::HandTrackingRight => 6,
// the following are not in libmonado
XRDeviceRole::HandheldObject => 7,
XRDeviceRole::LeftFoot => 8,
XRDeviceRole::RightFoot => 9,
XRDeviceRole::LeftShoulder => 10,
XRDeviceRole::RightShoulder => 11,
XRDeviceRole::LeftElbow => 12,
XRDeviceRole::RightElbow => 13,
XRDeviceRole::LeftKnee => 14,
XRDeviceRole::RightKnee => 15,
XRDeviceRole::Waist => 16,
XRDeviceRole::Chest => 17,
XRDeviceRole::Camera => 18,
XRDeviceRole::Keyboard => 19,
XRDeviceRole::GenericTracker => 20,
}
}
}
impl PartialOrd for XRDeviceRole {
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
Some(u32::from(self).cmp(&other.into()))
}
}
impl Ord for XRDeviceRole {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
self.partial_cmp(other).unwrap()
}
}
impl From<DeviceRole> for XRDeviceRole {
fn from(value: DeviceRole) -> Self {
match value {