improve how cameras are reset when leaving vr mode

This commit is contained in:
ZappoMan 2014-11-26 12:26:02 -08:00
parent 208eb663bd
commit 2fc3fdc7e6

View file

@ -668,8 +668,6 @@ void Application::paintGL() {
// Update camera position // Update camera position
if (!OculusManager::isConnected()) { if (!OculusManager::isConnected()) {
_myCamera.setHmdPosition(glm::vec3());
_myCamera.setHmdRotation(glm::quat());
_myCamera.update(1.0f / _fps); _myCamera.update(1.0f / _fps);
} }
@ -1606,6 +1604,11 @@ void Application::setEnableVRMode(bool enableVRMode) {
OculusManager::recalibrate(); OculusManager::recalibrate();
} else { } else {
OculusManager::abandonCalibration(); OculusManager::abandonCalibration();
_mirrorCamera.setHmdPosition(glm::vec3());
_mirrorCamera.setHmdRotation(glm::quat());
_myCamera.setHmdPosition(glm::vec3());
_myCamera.setHmdRotation(glm::quat());
} }
resizeGL(_glWidget->getDeviceWidth(), _glWidget->getDeviceHeight()); resizeGL(_glWidget->getDeviceWidth(), _glWidget->getDeviceHeight());