History

Merge branch 'calibration-ui-update' into vive-in-desktop

Dante Ruiz committed 9 years ago

Commit a417f742 parents 6f30cb1 5fbcd4930 files · +2269 −-22Browse files

Showing the changes to plugins/openvr/src/ViveControllerManager.cpp (1 of 30 files). Show all

Unified · Split

plugins/openvr/src/ViveControllerManager.cpp+2−2
@@ -428,8 +428,8 @@ void ViveControllerManager::InputDevice::emitCalibrationStatus() { · 427 unmodified lines
428428 QJsonObject status = QJsonObject();
429429 status["calibrated"] = _calibrated;
430430 status["configuration"] = configToString(_preferedConfig);
431− status["head_puck"] = (_headConfig == HeadConfig::Puck) ? true : false;
432− status["hand_pucks"] = (_handConfig == HandConfig::Pucks) ? true : false;
431+ status["head_puck"] = (_headConfig == HeadConfig::Puck);
432+ status["hand_pucks"] = (_handConfig == HandConfig::Pucks);
433433 status["puckCount"] = (int)_validTrackedObjects.size();
434434 status["UI"] = _calibrate;
435435