Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 20:15:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use NULL rather than 0 for "no overlay"

Browse source
This commit is contained in:
David Rowe 2014-10-10 11:00:41 -07:00
parent aa37ba5dfd
commit 0a5fdee1f2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,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 = 0; int OculusManager::_calibrationMessage = NULL;
QString OculusManager::CALIBRATION_BILLBOARD_URL = "http://hifi-public.s3.amazonaws.com/images/hold-to-calibrate.svg"; QString OculusManager::CALIBRATION_BILLBOARD_URL = "http://hifi-public.s3.amazonaws.com/images/hold-to-calibrate.svg";
float OculusManager::CALIBRATION_BILLBOARD_SCALE = 2.f; float OculusManager::CALIBRATION_BILLBOARD_SCALE = 2.f;
@ -228,7 +228,7 @@ void OculusManager::calibrate(glm::vec3 position, glm::quat orientation) {
_calibrationStartTime = usecTimestampNow(); _calibrationStartTime = usecTimestampNow();
_calibrationState = WAITING_FOR_ZERO_HELD; _calibrationState = WAITING_FOR_ZERO_HELD;
if (_calibrationMessage == 0) { if (!_calibrationMessage) {
qDebug() << "Calibration message: Hold still to calibrate"; qDebug() << "Calibration message: Hold still to calibrate";
billboard = new BillboardOverlay(); billboard = new BillboardOverlay();
@ -254,7 +254,7 @@ void OculusManager::calibrate(glm::vec3 position, glm::quat orientation) {
_calibrationState = CALIBRATED; _calibrationState = CALIBRATED;
qDebug() << "Delete calibration message"; qDebug() << "Delete calibration message";
Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage); Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage);
_calibrationMessage = 0; _calibrationMessage = NULL;
Application::getInstance()->resetSensors(); Application::getInstance()->resetSensors();
} else { } else {
quint64 quarterSeconds = (usecTimestampNow() - _calibrationStartTime) / 250000; quint64 quarterSeconds = (usecTimestampNow() - _calibrationStartTime) / 250000;
@ -293,10 +293,10 @@ void OculusManager::recalibrate() {
void OculusManager::abandonCalibration() { void OculusManager::abandonCalibration() {
#ifdef HAVE_LIBOVR #ifdef HAVE_LIBOVR
_calibrationState = CALIBRATED; _calibrationState = CALIBRATED;
if (_calibrationMessage > 0) { if (_calibrationMessage) {
qDebug() << "Delete calibration message"; qDebug() << "Delete calibration message";
Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage); Application::getInstance()->getOverlays().deleteOverlay(_calibrationMessage);
_calibrationMessage = 0; _calibrationMessage = NULL;
} }
#endif #endif
} }