From 8e7b9dfa2b16aca9235c017412cfe0aedf03aed1 Mon Sep 17 00:00:00 2001 From: samcake Date: Fri, 13 Apr 2018 17:30:30 -0700 Subject: [PATCH] Reverting TAA to FXAA in rc66 until we fix the aa on tablet --- libraries/render-utils/src/AntialiasingEffect.h | 11 +++++++++-- scripts/developer/utilities/render/antialiasing.qml | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libraries/render-utils/src/AntialiasingEffect.h b/libraries/render-utils/src/AntialiasingEffect.h index 03fdb9d9a4..19f204d930 100644 --- a/libraries/render-utils/src/AntialiasingEffect.h +++ b/libraries/render-utils/src/AntialiasingEffect.h @@ -26,7 +26,11 @@ class JitterSampleConfig : public render::Job::Config { Q_PROPERTY(bool stop MEMBER stop NOTIFY dirty) Q_PROPERTY(int index READ getIndex NOTIFY dirty) public: - JitterSampleConfig() : render::Job::Config(true) {} + JitterSampleConfig() : render::Job::Config(true) { + // FIXME: For RC66 disable Taa by default + // Disable jitter by default for now by default: + none(); + } float scale{ 0.5f }; bool stop{ false }; @@ -113,7 +117,10 @@ public: bool feedbackColor{ false }; float debugX{ 0.0f }; - float debugFXAAX{ 1.0f }; + // FIXME: For RC66 disable Taa by default + // Fall back to FXAA :( + // float debugFXAAX{ 1.0f }; + float debugFXAAX{ 0.0f }; float debugShowVelocityThreshold{ 1.0f }; glm::vec2 debugCursorTexcoord{ 0.5f, 0.5f }; float debugOrbZoom{ 2.0f }; diff --git a/scripts/developer/utilities/render/antialiasing.qml b/scripts/developer/utilities/render/antialiasing.qml index e8034c48bd..c46d753635 100644 --- a/scripts/developer/utilities/render/antialiasing.qml +++ b/scripts/developer/utilities/render/antialiasing.qml @@ -36,7 +36,7 @@ Rectangle { Row { spacing: 10 id: fxaaOnOff - property bool debugFXAA: false + property bool debugFXAA: true HifiControls.Button { text: { if (fxaaOnOff.debugFXAA) {