Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 03:19:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

made requested changes

Browse source
This commit is contained in:
Dante Ruiz 2017-07-05 19:04:34 +01:00
parent 27a9880eff
commit e567cf0196
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,6 +168,9 @@ void ViveControllerManager::setConfigurationSettings(const QJsonObject configura
if (isSupported()) { if (isSupported()) {
if (configurationSettings.contains("desktopMode")) { if (configurationSettings.contains("desktopMode")) {
_desktopMode = configurationSettings["desktopMode"].toBool(); _desktopMode = configurationSettings["desktopMode"].toBool();
if (!_desktopMode) {
_resetMatCalculated = false;
}
} }
_inputDevice->configureCalibrationSettings(configurationSettings); _inputDevice->configureCalibrationSettings(configurationSettings);
} }
@ -761,7 +764,7 @@ glm::mat4 ViveControllerManager::InputDevice::calculateDefaultToReferenceForHead
glm::mat4 finalHeadPuck = newHeadPuck * headPuckOffset; glm::mat4 finalHeadPuck = newHeadPuck * headPuckOffset;
// calculate the defaultToRefrenceXform // calculate the defaultToRefrenceXform
glm::mat4 defaultToReferenceMat = currentHead * glm::inverse(inputCalibration.defaultHeadMat); glm::mat4 defaultToReferenceMat = finalHeadPuck * glm::inverse(inputCalibration.defaultHeadMat);
return defaultToReferenceMat; return defaultToReferenceMat;
} }