Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 14:29:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

21539: Updated Logic to match request

Browse source
This commit is contained in:
Menithal 2017-11-27 07:42:18 +02:00
parent ba1cd74ffe
commit 5d52b9936b
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
View file

@ -158,7 +158,6 @@ Rectangle {
} }
RalewayBold { RalewayBold {
id: hmdInDesktopLabel
size: 12 size: 12
visible: viveInDesktop.checked visible: viveInDesktop.checked
text: "None" text: "None"

3
plugins/openvr/src/ViveControllerManager.cpp
View file

@ -168,7 +168,6 @@ void ViveControllerManager::setConfigurationSettings(const QJsonObject configura
} }
if (configurationSettings.contains("hmdDesktopTracking")) { if (configurationSettings.contains("hmdDesktopTracking")) {
_hmdDesktopTracking = configurationSettings["hmdDesktopTracking"].toBool(); _hmdDesktopTracking = configurationSettings["hmdDesktopTracking"].toBool();
} }
@ -458,7 +457,7 @@ void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJso
iter++; iter++;
} }
_hmdTrackingEnabled = !(hmdDesktopMode && !hmdDesktopTracking); _hmdTrackingEnabled = !(hmdDesktopMode && hmdDesktopTracking);
} }
} }