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

d/steamvr_lh: Choose the first tracking universe that is found

Browse source 
lighthousedb.json may contain many more tracking universes than are
actually configured in chaperone_info.vrchap.
This commit is contained in:
Christoph Haag 2024-01-10 02:17:43 +01:00
parent 4e32bd71b8
commit bdb390b497
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/xrt/drivers/steamvr_lh/device.cpp
View file

@ -604,20 +604,28 @@ Device::init_chaperone(const std::string &steam_install)
return;
}
// XXX: This may be broken if there are multiple known universes - how do we determine which to use then?
const JSONNode universe = lighthousedb["known_universes"][0];
const std::string id = universe["id"].asString();
JSONNode info = {};
for (const JSONNode &u : chap_info["universes"].asArray()) {
if (u["universeID"].asString() == id) {
DEV_INFO("Found info for universe %s", id.c_str());
info = u;
bool universe_found = false;
// XXX: This may be broken if there are multiple known universes - how do we determine which to use then?
auto known_universes = lighthousedb["known_universes"].asArray();
for (auto &universe : known_universes) {
const std::string id = universe["id"].asString();
for (const JSONNode &u : chap_info["universes"].asArray()) {
if (u["universeID"].asString() == id) {
DEV_INFO("Found info for universe %s", id.c_str());
info = u;
universe_found = true;
break;
}
}
if (universe_found) {
break;
}
}
if (info.isInvalid()) {
DEV_ERR("Couldn't find chaperone info for universe %s, playspace center will be off", id.c_str());
DEV_ERR("Couldn't find chaperone info for any known universe, playspace center will be off");
return;
}