From 5787fd260f0735f1bf3c5104a0b27e3c2ac47245 Mon Sep 17 00:00:00 2001 From: BabbleBones Date: Tue, 13 Jun 2023 20:10:14 -0400 Subject: [PATCH] xrt: Add XRT_DEVICE_VIVE_TRACKER_{GEN3,TUNDRA} defines Tundra enumeration changes --- src/xrt/include/xrt/xrt_defines.h | 2 ++ src/xrt/state_trackers/oxr/oxr_binding.c | 4 +++- .../state_trackers/steamvr_drv/ovrd_driver.cpp | 16 ++++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/xrt/include/xrt/xrt_defines.h b/src/xrt/include/xrt/xrt_defines.h index 14c406ca6..6be812d6f 100644 --- a/src/xrt/include/xrt/xrt_defines.h +++ b/src/xrt/include/xrt/xrt_defines.h @@ -612,6 +612,8 @@ enum xrt_device_name XRT_DEVICE_VIVE_WAND, XRT_DEVICE_VIVE_TRACKER_GEN1, XRT_DEVICE_VIVE_TRACKER_GEN2, + XRT_DEVICE_VIVE_TRACKER_GEN3, + XRT_DEVICE_VIVE_TRACKER_TUNDRA, // "Controllers" somewhat sorted as listed in spec. XRT_DEVICE_SIMPLE_CONTROLLER, diff --git a/src/xrt/state_trackers/oxr/oxr_binding.c b/src/xrt/state_trackers/oxr/oxr_binding.c index cc2315526..afd4f89b4 100644 --- a/src/xrt/state_trackers/oxr/oxr_binding.c +++ b/src/xrt/state_trackers/oxr/oxr_binding.c @@ -346,7 +346,9 @@ get_profile_for_device_name(struct oxr_logger *log, case XRT_DEVICE_REALSENSE: case XRT_DEVICE_HAND_TRACKER: case XRT_DEVICE_VIVE_TRACKER_GEN1: - case XRT_DEVICE_VIVE_TRACKER_GEN2: return; + case XRT_DEVICE_VIVE_TRACKER_GEN2: + case XRT_DEVICE_VIVE_TRACKER_GEN3: + case XRT_DEVICE_VIVE_TRACKER_TUNDRA: return; } #undef FIND_PROFILE diff --git a/src/xrt/state_trackers/steamvr_drv/ovrd_driver.cpp b/src/xrt/state_trackers/steamvr_drv/ovrd_driver.cpp index b51eb9ee1..545ababe7 100644 --- a/src/xrt/state_trackers/steamvr_drv/ovrd_driver.cpp +++ b/src/xrt/state_trackers/steamvr_drv/ovrd_driver.cpp @@ -408,7 +408,9 @@ public: break; case XRT_DEVICE_VIVE_WAND: m_render_model = "vr_controller_vive_1_5"; break; case XRT_DEVICE_VIVE_TRACKER_GEN1: - case XRT_DEVICE_VIVE_TRACKER_GEN2: m_render_model = "{htc}vr_tracker_vive_1_0"; break; + case XRT_DEVICE_VIVE_TRACKER_GEN2: + case XRT_DEVICE_VIVE_TRACKER_GEN3: + case XRT_DEVICE_VIVE_TRACKER_TUNDRA: m_render_model = "{htc}vr_tracker_vive_1_0"; break; case XRT_DEVICE_PSMV: case XRT_DEVICE_HYDRA: case XRT_DEVICE_DAYDREAM: @@ -617,11 +619,13 @@ public: AddOutputControl(XRT_OUTPUT_NAME_PSMV_RUMBLE_VIBRATION, "/output/haptic"); } break; - case XRT_DEVICE_TOUCH_CONTROLLER: break; // TODO - case XRT_DEVICE_WMR_CONTROLLER: break; // TODO - case XRT_DEVICE_XBOX_CONTROLLER: break; // TODO - case XRT_DEVICE_VIVE_TRACKER_GEN1: break; // TODO - case XRT_DEVICE_VIVE_TRACKER_GEN2: break; // TODO + case XRT_DEVICE_TOUCH_CONTROLLER: break; // TODO + case XRT_DEVICE_WMR_CONTROLLER: break; // TODO + case XRT_DEVICE_XBOX_CONTROLLER: break; // TODO + case XRT_DEVICE_VIVE_TRACKER_GEN1: break; // TODO + case XRT_DEVICE_VIVE_TRACKER_GEN2: break; // TODO + case XRT_DEVICE_VIVE_TRACKER_GEN3: break; // TODO + case XRT_DEVICE_VIVE_TRACKER_TUNDRA: break; // TODO case XRT_DEVICE_REALSENSE: break; case XRT_DEVICE_DEPTHAI: break;