mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 02:26:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

a/bindings: Add distinct device enums for touch variants

Browse source 
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2356>
This commit is contained in:
Christoph Haag 2024-11-12 02:56:42 +01:00
parent aa2b0f9f1d
commit 0ad8c7441d
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/xrt/auxiliary/bindings/bindings.json
View file

@ -985,7 +985,7 @@
"title": "Meta Touch Controller (Rift CV1)", "title": "Meta Touch Controller (Rift CV1)",
"type": "tracked_controller", "type": "tracked_controller",
"steamvr_controllertype": "oculus_touch", "steamvr_controllertype": "oculus_touch",
"monado_device": "XRT_DEVICE_TOUCH_CONTROLLER", "monado_device": "XRT_DEVICE_TOUCH_CONTROLLER_RIFT_CV1",
"extended_by": ["ext/palm_pose", "grip_surface", "ext/hand_interaction_poses"], "extended_by": ["ext/palm_pose", "grip_surface", "ext/hand_interaction_poses"],
"openxr_version": { "openxr_version": {
"promoted": { "promoted": {
@ -1135,7 +1135,7 @@
"title": "Meta Touch Controller (Rift S / Quest 1)", "title": "Meta Touch Controller (Rift S / Quest 1)",
"type": "tracked_controller", "type": "tracked_controller",
"steamvr_controllertype": "oculus_touch", "steamvr_controllertype": "oculus_touch",
"monado_device": "XRT_DEVICE_TOUCH_CONTROLLER", "monado_device": "XRT_DEVICE_TOUCH_CONTROLLER_QUEST_1_RIFT_S",
"extended_by": ["ext/palm_pose", "grip_surface", "ext/hand_interaction_poses"], "extended_by": ["ext/palm_pose", "grip_surface", "ext/hand_interaction_poses"],
"openxr_version": { "openxr_version": {
"promoted": { "promoted": {
@ -1277,7 +1277,7 @@
"title": "Meta Touch Controller (Quest 2)", "title": "Meta Touch Controller (Quest 2)",
"type": "tracked_controller", "type": "tracked_controller",
"steamvr_controllertype": "oculus_touch", "steamvr_controllertype": "oculus_touch",
"monado_device": "XRT_DEVICE_TOUCH_CONTROLLER", "monado_device": "XRT_DEVICE_TOUCH_CONTROLLER_QUEST_2",
"extended_by": ["ext/palm_pose", "grip_surface", "ext/hand_interaction_poses"], "extended_by": ["ext/palm_pose", "grip_surface", "ext/hand_interaction_poses"],
"openxr_version": { "openxr_version": {
"promoted": { "promoted": {

3
src/xrt/include/xrt/xrt_defines.h
View file

@ -772,6 +772,9 @@ enum xrt_device_name
XRT_DEVICE_TOUCH_PRO_CONTROLLER, XRT_DEVICE_TOUCH_PRO_CONTROLLER,
XRT_DEVICE_TOUCH_PLUS_CONTROLLER, XRT_DEVICE_TOUCH_PLUS_CONTROLLER,
XRT_DEVICE_TOUCH_CONTROLLER_RIFT_CV1,
XRT_DEVICE_TOUCH_CONTROLLER_QUEST_1_RIFT_S,
XRT_DEVICE_TOUCH_CONTROLLER_QUEST_2,
}; };
/*! /*!