From a853022a6617dcae375a0b5a7ef530afd36a8184 Mon Sep 17 00:00:00 2001 From: Moses Turner Date: Wed, 25 May 2022 21:35:18 +0100 Subject: [PATCH] d/vive: Don't create the hand-tracker ourselves --- src/xrt/drivers/vive/vive_prober.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/src/xrt/drivers/vive/vive_prober.c b/src/xrt/drivers/vive/vive_prober.c index 34d495d41..95efbd289 100644 --- a/src/xrt/drivers/vive/vive_prober.c +++ b/src/xrt/drivers/vive/vive_prober.c @@ -265,32 +265,7 @@ init_valve_index(struct xrt_prober *xp, int out_idx = 0; out_xdevs[out_idx++] = &d->base; - -#ifdef XRT_BUILD_DRIVER_HANDTRACKING - if (debug_get_bool_option_vive_use_handtracking()) { - struct t_stereo_camera_calibration *cal = NULL; - - struct xrt_pose head_in_left_cam; - // vive_get_stereo_camera_calibration(&ss->hmd->hmd.config, &cal, &head_in_left_cam); - vive_get_stereo_camera_calibration(&d->config, &cal, &head_in_left_cam); - - struct xrt_device *ht = ht_device_create_index(xp, cal); - if (ht != NULL) { // Returns NULL if there's a problem and the hand tracker can't start. By no means a - // fatal error. - struct xrt_device *wrap = - multi_create_tracking_override(XRT_TRACKING_OVERRIDE_ATTACHED, ht, &d->base, - XRT_INPUT_GENERIC_HEAD_POSE, &head_in_left_cam); - - struct xrt_device *two_hands[2]; - cemu_devices_create(&d->base, wrap, two_hands); - out_xdevs[out_idx++] = two_hands[0]; - out_xdevs[out_idx++] = two_hands[1]; - } - // Don't need it anymore. And it's not even created unless we enter this codepath, which is somewhat - // hard. - t_stereo_camera_calibration_reference(&cal, NULL); - } -#endif + *out_vive_config = &d->config; return out_idx; }