Move saturation out into its own effect, and hook up the control.

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 56d470fb572e7764e0c78d02bf8d8a0e0a08f506..2bae9ed4e6f96b91567ecf6ac1c9d40497b75273 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -13,6 +13,7 @@
 #include "gamma_compression_effect.h"
 #include "lift_gamma_gain_effect.h"
 #include "colorspace_conversion_effect.h"
+#include "saturation_effect.h"
 #include "texture_enum.h"
 
 EffectChain::EffectChain(unsigned width, unsigned height)
@@ -39,6 +40,8 @@ Effect *instantiate_effect(EffectId effect)
                return new GammaExpansionEffect();
        case LIFT_GAMMA_GAIN:
                return new LiftGammaGainEffect();
+       case SATURATION:
+               return new SaturationEffect();
        }
        assert(false);
 }
@@ -191,9 +194,11 @@ void EffectChain::render_to_screen(unsigned char *src)
        check_error();
        glUniform1i(glGetUniformLocation(glsl_program_num, "input_tex"), 0);
 
-       //for (unsigned i = 0; i < effects.size(); ++i) {
-       //      effects[i]->set_uniforms();
-       //}
+       for (unsigned i = 0; i < effects.size(); ++i) {
+               char effect_id[256];
+               sprintf(effect_id, "eff%d", i);
+               effects[i]->set_uniforms(glsl_program_num, effect_id);
+       }
 
        glDisable(GL_BLEND);
        check_error();