From e6a41e85b234dd3f2927c08642c34750a9d48a98 Mon Sep 17 00:00:00 2001
From: Penguin-Guru <Penguin-Guru@ProtonMail.com>
Date: Mon, 25 Oct 2021 13:40:36 -0700
Subject: [PATCH] Added comments. Referenced all enums explicitly.
---
.../qml/hifi/dialogs/graphics/GraphicsSettings.qml | 5 +++--
interface/src/scripting/RenderScriptingInterface.cpp | 2 +-
libraries/render-utils/src/AntialiasingEffect.cpp | 2 +-
libraries/render-utils/src/AntialiasingEffect.h | 8 ++++----
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml b/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml
index 2041bab9f8..6ebb0099ca 100644
--- a/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml
+++ b/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml
@@ -378,10 +378,11 @@ Item {
size: 16
color: "#FFFFFF"
}
-
+
ListModel {
id: antialiasingModel
-
+
+ // Maintain same order as "AntialiasingConfig::Mode".
ListElement {
text: "None"
}
diff --git a/interface/src/scripting/RenderScriptingInterface.cpp b/interface/src/scripting/RenderScriptingInterface.cpp
index 58738d0929..5ecb1a6e43 100644
--- a/interface/src/scripting/RenderScriptingInterface.cpp
+++ b/interface/src/scripting/RenderScriptingInterface.cpp
@@ -145,7 +145,7 @@ void RenderScriptingInterface::forceAntialiasingMode(AntialiasingConfig::Mode mo
mainViewAntialiasingConfig->blend = 1;
mainViewAntialiasingConfig->setDebugFXAA(false);
break;
- case AntialiasingConfig::TAA:
+ case AntialiasingConfig::Mode::TAA:
mainViewJitterCamConfig->play();
mainViewAntialiasingConfig->blend = 0.25;
mainViewAntialiasingConfig->setDebugFXAA(false);
diff --git a/libraries/render-utils/src/AntialiasingEffect.cpp b/libraries/render-utils/src/AntialiasingEffect.cpp
index c9da8373db..9083aa0c2e 100644
--- a/libraries/render-utils/src/AntialiasingEffect.cpp
+++ b/libraries/render-utils/src/AntialiasingEffect.cpp
@@ -140,7 +140,7 @@ void Antialiasing::run(const render::RenderContextPointer& renderContext, const
#else
void AntialiasingConfig::setAAMode(int mode) {
- _mode = std::min((int)AntialiasingConfig::MODE_COUNT, std::max(0, mode));
+ _mode = std::min((int)AntialiasingConfig::MODE_COUNT, std::max(0, mode)); // Just use unsigned?
emit dirty();
}
diff --git a/libraries/render-utils/src/AntialiasingEffect.h b/libraries/render-utils/src/AntialiasingEffect.h
index 453c4ce992..dc81132cca 100644
--- a/libraries/render-utils/src/AntialiasingEffect.h
+++ b/libraries/render-utils/src/AntialiasingEffect.h
@@ -217,10 +217,10 @@ private:
};
-#else
-class AntiAliasingConfig : public render::Job::Config {
+#else // User setting for antialias mode will probably be broken.
+class AntiAliasingConfig : public render::Job::Config { // Not to be confused with AntialiasingConfig...
Q_OBJECT
- Q_PROPERTY(bool enabled MEMBER enabled)
+ Q_PROPERTY(bool enabled MEMBER enabled) // Not sure if still useful.
public:
AntiAliasingConfig() : render::Job::Config(true) {}
};
@@ -237,7 +237,7 @@ public:
const gpu::PipelinePointer& getAntialiasingPipeline();
const gpu::PipelinePointer& getBlendPipeline();
-
+
private:
gpu::FramebufferPointer _antialiasingBuffer;