The open source OpenXR runtime
d/opengloves: Clarify input enums
authored by
Daniel Willmott
and committed by
Moses Turner
f953ed78
ddda9ec7
+29
-23
+29
-23
src/xrt/drivers/opengloves/opengloves_device.c
+29
-23
src/xrt/drivers/opengloves/opengloves_device.c
···
40
40
41
41
enum opengloves_input_index
42
42
{
43
-
OPENGLOVES_INDEX_HAND_TRACKING,
43
+
OPENGLOVES_INPUT_INDEX_HAND_TRACKING,
44
44
45
-
OPENGLOVES_INDEX_TRIGGER_CLICK,
46
-
OPENGLOVES_INDEX_TRIGGER_VALUE,
45
+
OPENGLOVES_INPUT_INDEX_TRIGGER_CLICK,
46
+
OPENGLOVES_INPUT_INDEX_TRIGGER_VALUE,
47
47
48
-
OPENGLOVES_INDEX_A_CLICK,
49
-
OPENGLOVES_INDEX_B_CLICK,
48
+
OPENGLOVES_INPUT_INDEX_A_CLICK,
49
+
OPENGLOVES_INPUT_INDEX_B_CLICK,
50
50
51
-
OPENGLOVES_INDEX_JOYSTICK_MAIN,
52
-
OPENGLOVES_INDEX_JOYSTICK_MAIN_CLICK,
51
+
OPENGLOVES_INPUT_INDEX_JOYSTICK_MAIN,
52
+
OPENGLOVES_INPUT_INDEX_JOYSTICK_MAIN_CLICK,
53
+
54
+
OPENGLOVES_INPUT_INDEX_COUNT
55
+
};
53
56
54
-
OPENGLOVES_INDEX_COUNT
57
+
enum opengloves_output_index
58
+
{
59
+
OPENGLOVES_OUPUT_INDEX_FORCE_FEEDBACK,
60
+
OPENGLOVES_OUTPUT_INDEX_COUNT
55
61
};
56
62
57
63
/*!
···
146
152
147
153
os_mutex_lock(&od->lock);
148
154
149
-
od->base.inputs[OPENGLOVES_INDEX_A_CLICK].value.boolean = od->last_input->buttons.A.pressed;
150
-
od->base.inputs[OPENGLOVES_INDEX_B_CLICK].value.boolean = od->last_input->buttons.B.pressed;
155
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_A_CLICK].value.boolean = od->last_input->buttons.A.pressed;
156
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_B_CLICK].value.boolean = od->last_input->buttons.B.pressed;
151
157
152
-
od->base.inputs[OPENGLOVES_INDEX_TRIGGER_CLICK].value.boolean = od->last_input->buttons.trigger.pressed;
153
-
od->base.inputs[OPENGLOVES_INDEX_TRIGGER_VALUE].value.vec1.x = od->last_input->buttons.trigger.value;
158
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_TRIGGER_CLICK].value.boolean = od->last_input->buttons.trigger.pressed;
159
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_TRIGGER_VALUE].value.vec1.x = od->last_input->buttons.trigger.value;
154
160
155
-
od->base.inputs[OPENGLOVES_INDEX_JOYSTICK_MAIN].value.vec2.x = od->last_input->joysticks.main.x;
156
-
od->base.inputs[OPENGLOVES_INDEX_JOYSTICK_MAIN].value.vec2.y = od->last_input->joysticks.main.y;
157
-
od->base.inputs[OPENGLOVES_INDEX_JOYSTICK_MAIN_CLICK].value.boolean = od->last_input->joysticks.main.pressed;
161
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_JOYSTICK_MAIN].value.vec2.x = od->last_input->joysticks.main.x;
162
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_JOYSTICK_MAIN].value.vec2.y = od->last_input->joysticks.main.y;
163
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_JOYSTICK_MAIN_CLICK].value.boolean =
164
+
od->last_input->joysticks.main.pressed;
158
165
159
166
os_mutex_unlock(&od->lock);
160
167
}
···
287
294
288
295
// hand tracking
289
296
od->base.get_hand_tracking = opengloves_device_get_hand_tracking;
290
-
od->base.inputs[OPENGLOVES_INDEX_HAND_TRACKING].name =
297
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_HAND_TRACKING].name =
291
298
od->hand == XRT_HAND_LEFT ? XRT_INPUT_GENERIC_HAND_TRACKING_LEFT : XRT_INPUT_GENERIC_HAND_TRACKING_RIGHT;
292
299
293
300
od->base.hand_tracking_supported = true;
···
297
304
od->base.update_inputs = opengloves_device_update_inputs;
298
305
od->last_input = U_TYPED_CALLOC(struct opengloves_input);
299
306
307
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_A_CLICK].name = XRT_INPUT_INDEX_A_CLICK;
308
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_B_CLICK].name = XRT_INPUT_INDEX_B_CLICK;
300
309
301
-
od->base.inputs[OPENGLOVES_INDEX_A_CLICK].name = XRT_INPUT_INDEX_A_CLICK;
302
-
od->base.inputs[OPENGLOVES_INDEX_B_CLICK].name = XRT_INPUT_INDEX_B_CLICK;
310
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_TRIGGER_VALUE].name = XRT_INPUT_INDEX_TRIGGER_VALUE;
311
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_TRIGGER_CLICK].name = XRT_INPUT_INDEX_TRIGGER_CLICK;
303
312
304
-
od->base.inputs[OPENGLOVES_INDEX_TRIGGER_VALUE].name = XRT_INPUT_INDEX_TRIGGER_VALUE;
305
-
od->base.inputs[OPENGLOVES_INDEX_TRIGGER_CLICK].name = XRT_INPUT_INDEX_TRIGGER_CLICK;
306
-
307
-
od->base.inputs[OPENGLOVES_INDEX_JOYSTICK_MAIN].name = XRT_INPUT_INDEX_THUMBSTICK;
308
-
od->base.inputs[OPENGLOVES_INDEX_JOYSTICK_MAIN_CLICK].name = XRT_INPUT_INDEX_THUMBSTICK_CLICK;
313
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_JOYSTICK_MAIN].name = XRT_INPUT_INDEX_THUMBSTICK;
314
+
od->base.inputs[OPENGLOVES_INPUT_INDEX_JOYSTICK_MAIN_CLICK].name = XRT_INPUT_INDEX_THUMBSTICK_CLICK;
309
315
310
316
// outputs
311
317
od->base.outputs[0].name =