Add support for Pico Neo3 controllers

This brings support for the PicoNeo3 device using the OpenXR backend. Newly imported 3D controller models are used. The WebXR support was previously added to Gecko in Igalia/wolvic-gecko-patches@bbffd2d Fixes #557
Igalia · Jan 16, 2024 · c9c3bfd · c9c3bfd
1 parent f8426c2
commit c9c3bfd
Show file tree

Hide file tree

Showing 13 changed files with 22,085 additions and 7 deletions.
diff --git a/app/src/main/cpp/DeviceUtils.cpp b/app/src/main/cpp/DeviceUtils.cpp
@@ -140,6 +140,7 @@ device::DeviceType DeviceUtils::GetDeviceTypeFromSystem(bool is6DoF) {
         deviceNamesMap.emplace("Quest Pro", device::MetaQuestPro);
         deviceNamesMap.emplace("VRX", device::LenovoVRX);
         deviceNamesMap.emplace("Magic Leap 2", device::MagicLeap2);
+        deviceNamesMap.emplace("Pico Neo 3", device::PicoNeo3);
     }
 
     auto device = deviceNamesMap.find(model);

diff --git a/app/src/main/cpp/ExternalVR.cpp b/app/src/main/cpp/ExternalVR.cpp
@@ -249,7 +249,7 @@ mozilla::gfx::VRControllerType GetVRControllerTypeByDevice(device::DeviceType aT
       result = mozilla::gfx::VRControllerType::PicoG2;
       break;
     case device::PicoNeo3:
-      result = mozilla::gfx::VRControllerType::PicoNeo2;
+      result = mozilla::gfx::VRControllerType::PicoNeo3;
       break;
     case device::Pico4x:
       result = mozilla::gfx::VRControllerType::Pico4;

diff --git a/app/src/main/cpp/moz_external_vr.h b/app/src/main/cpp/moz_external_vr.h
@@ -151,6 +151,7 @@ enum class VRControllerType : uint8_t {
   PicoGaze,
   PicoG2,
   PicoNeo2,
+  PicoNeo3,
   Pico4,
   MetaQuest3,
   _end

diff --git a/app/src/openxr/cpp/OpenXRInputMappings.h b/app/src/openxr/cpp/OpenXRInputMappings.h
@@ -268,6 +268,31 @@ namespace crow {
             },
     };
 
+    const OpenXRInputMapping PicoNeo3 {
+            "/interaction_profiles/pico/neo3_controller",
+            IS_6DOF,
+            "vr_controller_piconeo3_left.obj",
+            "vr_controller_piconeo3_right.obj",
+            device::PicoNeo3,
+            std::vector<OpenXRInputProfile> { "pico-neo3", "generic-trigger-squeeze-thumbstick" },
+            std::vector<OpenXRButton> {
+                    { OpenXRButtonType::Trigger, kPathTrigger, OpenXRButtonFlags::ValueTouch, OpenXRHandFlags::Both },
+                    { OpenXRButtonType::Squeeze, kPathSqueeze, OpenXRButtonFlags::Value, OpenXRHandFlags::Both },
+                    { OpenXRButtonType::Thumbstick, kPathThumbstick, OpenXRButtonFlags::ClickTouch, OpenXRHandFlags::Both },
+                    { OpenXRButtonType::ButtonX, kPathButtonX, OpenXRButtonFlags::ClickTouch, OpenXRHandFlags::Left },
+                    { OpenXRButtonType::ButtonY, kPathButtonY, OpenXRButtonFlags::ClickTouch, OpenXRHandFlags::Left,  },
+                    { OpenXRButtonType::ButtonA, kPathButtonA, OpenXRButtonFlags::ClickTouch, OpenXRHandFlags::Right },
+                    { OpenXRButtonType::ButtonB, kPathButtonB, OpenXRButtonFlags::ClickTouch, OpenXRHandFlags::Right },
+                    { OpenXRButtonType::Back, kPathBack, OpenXRButtonFlags::Click, OpenXRHandFlags::Left, ControllerDelegate::Button::BUTTON_APP, true }
+            },
+            std::vector<OpenXRAxis> {
+                    { OpenXRAxisType::Thumbstick, kPathThumbstick,  OpenXRHandFlags::Both },
+            },
+            std::vector<OpenXRHaptic> {
+                    { kPathHaptic, OpenXRHandFlags::Both },
+            },
+    };
+
     // HVR 3DOF: https://github.com/immersive-web/webxr-input-profiles/blob/master/packages/registry/profiles/generic/generic-trigger-touchpad.json
     const OpenXRInputMapping Hvr3DOF {
             "/interaction_profiles/huawei/controller",
@@ -383,8 +408,8 @@ namespace crow {
             },
     };
 
-    const std::array<OpenXRInputMapping, 10> OpenXRInputMappings {
-        OculusTouch, OculusTouch2, MetaQuestTouchPro, Pico4x, Hvr6DOF, Hvr3DOF, LenovoVRX, MagicLeap2, MetaTouchPlus, KHRSimple
+    const std::array<OpenXRInputMapping, 11> OpenXRInputMappings {
+        OculusTouch, OculusTouch2, MetaQuestTouchPro, Pico4x, PicoNeo3, Hvr6DOF, Hvr3DOF, LenovoVRX, MagicLeap2, MetaTouchPlus, KHRSimple
     };
 
 } // namespace crow
diff --git a/app/src/picoxr/assets/vr_controller_piconeo3_left.mtl b/app/src/picoxr/assets/vr_controller_piconeo3_left.mtl
@@ -0,0 +1,13 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl lambert2SG
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.500000
+d 1.000000
+illum 2
+map_Kd vr_controller_piconeo3_left_tex.jpeg