mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 12:46:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/steamvr_drv: Add support for new dynamic device roles

Browse source
This commit is contained in:
Korcan Hussein 2023-10-11 15:10:46 +01:00 committed by korejan
parent 60ae73f571
commit d033955678
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/xrt/state_trackers/steamvr_drv/ovrd_driver.cpp
View file

@ -1477,7 +1477,7 @@ CServerDriver_Monado::Init(vr::IVRDriverContext *pDriverContext)
xrt_instance_destroy(&m_xinst);
return vr::VRInitError_Init_HmdNotFound;
}
if (m_xsysd->roles.head == NULL) {
if (m_xsysd->static_roles.head == NULL) {
ovrd_log("Didn't get a HMD device!\n");
xrt_space_overseer_destroy(&m_xso);
xrt_system_devices_destroy(&m_xsysd);
@ -1485,15 +1485,24 @@ CServerDriver_Monado::Init(vr::IVRDriverContext *pDriverContext)
return vr::VRInitError_Init_HmdNotFound;
}
m_xhmd = m_xsysd->roles.head;
m_xhmd = m_xsysd->static_roles.head;
ovrd_log("Selected HMD %s\n", m_xhmd->str);
m_MonadoDeviceDriver = new CDeviceDriver_Monado(m_xinst, m_xhmd);
//! @todo provide a serial number
vr::VRServerDriverHost()->TrackedDeviceAdded(m_xhmd->str, vr::TrackedDeviceClass_HMD, m_MonadoDeviceDriver);
struct xrt_device *left_xdev = m_xsysd->roles.left;
struct xrt_device *right_xdev = m_xsysd->roles.right;
xrt_system_roles system_roles = XRT_SYSTEM_ROLES_INIT;
xrt_system_devices_get_roles(m_xsysd, &system_roles);
struct xrt_device *left_xdev = nullptr;
if (system_roles.left >= 0 && system_roles.left < XRT_SYSTEM_MAX_DEVICES) {
left_xdev = m_xsysd->xdevs[system_roles.left];
}
struct xrt_device *right_xdev = nullptr;
if (system_roles.right >= 0 && system_roles.right < XRT_SYSTEM_MAX_DEVICES) {
right_xdev = m_xsysd->xdevs[system_roles.right];
}
// use steamvr room setup instead
struct xrt_vec3 offset = {0, 0, 0};