Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PicoXR] Added a new interaction profile for the Pico 4 Ultra #1746

Merged
merged 3 commits into from
Feb 6, 2025
Merged

[PicoXR] Added a new interaction profile for the Pico 4 Ultra #1746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5306610
Revert "[Pico] Workaround input profile selection in Pico4 Ultra"
svillar Feb 4, 2025
6245f69
[PicoXR] Use a different input profile for Pico4U
svillar Feb 4, 2025
2d7e9c6
[PicoXR] Remove the Pico4xOld interaction profile
svillar Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 4 additions & 30 deletions app/src/openxr/cpp/OpenXRInputMappings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ namespace crow {
constexpr const char* kPathActionReady { "ready_ext" };
constexpr const char* kInteractionProfileHandInteraction { "/interaction_profiles/ext/hand_interaction_ext" };
constexpr const char* kInteractionProfileMSFTHandInteraction { "/interaction_profiles/microsoft/hand_interaction" };
constexpr const char* kInteractionProfileKHRSimple { "/interaction_profiles/khr/simple_controller" };

// OpenXR Button List
enum class OpenXRButtonType {
Expand Down Expand Up @@ -240,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 All @@ -290,7 +264,7 @@ namespace crow {
};

const OpenXRInputMapping Pico4U {
"/interaction_profiles/bytedance/pico4_controller",
"/interaction_profiles/bytedance/pico4s_controller",
"vr_controller_pico4u_left.obj",
"vr_controller_pico4u_right.obj",
device::Pico4U,
Expand Down Expand Up @@ -461,7 +435,7 @@ namespace crow {

// Default fallback: https://github.com/immersive-web/webxr-input-profiles/blob/master/packages/registry/profiles/generic/generic-button.json
const OpenXRInputMapping KHRSimple {
kInteractionProfileKHRSimple,
"/interaction_profiles/khr/simple_controller",
"generic-trigger.obj",
"generic-trigger.obj",
device::UnknownType,
Expand All @@ -476,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
6 changes: 0 additions & 6 deletions app/src/openxr/cpp/OpenXRInputSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@ XrResult OpenXRInputSource::Initialize()
for (auto& mapping: OpenXRInputMappings) {
// Always populate default/fall-back profiles
if (mapping.controllerType == device::UnknownType) {
#if PICOXR
// Pico4U runtime incorrectly prioritize the Khronos simple controller over Pico's
// specific one. Workaround that bad behaviour by skipping the simple controller profile.
if (mDeviceType == device::Pico4U && !strcmp(mapping.path, kInteractionProfileKHRSimple))
continue;
#endif
mMappings.push_back(mapping);
// Use the system's deviceType instead to ensure we get a valid VRController on WebXR sessions
mMappings.back().controllerType = mDeviceType;
Expand Down
Loading