Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -382,6 +382,20 @@ void Application::paintGL() { · 381 unmodified lines | ||
| 382 | 382 | } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) { |
| 383 | 383 | _myCamera.setTargetPosition(_myAvatar.getUprightHeadPosition()); |
| 384 | 384 | _myCamera.setTargetRotation(_myAvatar.getHead().getCameraOrientation()); |
| 385 | + | |
| 386 | + } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) { | |
| 387 | + _myCamera.setTightness(0.0f); | |
| 388 | + _myCamera.setDistance(0.3f); | |
| 389 | + glm::vec3 targetPosition = _myAvatar.getUprightHeadPosition(); | |
| 390 | + if (_myAvatar.getHead().getBlendFace().isActive()) { | |
| 391 | + // make sure we're aligned to the blend face eyes | |
| 392 | + glm::vec3 leftEyePosition, rightEyePosition; | |
| 393 | + if (_myAvatar.getHead().getBlendFace().getEyePositions(leftEyePosition, rightEyePosition, true)) { | |
| 394 | + targetPosition = (leftEyePosition + rightEyePosition) * 0.5f; | |
| 395 | + } | |
| 396 | + } | |
| 397 | + _myCamera.setTargetPosition(targetPosition); | |
| 398 | + _myCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f))); | |
| 385 | 399 | } |
| 386 | 400 | |
| 387 | 401 | // Update camera position |
| @@ -2125,7 +2139,12 @@ void Application::update(float deltaTime) { · 1737 unmodified lines | ||
| 2125 | 2139 | } |
| 2126 | 2140 | |
| 2127 | 2141 | if (!OculusManager::isConnected()) { |
| 2128 | − if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) { | |
| 2142 | + if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) { | |
| 2143 | + if (_myCamera.getMode() != CAMERA_MODE_MIRROR) { | |
| 2144 | + _myCamera.setMode(CAMERA_MODE_MIRROR); | |
| 2145 | + _myCamera.setModeShiftRate(100.0f); | |
| 2146 | + } | |
| 2147 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) { | |
| 2129 | 2148 | if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON) { |
| 2130 | 2149 | _myCamera.setMode(CAMERA_MODE_FIRST_PERSON); |
| 2131 | 2150 | _myCamera.setModeShiftRate(1.0f); |