Add getUniformValuesForEffects() method to ShaderManager

Author: adazem009

src/shadermanager.cpp

@@ -101,12 +101,10 @@ QOpenGLShaderProgram *ShaderManager::getShaderProgram(const std::unordered_map<E
         return it->second;
 }
 
-void ShaderManager::setUniforms(QOpenGLShaderProgram *program, int textureUnit, const std::unordered_map<Effect, double> &effectValues)
+void ShaderManager::getUniformValuesForEffects(const std::unordered_map<Effect, double> &effectValues, std::unordered_map<Effect, float> &dst)
 {
-    // Set the texture unit
-    program->setUniformValue(TEXTURE_UNIT_UNIFORM, textureUnit);
+    dst.clear();
 
-    // Set the uniform values for the enabled effects and reset the other effects
     for (const auto &[effect, name] : EFFECT_TO_NAME) {
         const auto it = effectValues.find(effect);
         double value;
@@ -117,10 +115,23 @@ void ShaderManager::setUniforms(QOpenGLShaderProgram *program, int textureUnit,
             value = it->second;
 
         auto converter = EFFECT_CONVERTER.at(effect);
-        program->setUniformValue(EFFECT_UNIFORM_NAME.at(effect), converter(value));
+        dst[effect] = converter(value);
     }
 }
 
+void ShaderManager::setUniforms(QOpenGLShaderProgram *program, int textureUnit, const std::unordered_map<Effect, double> &effectValues)
+{
+    // Set the texture unit
+    program->setUniformValue(TEXTURE_UNIT_UNIFORM, textureUnit);
+
+    // Set uniform values
+    std::unordered_map<Effect, float> values;
+    getUniformValuesForEffects(effectValues, values);
+
+    for (const auto &[effect, value] : values)
+        program->setUniformValue(EFFECT_UNIFORM_NAME.at(effect), value);
+}
+
 void ShaderManager::registerEffects()
 {
     // Register graphic effects in libscratchcpp

src/shadermanager.h

@@ -26,6 +26,7 @@ class ShaderManager : public QObject
         static ShaderManager *instance();
 
         QOpenGLShaderProgram *getShaderProgram(const std::unordered_map<Effect, double> &effectValues);
+        static void getUniformValuesForEffects(const std::unordered_map<Effect, double> &effectValues, std::unordered_map<Effect, float> &dst);
         void setUniforms(QOpenGLShaderProgram *program, int textureUnit, const std::unordered_map<Effect, double> &effectValues);
 
     private:

test/shadermanager/shadermanager_test.cpp

@@ -179,6 +179,8 @@ TEST_F(ShaderManagerTest, ColorEffectValue)
     static const QString uniformName = "u_" + effectName;
     static const ShaderManager::Effect effect = ShaderManager::Effect::Color;
 
+    std::unordered_map<ShaderManager::Effect, float> values;
+
     QOpenGLFunctions glF(&m_context);
     glF.initializeOpenGLFunctions();
     ShaderManager manager;
@@ -190,28 +192,34 @@ TEST_F(ShaderManagerTest, ColorEffectValue)
     std::unordered_map<ShaderManager::Effect, double> effects = { { effect, 64.9 } };
     program.bind();
     manager.setUniforms(&program, 0, effects);
+    manager.getUniformValuesForEffects(effects, values);
 
     GLfloat value = 0.0f;
     glF.glGetUniformfv(program.programId(), program.uniformLocation(uniformName), &value);
     ASSERT_EQ(value, 0.3245f);
+    ASSERT_EQ(values.at(effect), value);
 
     // Below the minimum
     effects[effect] = -395.7;
     program.bind();
     manager.setUniforms(&program, 0, effects);
+    manager.getUniformValuesForEffects(effects, values);
 
     value = 0.0f;
     glF.glGetUniformfv(program.programId(), program.uniformLocation(uniformName), &value);
     ASSERT_EQ(std::round(value * 100.0f) / 100.0f, 0.02f);
+    ASSERT_EQ(values.at(effect), value);
 
     // Above the maximum
     effects[effect] = 579.05;
     program.bind();
     manager.setUniforms(&program, 0, effects);
+    manager.getUniformValuesForEffects(effects, values);
 
     value = 0.0f;
     glF.glGetUniformfv(program.programId(), program.uniformLocation(uniformName), &value);
     ASSERT_EQ(std::round(value * 100.0f) / 100.0f, 0.9f);
+    ASSERT_EQ(values.at(effect), value);
 
     program.release();
 }
@@ -222,6 +230,8 @@ TEST_F(ShaderManagerTest, BrightnessEffectValue)
     static const QString uniformName = "u_" + effectName;
     static const ShaderManager::Effect effect = ShaderManager::Effect::Brightness;
 
+    std::unordered_map<ShaderManager::Effect, float> values;
+
     QOpenGLFunctions glF(&m_context);
     glF.initializeOpenGLFunctions();
     ShaderManager manager;
@@ -233,28 +243,34 @@ TEST_F(ShaderManagerTest, BrightnessEffectValue)
     std::unordered_map<ShaderManager::Effect, double> effects = { { effect, 4.6 } };
     program.bind();
     manager.setUniforms(&program, 0, effects);
+    manager.getUniformValuesForEffects(effects, values);
 
     GLfloat value = 0.0f;
     glF.glGetUniformfv(program.programId(), program.uniformLocation(uniformName), &value);
     ASSERT_EQ(value, 0.046f);
+    ASSERT_EQ(values.at(effect), value);
 
     // Below the minimum
     effects[effect] = -102.9;
     program.bind();
     manager.setUniforms(&program, 0, effects);
+    manager.getUniformValuesForEffects(effects, values);
 
     value = 0.0f;
     glF.glGetUniformfv(program.programId(), program.uniformLocation(uniformName), &value);
     ASSERT_EQ(value, -1.0f);
+    ASSERT_EQ(values.at(effect), value);
 
     // Above the maximum
     effects[effect] = 353.2;
     program.bind();
     manager.setUniforms(&program, 0, effects);
+    manager.getUniformValuesForEffects(effects, values);
 
     value = 0.0f;
     glF.glGetUniformfv(program.programId(), program.uniformLocation(uniformName), &value);
     ASSERT_EQ(value, 1.0f);
+    ASSERT_EQ(values.at(effect), value);
 
     program.release();
 }
@@ -265,6 +281,8 @@ TEST_F(ShaderManagerTest, GhostEffectValue)
     static const QString uniformName = "u_" + effectName;
     static const ShaderManager::Effect effect = ShaderManager::Effect::Ghost;
 
+    std::unordered_map<ShaderManager::Effect, float> values;
+
     QOpenGLFunctions glF(&m_context);
     glF.initializeOpenGLFunctions();
     ShaderManager manager;
@@ -276,28 +294,34 @@ TEST_F(ShaderManagerTest, GhostEffectValue)
     std::unordered_map<ShaderManager::Effect, double> effects = { { effect, 58.5 } };
     program.bind();
     manager.setUniforms(&program, 0, effects);
+    manager.getUniformValuesForEffects(effects, values);
 
     GLfloat value = 0.0f;
     glF.glGetUniformfv(program.programId(), program.uniformLocation(uniformName), &value);
     ASSERT_EQ(std::round(value * 1000.0f) / 1000.0f, 0.415f);
+    ASSERT_EQ(values.at(effect), value);
 
     // Below the minimum
     effects[effect] = -20.8;
     program.bind();
     manager.setUniforms(&program, 0, effects);
+    manager.getUniformValuesForEffects(effects, values);
 
     value = 0.0f;
     glF.glGetUniformfv(program.programId(), program.uniformLocation(uniformName), &value);
     ASSERT_EQ(value, 1.0f);
+    ASSERT_EQ(values.at(effect), value);
 
     // Above the maximum
     effects[effect] = 248.2;
     program.bind();
     manager.setUniforms(&program, 0, effects);
+    manager.getUniformValuesForEffects(effects, values);
 
     value = 0.0f;
     glF.glGetUniformfv(program.programId(), program.uniformLocation(uniformName), &value);
     ASSERT_EQ(value, 0.0f);
+    ASSERT_EQ(values.at(effect), value);
 
     program.release();
 }