Showing the changes to interface/src/Application.cpp (1 of 46 files). Show all
Unified · Split
| @@ -331,7 +331,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 330 unmodified lines | |||
| 331 | _lastNackTime(usecTimestampNow()), | 331 | _lastNackTime(usecTimestampNow()), |
| 332 | _lastSendDownstreamAudioStats(usecTimestampNow()), | 332 | _lastSendDownstreamAudioStats(usecTimestampNow()), |
| 333 | _isVSyncOn(true), | 333 | _isVSyncOn(true), |
| 334 | _isThrottleFPSEnabled(false), | 334 | _isThrottleFPSEnabled(true), |
| 335 | _aboutToQuit(false), | 335 | _aboutToQuit(false), |
| 336 | _notifiedPacketVersionMismatchThisDomain(false), | 336 | _notifiedPacketVersionMismatchThisDomain(false), |
| 337 | _glWidget(new GLCanvas()), | 337 | _glWidget(new GLCanvas()), |
| @@ -3291,6 +3291,8 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 2953 unmodified lines | |||
| 3291 | 3291 | ||
| 3292 | renderContext._drawItemStatus = sceneInterface->doEngineDisplayItemStatus(); | 3292 | renderContext._drawItemStatus = sceneInterface->doEngineDisplayItemStatus(); |
| 3293 | 3293 | ||
| 3294 | renderContext._occlusionStatus = Menu::getInstance()->isOptionChecked(MenuOption::DebugAmbientOcclusion); | ||
| 3295 | |||
| 3294 | renderArgs->_shouldRender = LODManager::shouldRender; | 3296 | renderArgs->_shouldRender = LODManager::shouldRender; |
| 3295 | 3297 | ||
| 3296 | renderContext.args = renderArgs; | 3298 | renderContext.args = renderArgs; |
| @@ -3405,7 +3407,7 @@ void Application::renderRearViewMirror(RenderArgs* renderArgs, const QRect& regi · 108 unmodified lines | |||
| 3405 | // This was removed in commit 71e59cfa88c6563749594e25494102fe01db38e9 but could be further | 3407 | // This was removed in commit 71e59cfa88c6563749594e25494102fe01db38e9 but could be further |
| 3406 | // investigated in order to adapt the technique while fixing the head rendering issue, | 3408 | // investigated in order to adapt the technique while fixing the head rendering issue, |
| 3407 | // but the complexity of the hack suggests that a better approach | 3409 | // but the complexity of the hack suggests that a better approach |
| 3408 | _mirrorCamera.setPosition(_myAvatar->getHead()->getEyePosition() + | 3410 | _mirrorCamera.setPosition(_myAvatar->getDefaultEyePosition() + |
| 3409 | _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale()); | 3411 | _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale()); |
| 3410 | } | 3412 | } |
| 3411 | _mirrorCamera.setProjection(glm::perspective(glm::radians(fov), aspect, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP)); | 3413 | _mirrorCamera.setProjection(glm::perspective(glm::radians(fov), aspect, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP)); |