History

Merge pull request #12490 from Zvork/taa

Temporal Anti-Aliasing

John Conklin II committed 8 years ago

Commit 5be2f0a2 parents 615c988 aad571f112 files · +2615 −317Browse files

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

Unified · Split

interface/src/Application.cpp+6−5
@@ -5429,7 +5429,7 @@ void Application::update(float deltaTime) { · 5428 unmodified lines
54295429
54305430 editRenderArgs([this, deltaTime](AppRenderArgs& appRenderArgs) {
54315431 PerformanceTimer perfTimer("editRenderArgs");
5432− appRenderArgs._headPose= getHMDSensorPose();
5432+ appRenderArgs._headPose = getHMDSensorPose();
54335433
54345434 auto myAvatar = getMyAvatar();
54355435
@@ -5449,10 +5449,10 @@ void Application::update(float deltaTime) { · 13 unmodified lines
54495449 {
54505450 QMutexLocker viewLocker(&_viewMutex);
54515451 // adjust near clip plane to account for sensor scaling.
5452− auto adjustedProjection = glm::perspective(_viewFrustum.getFieldOfView(),
5453− _viewFrustum.getAspectRatio(),
5454− DEFAULT_NEAR_CLIP * sensorToWorldScale,
5455− _viewFrustum.getFarClip());
5452+ auto adjustedProjection = glm::perspective(glm::radians(_fieldOfView.get()),
5453+ getActiveDisplayPlugin()->getRecommendedAspectRatio(),
5454+ DEFAULT_NEAR_CLIP * sensorToWorldScale,
5455+ DEFAULT_FAR_CLIP);
54565456 _viewFrustum.setProjection(adjustedProjection);
54575457 _viewFrustum.calculate();
54585458 }
@@ -5534,6 +5534,7 @@ void Application::update(float deltaTime) { · 75 unmodified lines
55345534 {
55355535 QMutexLocker viewLocker(&_viewMutex);
55365536 _myCamera.loadViewFrustum(_displayViewFrustum);
5537+ appRenderArgs._view = glm::inverse(_displayViewFrustum.getView());
55375538 }
55385539
55395540 {