matrixfurry.com / monado
The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

a/bindings: Add distinct device enums for touch variants

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2356>

Christoph Haag 0ad8c744 aa2b0f9f

+6 -3
+3 -3
src/xrt/auxiliary/bindings/bindings.json
··· 985 985 "title": "Meta Touch Controller (Rift CV1)", 986 986 "type": "tracked_controller", 987 987 "steamvr_controllertype": "oculus_touch", 988 - "monado_device": "XRT_DEVICE_TOUCH_CONTROLLER", 988 + "monado_device": "XRT_DEVICE_TOUCH_CONTROLLER_RIFT_CV1", 989 989 "extended_by": ["ext/palm_pose", "grip_surface", "ext/hand_interaction_poses"], 990 990 "openxr_version": { 991 991 "promoted": { ··· 1135 1135 "title": "Meta Touch Controller (Rift S / Quest 1)", 1136 1136 "type": "tracked_controller", 1137 1137 "steamvr_controllertype": "oculus_touch", 1138 - "monado_device": "XRT_DEVICE_TOUCH_CONTROLLER", 1138 + "monado_device": "XRT_DEVICE_TOUCH_CONTROLLER_QUEST_1_RIFT_S", 1139 1139 "extended_by": ["ext/palm_pose", "grip_surface", "ext/hand_interaction_poses"], 1140 1140 "openxr_version": { 1141 1141 "promoted": { ··· 1277 1277 "title": "Meta Touch Controller (Quest 2)", 1278 1278 "type": "tracked_controller", 1279 1279 "steamvr_controllertype": "oculus_touch", 1280 - "monado_device": "XRT_DEVICE_TOUCH_CONTROLLER", 1280 + "monado_device": "XRT_DEVICE_TOUCH_CONTROLLER_QUEST_2", 1281 1281 "extended_by": ["ext/palm_pose", "grip_surface", "ext/hand_interaction_poses"], 1282 1282 "openxr_version": { 1283 1283 "promoted": {
+3
src/xrt/include/xrt/xrt_defines.h
··· 772 772 773 773 XRT_DEVICE_TOUCH_PRO_CONTROLLER, 774 774 XRT_DEVICE_TOUCH_PLUS_CONTROLLER, 775 + XRT_DEVICE_TOUCH_CONTROLLER_RIFT_CV1, 776 + XRT_DEVICE_TOUCH_CONTROLLER_QUEST_1_RIFT_S, 777 + XRT_DEVICE_TOUCH_CONTROLLER_QUEST_2, 775 778 }; 776 779 777 780 /*!