From 9cc650ef2386badd80fe9eee488653039ce951ba Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Tue, 4 Feb 2025 16:44:24 +0100 Subject: [PATCH] [PicoXR] Remove the Pico4xOld interaction profile That interaction profile was used long time ago when the Pico4 device didn't have its own interaction profile. It's actually the profile designed for the Neo3. Recenctly Pico released an extension that provide a specific profile for the Pico4, so this should not be needed. Actually the code was not using it at all, so any device selecting it would be broken. --- app/src/openxr/cpp/OpenXRInputMappings.h | 29 ++---------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/app/src/openxr/cpp/OpenXRInputMappings.h b/app/src/openxr/cpp/OpenXRInputMappings.h index b43ef97359..79b990cbfe 100644 --- a/app/src/openxr/cpp/OpenXRInputMappings.h +++ b/app/src/openxr/cpp/OpenXRInputMappings.h @@ -239,31 +239,6 @@ namespace crow { }, }; - // Pico controller: this definition was created for the Pico 4, but the Neo 3 will likely also be compatible - const OpenXRInputMapping Pico4xOld { - "/interaction_profiles/pico/neo3_controller", - "vr_controller_pico4_left.obj", - "vr_controller_pico4_right.obj", - device::Pico4x, - std::vector { "pico-4", "generic-trigger-squeeze-thumbstick" }, - std::vector { - { 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 { - { OpenXRAxisType::Thumbstick, kPathThumbstick, OpenXRHandFlags::Both }, - }, - std::vector { - { kPathHaptic, OpenXRHandFlags::Both }, - }, - }; - const OpenXRInputMapping Pico4x { "/interaction_profiles/bytedance/pico4_controller", "vr_controller_pico4_left.obj", @@ -475,8 +450,8 @@ namespace crow { }, }; - const std::array OpenXRInputMappings { - OculusTouch, OculusTouch2, MetaQuestTouchPro, Pico4U, Pico4x, Pico4xOld, PicoNeo3, Hvr6DOF, Hvr3DOF, LenovoVRX, MagicLeap2, MetaTouchPlus, HandInteraction, MSFTHandInteraction, KHRSimple + const std::array OpenXRInputMappings { + OculusTouch, OculusTouch2, MetaQuestTouchPro, Pico4U, Pico4x, PicoNeo3, Hvr6DOF, Hvr3DOF, LenovoVRX, MagicLeap2, MetaTouchPlus, HandInteraction, MSFTHandInteraction, KHRSimple }; } // namespace crow