The open source OpenXR runtime
d/wmr: Add Home button click to the OG WMR controller
authored by
Jan Schmidt
and committed by
Jakob Bornecrantz
3d0c898e
ea53d274
+4
-1
+4
-1
src/xrt/drivers/wmr/wmr_controller_og.c
+4
-1
src/xrt/drivers/wmr/wmr_controller_og.c
···
32
32
enum wmr_controller_og_input_index
33
33
{
34
34
WMR_CONTROLLER_INDEX_MENU_CLICK,
35
+
WMR_CONTROLLER_INDEX_HOME_CLICK,
35
36
WMR_CONTROLLER_INDEX_SQUEEZE_CLICK,
36
37
WMR_CONTROLLER_INDEX_TRIGGER_VALUE,
37
38
WMR_CONTROLLER_INDEX_THUMBSTICK_CLICK,
···
267
268
struct wmr_controller_og_input *cur_inputs = &ctrl->last_inputs;
268
269
269
270
xrt_inputs[WMR_CONTROLLER_INDEX_MENU_CLICK].value.boolean = cur_inputs->menu;
271
+
xrt_inputs[WMR_CONTROLLER_INDEX_HOME_CLICK].value.boolean = cur_inputs->home;
270
272
xrt_inputs[WMR_CONTROLLER_INDEX_SQUEEZE_CLICK].value.boolean = cur_inputs->squeeze;
271
273
xrt_inputs[WMR_CONTROLLER_INDEX_TRIGGER_VALUE].value.vec1.x = cur_inputs->trigger;
272
274
xrt_inputs[WMR_CONTROLLER_INDEX_THUMBSTICK_CLICK].value.boolean = cur_inputs->thumbstick.click;
···
304
306
DRV_TRACE_MARKER();
305
307
306
308
enum u_device_alloc_flags flags = U_DEVICE_ALLOC_TRACKING_NONE;
307
-
struct wmr_controller_og *ctrl = U_DEVICE_ALLOCATE(struct wmr_controller_og, flags, 10, 1);
309
+
struct wmr_controller_og *ctrl = U_DEVICE_ALLOCATE(struct wmr_controller_og, flags, 11, 1);
308
310
struct wmr_controller_base *wcb = (struct wmr_controller_base *)(ctrl);
309
311
310
312
if (!wmr_controller_base_init(wcb, conn, controller_type, log_level)) {
···
319
321
wcb->base.set_output = wmr_controller_og_set_output;
320
322
321
323
SET_INPUT(wcb, MENU_CLICK);
324
+
SET_INPUT(wcb, HOME_CLICK);
322
325
SET_INPUT(wcb, SQUEEZE_CLICK);
323
326
SET_INPUT(wcb, TRIGGER_VALUE);
324
327
SET_INPUT(wcb, THUMBSTICK_CLICK);