Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 03:55:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12891 from samcake/rc66-backToFXAA

Browse source 
RC66: Reverting TAA to FXAA in rc66 until we fix the aa on tablet
This commit is contained in:
John Conklin II 2018-04-16 09:57:39 -07:00 committed by GitHub
commit 40e34f578a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/render-utils/src/AntialiasingEffect.h
View file

@ -26,7 +26,11 @@ class JitterSampleConfig : public render::Job::Config {
Q_PROPERTY(bool stop MEMBER stop NOTIFY dirty) Q_PROPERTY(bool stop MEMBER stop NOTIFY dirty)
Q_PROPERTY(int index READ getIndex NOTIFY dirty) Q_PROPERTY(int index READ getIndex NOTIFY dirty)
public: 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 }; float scale{ 0.5f };
bool stop{ false }; bool stop{ false };
@ -113,7 +117,10 @@ public:
bool feedbackColor{ false }; bool feedbackColor{ false };
float debugX{ 0.0f }; 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 }; float debugShowVelocityThreshold{ 1.0f };
glm::vec2 debugCursorTexcoord{ 0.5f, 0.5f }; glm::vec2 debugCursorTexcoord{ 0.5f, 0.5f };
float debugOrbZoom{ 2.0f }; float debugOrbZoom{ 2.0f };

2
scripts/developer/utilities/render/antialiasing.qml
View file

@ -36,7 +36,7 @@ Rectangle {
Row { Row {
spacing: 10 spacing: 10
id: fxaaOnOff id: fxaaOnOff
property bool debugFXAA: false property bool debugFXAA: true
HifiControls.Button { HifiControls.Button {
text: { text: {
if (fxaaOnOff.debugFXAA) { if (fxaaOnOff.debugFXAA) {