Skip to content

Commit

Permalink
[PicoXR] Remove the Pico4xOld interaction profile
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
svillar committed Feb 4, 2025
1 parent 6245f69 commit 2d7e9c6
Showing 1 changed file with 2 additions and 27 deletions.
29 changes: 2 additions & 27 deletions app/src/openxr/cpp/OpenXRInputMappings.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<OpenXRInputProfile> { "pico-4", "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 },
},
};

const OpenXRInputMapping Pico4x {
"/interaction_profiles/bytedance/pico4_controller",
"vr_controller_pico4_left.obj",
Expand Down Expand Up @@ -475,8 +450,8 @@ namespace crow {
},
};

const std::array<OpenXRInputMapping, 15> OpenXRInputMappings {
OculusTouch, OculusTouch2, MetaQuestTouchPro, Pico4U, Pico4x, Pico4xOld, PicoNeo3, Hvr6DOF, Hvr3DOF, LenovoVRX, MagicLeap2, MetaTouchPlus, HandInteraction, MSFTHandInteraction, KHRSimple
const std::array<OpenXRInputMapping, 14> OpenXRInputMappings {
OculusTouch, OculusTouch2, MetaQuestTouchPro, Pico4U, Pico4x, PicoNeo3, Hvr6DOF, Hvr3DOF, LenovoVRX, MagicLeap2, MetaTouchPlus, HandInteraction, MSFTHandInteraction, KHRSimple
};

} // namespace crow

0 comments on commit 2d7e9c6

Please sign in to comment.