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
5429 5429
5430 editRenderArgs([this, deltaTime](AppRenderArgs& appRenderArgs) {5430 editRenderArgs([this, deltaTime](AppRenderArgs& appRenderArgs) {
5431 PerformanceTimer perfTimer("editRenderArgs");5431 PerformanceTimer perfTimer("editRenderArgs");
5432 appRenderArgs._headPose= getHMDSensorPose();5432 appRenderArgs._headPose = getHMDSensorPose();
5433 5433
5434 auto myAvatar = getMyAvatar();5434 auto myAvatar = getMyAvatar();
5435 5435
@@ -5449,10 +5449,10 @@ void Application::update(float deltaTime) { · 13 unmodified lines
5449 {5449 {
5450 QMutexLocker viewLocker(&_viewMutex);5450 QMutexLocker viewLocker(&_viewMutex);
5451 // adjust near clip plane to account for sensor scaling.5451 // adjust near clip plane to account for sensor scaling.
5452 auto adjustedProjection = glm::perspective(_viewFrustum.getFieldOfView(),5452 auto adjustedProjection = glm::perspective(glm::radians(_fieldOfView.get()),
5453 _viewFrustum.getAspectRatio(),5453 getActiveDisplayPlugin()->getRecommendedAspectRatio(),
5454 DEFAULT_NEAR_CLIP * sensorToWorldScale,5454 DEFAULT_NEAR_CLIP * sensorToWorldScale,
5455 _viewFrustum.getFarClip());5455 DEFAULT_FAR_CLIP);
5456 _viewFrustum.setProjection(adjustedProjection);5456 _viewFrustum.setProjection(adjustedProjection);
5457 _viewFrustum.calculate();5457 _viewFrustum.calculate();
5458 }5458 }
@@ -5534,6 +5534,7 @@ void Application::update(float deltaTime) { · 75 unmodified lines
5534 {5534 {
5535 QMutexLocker viewLocker(&_viewMutex);5535 QMutexLocker viewLocker(&_viewMutex);
5536 _myCamera.loadViewFrustum(_displayViewFrustum);5536 _myCamera.loadViewFrustum(_displayViewFrustum);
5537 appRenderArgs._view = glm::inverse(_displayViewFrustum.getView());
5537 }5538 }
5538 5539
5539 {5540 {