made requested changes

This commit is contained in:
Dante Ruiz 2017-07-05 19:04:34 +01:00
parent 27a9880eff
commit e567cf0196

View file

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