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

xrt: Change PS Sense proximity inputs to boolean to match other proximity inputs

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

authored by Jakob Bornecrantz and committed by Marge Bot 6f8c75ef d341b76f

options
unified split
Changed files
+18 -16
src
xrt
drivers
pssense
pssense_driver.c
include
xrt
xrt_defines.h
+6 -6
src/xrt/drivers/pssense/pssense_driver.c
··· 84 84 PSSENSE_INDEX_CIRCLE_TOUCH, 85 85 PSSENSE_INDEX_SQUEEZE_CLICK, 86 86 PSSENSE_INDEX_SQUEEZE_TOUCH, 87 - PSSENSE_INDEX_SQUEEZE_PROXIMITY, 87 + PSSENSE_INDEX_SQUEEZE_PROXIMITY_FLOAT, 88 88 PSSENSE_INDEX_TRIGGER_CLICK, 89 89 PSSENSE_INDEX_TRIGGER_TOUCH, 90 90 PSSENSE_INDEX_TRIGGER_VALUE, 91 - PSSENSE_INDEX_TRIGGER_PROXIMITY, 91 + PSSENSE_INDEX_TRIGGER_PROXIMITY_FLOAT, 92 92 PSSENSE_INDEX_THUMBSTICK, 93 93 PSSENSE_INDEX_THUMBSTICK_CLICK, 94 94 PSSENSE_INDEX_THUMBSTICK_TOUCH, ··· 661 661 pssense->base.inputs[PSSENSE_INDEX_CIRCLE_TOUCH].value.boolean = pssense->state.circle_touch; 662 662 pssense->base.inputs[PSSENSE_INDEX_SQUEEZE_CLICK].value.boolean = pssense->state.squeeze_click; 663 663 pssense->base.inputs[PSSENSE_INDEX_SQUEEZE_TOUCH].value.boolean = pssense->state.squeeze_touch; 664 - pssense->base.inputs[PSSENSE_INDEX_SQUEEZE_PROXIMITY].value.vec1.x = pssense->state.squeeze_proximity; 664 + pssense->base.inputs[PSSENSE_INDEX_SQUEEZE_PROXIMITY_FLOAT].value.vec1.x = pssense->state.squeeze_proximity; 665 665 pssense->base.inputs[PSSENSE_INDEX_TRIGGER_CLICK].value.boolean = pssense->state.trigger_click; 666 666 pssense->base.inputs[PSSENSE_INDEX_TRIGGER_TOUCH].value.boolean = pssense->state.trigger_touch; 667 667 pssense->base.inputs[PSSENSE_INDEX_TRIGGER_VALUE].value.vec1.x = pssense->state.trigger_value; 668 - pssense->base.inputs[PSSENSE_INDEX_TRIGGER_PROXIMITY].value.vec1.x = pssense->state.trigger_proximity; 668 + pssense->base.inputs[PSSENSE_INDEX_TRIGGER_PROXIMITY_FLOAT].value.vec1.x = pssense->state.trigger_proximity; 669 669 pssense->base.inputs[PSSENSE_INDEX_THUMBSTICK].value.vec2 = pssense->state.thumbstick; 670 670 pssense->base.inputs[PSSENSE_INDEX_THUMBSTICK_CLICK].value.boolean = pssense->state.thumbstick_click; 671 671 pssense->base.inputs[PSSENSE_INDEX_THUMBSTICK_TOUCH].value.boolean = pssense->state.thumbstick_touch; ··· 933 933 SET_INPUT(CIRCLE_TOUCH); 934 934 SET_INPUT(SQUEEZE_CLICK); 935 935 SET_INPUT(SQUEEZE_TOUCH); 936 - SET_INPUT(SQUEEZE_PROXIMITY); 936 + SET_INPUT(SQUEEZE_PROXIMITY_FLOAT); 937 937 SET_INPUT(TRIGGER_CLICK); 938 938 SET_INPUT(TRIGGER_TOUCH); 939 939 SET_INPUT(TRIGGER_VALUE); 940 - SET_INPUT(TRIGGER_PROXIMITY); 940 + SET_INPUT(TRIGGER_PROXIMITY_FLOAT); 941 941 SET_INPUT(THUMBSTICK); 942 942 SET_INPUT(THUMBSTICK_CLICK); 943 943 SET_INPUT(THUMBSTICK_TOUCH);
+12 -10
src/xrt/include/xrt/xrt_defines.h
··· 1121 1121 _(XRT_INPUT_PSSENSE_CIRCLE_TOUCH , XRT_INPUT_NAME(0x030a, BOOLEAN)) \ 1122 1122 _(XRT_INPUT_PSSENSE_SQUEEZE_CLICK , XRT_INPUT_NAME(0x030b, BOOLEAN)) \ 1123 1123 _(XRT_INPUT_PSSENSE_SQUEEZE_TOUCH , XRT_INPUT_NAME(0x030c, BOOLEAN)) \ 1124 - _(XRT_INPUT_PSSENSE_SQUEEZE_PROXIMITY , XRT_INPUT_NAME(0x030d, VEC1_ZERO_TO_ONE)) \ 1125 - _(XRT_INPUT_PSSENSE_TRIGGER_CLICK , XRT_INPUT_NAME(0x030e, BOOLEAN)) \ 1126 - _(XRT_INPUT_PSSENSE_TRIGGER_TOUCH , XRT_INPUT_NAME(0x030f, BOOLEAN)) \ 1127 - _(XRT_INPUT_PSSENSE_TRIGGER_VALUE , XRT_INPUT_NAME(0x0310, VEC1_ZERO_TO_ONE)) \ 1128 - _(XRT_INPUT_PSSENSE_TRIGGER_PROXIMITY , XRT_INPUT_NAME(0x0311, VEC1_ZERO_TO_ONE)) \ 1129 - _(XRT_INPUT_PSSENSE_THUMBSTICK , XRT_INPUT_NAME(0x0312, VEC2_MINUS_ONE_TO_ONE)) \ 1130 - _(XRT_INPUT_PSSENSE_THUMBSTICK_CLICK , XRT_INPUT_NAME(0x0313, BOOLEAN)) \ 1131 - _(XRT_INPUT_PSSENSE_THUMBSTICK_TOUCH , XRT_INPUT_NAME(0x0314, BOOLEAN)) \ 1132 - _(XRT_INPUT_PSSENSE_GRIP_POSE , XRT_INPUT_NAME(0x0315, POSE)) \ 1133 - _(XRT_INPUT_PSSENSE_AIM_POSE , XRT_INPUT_NAME(0x0316, POSE)) \ 1124 + _(XRT_INPUT_PSSENSE_SQUEEZE_PROXIMITY , XRT_INPUT_NAME(0x030d, BOOLEAN)) \ 1125 + _(XRT_INPUT_PSSENSE_SQUEEZE_PROXIMITY_FLOAT , XRT_INPUT_NAME(0x030e, VEC1_ZERO_TO_ONE)) \ 1126 + _(XRT_INPUT_PSSENSE_TRIGGER_CLICK , XRT_INPUT_NAME(0x030f, BOOLEAN)) \ 1127 + _(XRT_INPUT_PSSENSE_TRIGGER_TOUCH , XRT_INPUT_NAME(0x0310, BOOLEAN)) \ 1128 + _(XRT_INPUT_PSSENSE_TRIGGER_VALUE , XRT_INPUT_NAME(0x0311, VEC1_ZERO_TO_ONE)) \ 1129 + _(XRT_INPUT_PSSENSE_TRIGGER_PROXIMITY , XRT_INPUT_NAME(0x0312, BOOLEAN)) \ 1130 + _(XRT_INPUT_PSSENSE_TRIGGER_PROXIMITY_FLOAT , XRT_INPUT_NAME(0x0313, VEC1_ZERO_TO_ONE)) \ 1131 + _(XRT_INPUT_PSSENSE_THUMBSTICK , XRT_INPUT_NAME(0x0314, VEC2_MINUS_ONE_TO_ONE)) \ 1132 + _(XRT_INPUT_PSSENSE_THUMBSTICK_CLICK , XRT_INPUT_NAME(0x0315, BOOLEAN)) \ 1133 + _(XRT_INPUT_PSSENSE_THUMBSTICK_TOUCH , XRT_INPUT_NAME(0x0316, BOOLEAN)) \ 1134 + _(XRT_INPUT_PSSENSE_GRIP_POSE , XRT_INPUT_NAME(0x0317, POSE)) \ 1135 + _(XRT_INPUT_PSSENSE_AIM_POSE , XRT_INPUT_NAME(0x0318, POSE)) \ 1134 1136 \ 1135 1137 /** XR_EXT_hand_interaction */ \ 1136 1138 _(XRT_INPUT_HAND_PINCH_POSE , XRT_INPUT_NAME(0x0401, POSE)) \