fix(client_openxr): 🐛 Fix controllers profile for Pico 4 Ultra (#2470)

alvr-org · Oct 22, 2024 · a070a66 · a070a66
1 parent 65a4dd5
commit a070a66
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/alvr/client_core/src/platform/mod.rs b/alvr/client_core/src/platform/mod.rs
@@ -47,7 +47,14 @@ impl Platform {
     }
 
     pub const fn is_pico(&self) -> bool {
-        matches!(self, Platform::PicoNeo3 | Platform::Pico4)
+        matches!(
+            self,
+            Platform::PicoG3
+                | Platform::PicoNeo3
+                | Platform::Pico4
+                | Platform::Pico4Ultra
+                | Platform::PicoUnknown
+        )
     }
 
     pub const fn is_vive(&self) -> bool {

diff --git a/alvr/client_openxr/src/interaction.rs b/alvr/client_openxr/src/interaction.rs
@@ -100,7 +100,7 @@ pub fn initialize_interaction(
     let controllers_profile_path = match platform {
         p if p.is_quest() => QUEST_CONTROLLER_PROFILE_PATH, // todo: create new controller profile for quest pro and 3
         Platform::PicoNeo3 => PICO_NEO3_CONTROLLER_PROFILE_PATH,
-        Platform::Pico4 => PICO4_CONTROLLER_PROFILE_PATH,
+        p if p.is_pico() => PICO4_CONTROLLER_PROFILE_PATH,
         p if p.is_vive() => FOCUS3_CONTROLLER_PROFILE_PATH,
         Platform::Yvr => YVR_CONTROLLER_PROFILE_PATH,
         _ => QUEST_CONTROLLER_PROFILE_PATH,