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

quiet compiler

Browse source
This commit is contained in:
Seth Alves 2015-04-08 15:39:21 -07:00
parent 5c709e2638
commit 30a8b61df3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/devices/OculusManager.cpp
View file

@ -96,7 +96,7 @@ OculusManager::CalibrationState OculusManager::_calibrationState;
glm::vec3 OculusManager::_calibrationPosition; glm::vec3 OculusManager::_calibrationPosition;
glm::quat OculusManager::_calibrationOrientation; glm::quat OculusManager::_calibrationOrientation;
quint64 OculusManager::_calibrationStartTime; quint64 OculusManager::_calibrationStartTime;
int OculusManager::_calibrationMessage = NULL; int OculusManager::_calibrationMessage = 0;
glm::vec3 OculusManager::_eyePositions[ovrEye_Count]; glm::vec3 OculusManager::_eyePositions[ovrEye_Count];
// TODO expose this as a developer toggle // TODO expose this as a developer toggle
bool OculusManager::_eyePerFrameMode = false; bool OculusManager::_eyePerFrameMode = false;
@ -308,11 +308,11 @@ void OculusManager::calibrate(glm::vec3 position, glm::quat orientation) {
_calibrationState = CALIBRATED; _calibrationState = CALIBRATED;
qCDebug(interfaceapp) << "HMD calibrated"; qCDebug(interfaceapp) << "HMD calibrated";
Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage); Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage);
_calibrationMessage = NULL; _calibrationMessage = 0;
Application::getInstance()->resetSensors(); Application::getInstance()->resetSensors();
} else { } else {
quint64 quarterSeconds = (usecTimestampNow() - _calibrationStartTime) / 250000; quint64 quarterSeconds = (usecTimestampNow() - _calibrationStartTime) / 250000;
if (quarterSeconds + 1 > progressMessage.length()) { if (quarterSeconds + 1 > (quint64)progressMessage.length()) {
// 3...2...1... // 3...2...1...
if (quarterSeconds == 4 * (quarterSeconds / 4)) { if (quarterSeconds == 4 * (quarterSeconds / 4)) {
quint64 wholeSeconds = CALIBRATION_ZERO_HOLD_TIME / 1000000 - quarterSeconds / 4; quint64 wholeSeconds = CALIBRATION_ZERO_HOLD_TIME / 1000000 - quarterSeconds / 4;
@ -349,7 +349,7 @@ void OculusManager::abandonCalibration() {
if (_calibrationMessage) { if (_calibrationMessage) {
qCDebug(interfaceapp) << "Abandoned HMD calibration"; qCDebug(interfaceapp) << "Abandoned HMD calibration";
Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage); Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage);
_calibrationMessage = NULL; _calibrationMessage = 0;
} }
} }