mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-02-05 13:28:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/qwerty: Fix tracking overrides and correct multi typo

Browse source
This commit is contained in:
Mateo de Mayo 2021-09-17 09:32:12 -03:00
parent e561d312f6
commit f70752aeda
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/xrt/drivers/multi_wrapper/multi.c
View file

@ -226,8 +226,8 @@ multi_create_tracking_override(enum xrt_tracking_override_type override_type,
d->base = *tracking_override_target;
// but take orientation and position tracking capabilities from tracker
d->base.orientation_tracking_supported = tracking_override_target->orientation_tracking_supported;
d->base.position_tracking_supported = tracking_override_target->position_tracking_supported;
d->base.orientation_tracking_supported = tracking_override_tracker->orientation_tracking_supported;
d->base.position_tracking_supported = tracking_override_tracker->position_tracking_supported;
// because we use the tracking data of the tracker, we use its tracking origin instead
d->base.tracking_origin = tracking_override_tracker->tracking_origin;

8
src/xrt/drivers/qwerty/qwerty_sdl.c
View file

@ -24,8 +24,12 @@ find_qwerty_system(struct xrt_device **xdevs, size_t num_xdevs)
if (xdevs[i] == NULL) {
continue;
}
if (strcmp(xdevs[i]->str, QWERTY_HMD_STR) == 0 || strcmp(xdevs[i]->str, QWERTY_LEFT_STR) == 0 ||
strcmp(xdevs[i]->str, QWERTY_RIGHT_STR) == 0) {
// We check against tracker name instead of device name because the tracking overrides
// cause the multi device to have the same names even though they are not qwerty devices.
const char *tracker_name = xdevs[i]->tracking_origin->name;
if (strcmp(tracker_name, QWERTY_HMD_TRACKER_STR) == 0 ||
strcmp(tracker_name, QWERTY_LEFT_TRACKER_STR) == 0 ||
strcmp(tracker_name, QWERTY_RIGHT_TRACKER_STR) == 0) {
xdev = xdevs[i];
break;
}