Corrected values based on official drivers

Author: hare_ware

src/input/profiles.rs

@@ -1,26 +1,29 @@
-pub mod hp_motion_controller;
 pub mod knuckles;
-pub mod ms_motion_controller;
+
 pub mod oculus_touch;
-pub mod samsung_odyssey_controller;
+
 pub mod simple_controller;
 pub mod vive_controller;
+pub mod wmr;
+
 #[cfg(feature = "monado")]
 pub mod vive_tracker;
+
 use super::{
     action_manifest::ControllerType, legacy::LegacyBindings, skeletal::SkeletalInputBindings,
 };
 use crate::openxr_data::Hand;
-use samsung_odyssey_controller::SamsungOdysseyController;
 use glam::Mat4;
-use hp_motion_controller::ReverbG2Controller;
 use knuckles::Knuckles;
-use ms_motion_controller::HolographicController;
 use oculus_touch::Touch;
 use openxr as xr;
 use simple_controller::SimpleController;
 use std::ffi::CStr;
 use vive_controller::ViveWands;
+use wmr::{
+    hp_motion_controller::ReverbG2Controller, ms_motion_controller::HolographicController,
+    samsung_odyssey_controller::SamsungOdysseyController,
+};
 
 #[allow(private_interfaces)]
 pub trait InteractionProfile: Sync + Send {

src/input/profiles/samsung_odyssey_controller.rs

@@ -1,11 +1,13 @@
-use super::{
+use super::super::{
     InteractionProfile, MainAxisType, PathTranslation, ProfileProperties, Property,
     SkeletalInputBindings, StringToPath,
 };
+
 use crate::button_mask_from_ids;
 use crate::input::legacy;
 use crate::input::legacy::button_mask_from_id;
 use crate::input::legacy::LegacyBindings;
+use crate::input::profiles::wmr;
 use crate::openxr_data::Hand;
 use glam::Mat4;
 use glam::Quat;
@@ -17,21 +19,24 @@ pub struct ReverbG2Controller;
 impl InteractionProfile for ReverbG2Controller {
     fn properties(&self) -> &'static ProfileProperties {
         static DEVICE_PROPERTIES: ProfileProperties = ProfileProperties {
-            model: Property::BothHands(c"WindowsMR"), // "VAC-151B" controllers
+            model: Property::PerHand {
+                left:c"WindowsMR: 0x045E/0x066A/0/1",
+                right: c"WindowsMR: 0x045E/0x066A/0/2",
+            },
             openvr_controller_type: c"hpmotioncontroller",
-            render_model_name: Property::BothHands(c"hpmotioncontroller"),
+            render_model_name: Property::PerHand {
+                left: c"C:\\Users\\steamuser\\AppData\\Local\\Microsoft/Windows/OpenVR\\controller_1642_1118_1\\controller.obj",
+                right: c"C:\\Users\\steamuser\\AppData\\Local\\Microsoft/Windows/OpenVR\\controller_1642_1118_2\\controller.obj"
+            },
             main_axis: MainAxisType::Thumbstick,
-            // TODO: I'm not certain whether that's correct here, THIS IS A GUESS
+            // The official drivers don't seem to return anything for this:
             registered_device_type: Property::PerHand {
-                left: c"WindowsMR/hpmotioncontrollerLHR-00000001",
-                right: c"WindowsMR/hpmotioncontrollerLHR-00000002",
-            },
-            serial_number: Property::PerHand {
-                left: c"hpmotioncontrollerLHR-00000001",
-                right: c"hpmotioncontrollerLHR-00000002",
+                left: c"WindowsMR/MRSOURCE0",
+                right: c"WindowsMR/MRSOURCE1",
             },
-            tracking_system_name: c"WindowsMR", // TODO: Not sure if this is right, THIS IS A GUESS
-            manufacturer_name: c"WindowsMR",
+            serial_number: wmr::SERIAL_NUMBER,
+            tracking_system_name: wmr::TRACKING_SYSTEM_NAME,
+            manufacturer_name: c"WindowsMR: 0x045E",
             legacy_buttons_mask: button_mask_from_ids!(
                 System,
                 ApplicationMenu,

…c/input/profiles/hp_motion_controller.rs …put/profiles/wmr/hp_motion_controller.rssrc/input/profiles/hp_motion_controller.rs renamed to src/input/profiles/wmr/hp_motion_controller.rs src/input/profiles/hp_motion_controller.rs renamed to src/input/profiles/wmr/hp_motion_controller.rs

@@ -0,0 +1,18 @@
+use std::ffi::CStr;
+
+use crate::input::legacy::button_mask_from_id;
+use crate::{button_mask_from_ids, input::profiles::Property};
+use openvr::EVRButtonId::{ApplicationMenu, Axis0, Axis1, Axis2, Grip, System, A};
+
+pub mod hp_motion_controller;
+pub mod ms_motion_controller;
+pub mod samsung_odyssey_controller;
+
+const TRACKING_SYSTEM_NAME: &'static CStr = c"holographic";
+const SERIAL_NUMBER: Property<&'static CStr> = Property::PerHand {
+    left: c"MRSOURCE0",
+    right: c"MRSOURCE1",
+};
+const OG_OPENVR_CONTROLLER_TYPE: &'static CStr = c"holographic_controller";
+const OG_LEGACY_BUTTONS_MASK: u64 =
+    button_mask_from_ids!(System, ApplicationMenu, Grip, Axis0, Axis1, Axis2, A);

src/input/profiles/wmr/mod.rs

@@ -1,45 +1,38 @@
-use super::{
+use super::super::{
     InteractionProfile, MainAxisType, PathTranslation, ProfileProperties, Property,
     SkeletalInputBindings, StringToPath,
 };
-use crate::button_mask_from_ids;
 use crate::input::legacy;
-use crate::input::legacy::button_mask_from_id;
 use crate::input::legacy::LegacyBindings;
+use crate::input::profiles::wmr;
 use crate::openxr_data::Hand;
 use glam::Mat4;
 use glam::Vec3;
-use openvr::EVRButtonId::{ApplicationMenu, Axis0, Axis1, Axis2, Grip, System, A};
 
 pub struct HolographicController;
 
 impl InteractionProfile for HolographicController {
     fn properties(&self) -> &'static ProfileProperties {
         static DEVICE_PROPERTIES: ProfileProperties = ProfileProperties {
-            model: Property::BothHands(c"WindowsMR"), // "VAC-151B" controllers
-            openvr_controller_type: c"holographic_controller",
-            render_model_name: Property::BothHands(c"holographic_controller"),
+            model: Property::PerHand {
+                left:c"WindowsMR: 0x045E/0x065B/0/1",
+                right: c"WindowsMR: 0x045E/0x065B/0/2",
+            },
+            openvr_controller_type: wmr::OG_OPENVR_CONTROLLER_TYPE,
+            render_model_name: Property::PerHand {
+                left: c"C:\\Users\\steamuser\\AppData\\Local\\Microsoft/Windows/OpenVR\\controller_1627_1118_1\\controller.obj",
+                right: c"C:\\Users\\steamuser\\AppData\\Local\\Microsoft/Windows/OpenVR\\controller_1627_1118_2\\controller.obj"
+            },
             main_axis: MainAxisType::Thumbstick,
-            // TODO: I'm not certain whether that's correct here, THIS IS A GUESS
+            // The official driver doesn't seem return any thing for this?
             registered_device_type: Property::PerHand {
-                left: c"WindowsMR/holographic_controllerLHR-00000001",
-                right: c"WindowsMR/holographic_controllerLHR-00000002",
-            },
-            serial_number: Property::PerHand {
-                left: c"holographic_controllerLHR-00000001",
-                right: c"holographic_controllerLHR-00000002",
+                left: c"WindowsMR: 0x045E/0x065B/0/1",
+                right: c"WindowsMR: 0x045E/0x065B/0/2",
             },
-            tracking_system_name: c"WindowsMR", // TODO: Not sure if this is right, THIS IS A GUESS
-            manufacturer_name: c"WindowsMR",
-            legacy_buttons_mask: button_mask_from_ids!(
-                System,
-                ApplicationMenu,
-                Grip,
-                Axis0,
-                Axis1,
-                Axis2,
-                A
-            ),
+            serial_number: wmr::SERIAL_NUMBER,
+            tracking_system_name: wmr::TRACKING_SYSTEM_NAME,
+            manufacturer_name: c"WindowsMR: 0x045E",
+            legacy_buttons_mask: wmr::OG_LEGACY_BUTTONS_MASK,
         };
         &DEVICE_PROPERTIES
     }

…c/input/profiles/ms_motion_controller.rs …put/profiles/wmr/ms_motion_controller.rssrc/input/profiles/ms_motion_controller.rs renamed to src/input/profiles/wmr/ms_motion_controller.rs src/input/profiles/ms_motion_controller.rs renamed to src/input/profiles/wmr/ms_motion_controller.rs

@@ -0,0 +1,74 @@
+use super::super::{
+    InteractionProfile, PathTranslation, ProfileProperties, SkeletalInputBindings, StringToPath,
+};
+use super::ms_motion_controller::HolographicController;
+use crate::input::legacy::LegacyBindings;
+use crate::input::profiles::{wmr, MainAxisType, Property};
+use crate::openxr_data::Hand;
+use glam::Mat4;
+use glam::Vec3;
+
+pub struct SamsungOdysseyController;
+
+impl InteractionProfile for SamsungOdysseyController {
+    fn properties(&self) -> &'static ProfileProperties {
+        static DEVICE_PROPERTIES: ProfileProperties = ProfileProperties {
+            model: Property::PerHand {
+                left:c"WindowsMR: 0x04E8/0x065D/0/1",
+                right: c"WindowsMR: 0x04E8/0x065D/0/2",
+            },
+            openvr_controller_type: wmr::OG_OPENVR_CONTROLLER_TYPE,
+            render_model_name: Property::PerHand {
+                left: c"C:\\Users\\steamuser\\AppData\\Local\\Microsoft/Windows/OpenVR\\controller_1629_1256_1\\controller.obj",
+                right: c"C:\\Users\\steamuser\\AppData\\Local\\Microsoft/Windows/OpenVR\\controller_1629_1256_2\\controller.obj"
+            },
+            main_axis: MainAxisType::Thumbstick,
+            // The official driver doesn't seem return any thing for this?
+            registered_device_type: Property::PerHand {
+                left: c"WindowsMR/MRSOURCE0",
+                right: c"WindowsMR/MRSOURCE1",
+            },
+            serial_number: wmr::SERIAL_NUMBER,
+            tracking_system_name: wmr::TRACKING_SYSTEM_NAME,
+            manufacturer_name: c"WindowsMR: 0x04E8",
+            legacy_buttons_mask: wmr::OG_LEGACY_BUTTONS_MASK,
+        };
+        &DEVICE_PROPERTIES
+    }
+    fn profile_path(&self) -> &'static str {
+        "/interaction_profiles/samsung/odyssey_controller"
+    }
+    fn translate_map(&self) -> &'static [PathTranslation] {
+        HolographicController.translate_map()
+    }
+
+    fn legacy_bindings(&self, stp: &dyn StringToPath) -> LegacyBindings {
+        HolographicController.legacy_bindings(stp)
+    }
+
+    fn skeletal_input_bindings(&self, stp: &dyn StringToPath) -> SkeletalInputBindings {
+        HolographicController.skeletal_input_bindings(stp)
+    }
+
+    fn legal_paths(&self) -> Box<[String]> {
+        HolographicController.legal_paths()
+    }
+
+    fn offset_grip_pose(&self, _hand: Hand) -> Mat4 {
+        Mat4::from_translation(Vec3::new(
+            // From the models found here https://www.microsoft.com/en-us/download/details.aspx?id=56414
+            0.0, 0.079738, -0.035449,
+        ))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{InteractionProfile, SamsungOdysseyController};
+    use crate::input::profiles::wmr::ms_motion_controller;
+
+    #[test]
+    fn verify_bindings() {
+        ms_motion_controller::tests::base_verify_bindings(SamsungOdysseyController.profile_path());
+    }
+}