Showing the changes to interface/src/devices/OculusManager.cpp (1 of 1 file). Show all
Unified · Split
| @@ -65,7 +65,7 @@ OculusManager::CalibrationState OculusManager::_calibrationState; · 64 unmodified lines | |||
| 65 | glm::vec3 OculusManager::_calibrationPosition; | 65 | glm::vec3 OculusManager::_calibrationPosition; |
| 66 | glm::quat OculusManager::_calibrationOrientation; | 66 | glm::quat OculusManager::_calibrationOrientation; |
| 67 | quint64 OculusManager::_calibrationStartTime; | 67 | quint64 OculusManager::_calibrationStartTime; |
| 68 | int OculusManager::_calibrationMessage = 0; | 68 | int OculusManager::_calibrationMessage = NULL; |
| 69 | QString OculusManager::CALIBRATION_BILLBOARD_URL = "http://hifi-public.s3.amazonaws.com/images/hold-to-calibrate.svg"; | 69 | QString OculusManager::CALIBRATION_BILLBOARD_URL = "http://hifi-public.s3.amazonaws.com/images/hold-to-calibrate.svg"; |
| 70 | float OculusManager::CALIBRATION_BILLBOARD_SCALE = 2.f; | 70 | float OculusManager::CALIBRATION_BILLBOARD_SCALE = 2.f; |
| 71 | 71 | ||
| @@ -228,7 +228,7 @@ void OculusManager::calibrate(glm::vec3 position, glm::quat orientation) { · 156 unmodified lines | |||
| 228 | _calibrationStartTime = usecTimestampNow(); | 228 | _calibrationStartTime = usecTimestampNow(); |
| 229 | _calibrationState = WAITING_FOR_ZERO_HELD; | 229 | _calibrationState = WAITING_FOR_ZERO_HELD; |
| 230 | 230 | ||
| 231 | if (_calibrationMessage == 0) { | 231 | if (!_calibrationMessage) { |
| 232 | qDebug() << "Calibration message: Hold still to calibrate"; | 232 | qDebug() << "Calibration message: Hold still to calibrate"; |
| 233 | 233 | ||
| 234 | billboard = new BillboardOverlay(); | 234 | billboard = new BillboardOverlay(); |
| @@ -254,7 +254,7 @@ void OculusManager::calibrate(glm::vec3 position, glm::quat orientation) { · 19 unmodified lines | |||
| 254 | _calibrationState = CALIBRATED; | 254 | _calibrationState = CALIBRATED; |
| 255 | qDebug() << "Delete calibration message"; | 255 | qDebug() << "Delete calibration message"; |
| 256 | Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage); | 256 | Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage); |
| 257 | _calibrationMessage = 0; | 257 | _calibrationMessage = NULL; |
| 258 | Application::getInstance()->resetSensors(); | 258 | Application::getInstance()->resetSensors(); |
| 259 | } else { | 259 | } else { |
| 260 | quint64 quarterSeconds = (usecTimestampNow() - _calibrationStartTime) / 250000; | 260 | quint64 quarterSeconds = (usecTimestampNow() - _calibrationStartTime) / 250000; |
| @@ -293,10 +293,10 @@ void OculusManager::recalibrate() { · 32 unmodified lines | |||
| 293 | void OculusManager::abandonCalibration() { | 293 | void OculusManager::abandonCalibration() { |
| 294 | #ifdef HAVE_LIBOVR | 294 | #ifdef HAVE_LIBOVR |
| 295 | _calibrationState = CALIBRATED; | 295 | _calibrationState = CALIBRATED; |
| 296 | if (_calibrationMessage > 0) { | 296 | if (_calibrationMessage) { |
| 297 | qDebug() << "Delete calibration message"; | 297 | qDebug() << "Delete calibration message"; |
| 298 | Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage); | 298 | Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage); |
| 299 | _calibrationMessage = 0; | 299 | _calibrationMessage = NULL; |
| 300 | } | 300 | } |
| 301 | #endif | 301 | #endif |
| 302 | } | 302 | } |