mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/survive: Don't create hand-tracker ourselves

Browse source
This commit is contained in:
Moses Turner 2022-05-25 21:37:43 +01:00
parent a853022a66
commit 00b6dd35ec
1 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/xrt/drivers/survive/survive_driver.c
View file

@ -1341,8 +1341,6 @@ survive_device_autoprobe(struct xrt_auto_prober *xap,
out_xdevs[out_idx++] = &ss->hmd->base;
}
bool found_controllers = false;
for (int i = 0; i < MAX_TRACKED_DEVICE_COUNT; i++) {
if (out_idx == XRT_MAX_DEVICES_PER_PROBE - 1) {
@ -1353,36 +1351,9 @@ survive_device_autoprobe(struct xrt_auto_prober *xap,
if (ss->controllers[i] != NULL) {
out_xdevs[out_idx++] = &ss->controllers[i]->base;
found_controllers = true;
}
}
#ifdef XRT_BUILD_DRIVER_HANDTRACKING
// We want to enter this codepath when we find a HMD but no controllers.
if ((ss->hmd != NULL) && !found_controllers) {
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);
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, &ss->hmd->base,
XRT_INPUT_GENERIC_HEAD_POSE, &head_in_left_cam);
struct xrt_device *two_hands[2];
cemu_devices_create(&ss->hmd->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
survive_already_initialized = true;