History

Merge branch 'master' into 20639

David Rowe committed 11 years ago

Commit ed259e62 parents e5d2a78 bc9411446 files · +4419 −644Browse files

Showing the changes to interface/src/Application.cpp (1 of 46 files). Show all

Unified · Split

interface/src/Application.cpp+4−2
@@ -331,7 +331,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 330 unmodified lines
331331 _lastNackTime(usecTimestampNow()),
332332 _lastSendDownstreamAudioStats(usecTimestampNow()),
333333 _isVSyncOn(true),
334− _isThrottleFPSEnabled(false),
334+ _isThrottleFPSEnabled(true),
335335 _aboutToQuit(false),
336336 _notifiedPacketVersionMismatchThisDomain(false),
337337 _glWidget(new GLCanvas()),
@@ -3291,6 +3291,8 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 2953 unmodified lines
32913291
32923292 renderContext._drawItemStatus = sceneInterface->doEngineDisplayItemStatus();
32933293
3294+ renderContext._occlusionStatus = Menu::getInstance()->isOptionChecked(MenuOption::DebugAmbientOcclusion);
3295+
32943296 renderArgs->_shouldRender = LODManager::shouldRender;
32953297
32963298 renderContext.args = renderArgs;
@@ -3405,7 +3407,7 @@ void Application::renderRearViewMirror(RenderArgs* renderArgs, const QRect& regi · 108 unmodified lines
34053407 // This was removed in commit 71e59cfa88c6563749594e25494102fe01db38e9 but could be further
34063408 // investigated in order to adapt the technique while fixing the head rendering issue,
34073409 // but the complexity of the hack suggests that a better approach
3408− _mirrorCamera.setPosition(_myAvatar->getHead()->getEyePosition() +
3410+ _mirrorCamera.setPosition(_myAvatar->getDefaultEyePosition() +
34093411 _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale());
34103412 }
34113413 _mirrorCamera.setProjection(glm::perspective(glm::radians(fov), aspect, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP));