From 8d3a221970ac7b57b49e1259832de89f5e54d331 Mon Sep 17 00:00:00 2001 From: Ada Date: Sat, 5 Apr 2025 17:27:30 +1000 Subject: [PATCH] Fix oculus controller path, add index controller bindings --- plugins/openxr/src/OpenXrInputPlugin.cpp | 25 +++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/plugins/openxr/src/OpenXrInputPlugin.cpp b/plugins/openxr/src/OpenXrInputPlugin.cpp index bca1de68a7..d18fa96627 100644 --- a/plugins/openxr/src/OpenXrInputPlugin.cpp +++ b/plugins/openxr/src/OpenXrInputPlugin.cpp @@ -428,7 +428,7 @@ bool OpenXrInputPlugin::InputDevice::initActions() { {"right_pose", hand_right + "/grip/pose"}, {"right_haptic", "/user/hand/right/output/haptic"}, }}, - {"/interaction_profiles/oculus_touch_controller", { + {"/interaction_profiles/oculus/touch_controller", { {"left_primary_click", hand_left + "/x/click"}, {"left_secondary_click", hand_left + "/y/click"}, {"left_squeeze_value", hand_left + "/squeeze/value"}, @@ -472,6 +472,29 @@ bool OpenXrInputPlugin::InputDevice::initActions() { {"right_pose", hand_right + "/grip/pose"}, {"right_haptic", "/user/hand/right/output/haptic"}, }}, + {"/interaction_profiles/valve/index_controller", { + {"left_primary_click", hand_left + "/a/click"}, + {"left_secondary_click", hand_left + "/b/click"}, + {"left_squeeze_value", hand_left + "/squeeze/value"}, + {"left_trigger_value", hand_left + "/trigger/value"}, + {"left_trigger_click", hand_left + "/trigger/click"}, + {"left_thumbstick", hand_left + "/thumbstick"}, + {"left_thumbstick_click", hand_left + "/thumbstick/click"}, + {"left_thumbstick_touch", hand_left + "/thumbstick/touch"}, + {"left_pose", hand_left + "/grip/pose"}, + {"left_haptic", "/user/hand/left/output/haptic"}, + + {"right_primary_click", hand_right + "/a/click"}, + {"right_secondary_click", hand_right + "/b/click"}, + {"right_squeeze_value", hand_right + "/squeeze/value"}, + {"right_trigger_value", hand_right + "/trigger/value"}, + {"right_trigger_click", hand_right + "/trigger/click"}, + {"right_thumbstick", hand_right + "/thumbstick"}, + {"right_thumbstick_click", hand_right + "/thumbstick/click"}, + {"right_thumbstick_touch", hand_right + "/thumbstick/touch"}, + {"right_pose", hand_right + "/grip/pose"}, + {"right_haptic", "/user/hand/right/output/haptic"}, + }}, }; for (const auto& [id, args] : actionTypes) {