Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -367,20 +367,7 @@ void Application::paintGL() { · 366 unmodified lines | |||
| 367 | 367 | ||
| 368 | glEnable(GL_LINE_SMOOTH); | 368 | glEnable(GL_LINE_SMOOTH); |
| 369 | 369 | ||
| 370 | if (_myCamera.getMode() == CAMERA_MODE_MIRROR) { | 370 | if (OculusManager::isConnected()) { |
| 371 | _myCamera.setTightness (100.0f); | ||
| 372 | glm::vec3 targetPosition = _myAvatar.getUprightHeadPosition(); | ||
| 373 | if (_myAvatar.getHead().getFaceModel().isActive()) { | ||
| 374 | // make sure we're aligned to the blend face eyes | ||
| 375 | glm::vec3 leftEyePosition, rightEyePosition; | ||
| 376 | if (_myAvatar.getHead().getFaceModel().getEyePositions(leftEyePosition, rightEyePosition)) { | ||
| 377 | targetPosition = (leftEyePosition + rightEyePosition) * 0.5f; | ||
| 378 | } | ||
| 379 | } | ||
| 380 | _myCamera.setTargetPosition(targetPosition); | ||
| 381 | _myCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f))); | ||
| 382 | |||
| 383 | } else if (OculusManager::isConnected()) { | ||
| 384 | _myCamera.setUpShift (0.0f); | 371 | _myCamera.setUpShift (0.0f); |
| 385 | _myCamera.setDistance (0.0f); | 372 | _myCamera.setDistance (0.0f); |
| 386 | _myCamera.setTightness (0.0f); // Camera is directly connected to head without smoothing | 373 | _myCamera.setTightness (0.0f); // Camera is directly connected to head without smoothing |