diff --git a/app/src/openxr/cpp/OpenXRInputMappings.h b/app/src/openxr/cpp/OpenXRInputMappings.h index 609fca70cb..537b953e3e 100644 --- a/app/src/openxr/cpp/OpenXRInputMappings.h +++ b/app/src/openxr/cpp/OpenXRInputMappings.h @@ -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 { @@ -461,7 +460,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, diff --git a/app/src/openxr/cpp/OpenXRInputSource.cpp b/app/src/openxr/cpp/OpenXRInputSource.cpp index 53d4d851d9..8943f5eeee 100644 --- a/app/src/openxr/cpp/OpenXRInputSource.cpp +++ b/app/src/openxr/cpp/OpenXRInputSource.cpp @@ -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;