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

diff --git a/Makefile b/Makefile
index 4dbaf121fc930491f9b1f76641d01f541f469430..b61f78b2177ba424201cdbf835604046255401d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CXX=g++
 CXXFLAGS=-Wall -g
 LDFLAGS=-lSDL -lSDL_image -lGL
 OBJS=main.o util.o widgets.o effect.o effect_chain.o
-OBJS += lift_gamma_gain_effect.o gamma_expansion_effect.o gamma_compression_effect.o colorspace_conversion_effect.o
+OBJS += lift_gamma_gain_effect.o gamma_expansion_effect.o gamma_compression_effect.o colorspace_conversion_effect.o saturation_effect.o
 
 test: $(OBJS)
        $(CXX) -o test $(OBJS) $(LDFLAGS)

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 1ff57d75672b3769121f7c0956941c6538415620..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);
 }

diff --git a/effect_id.h b/effect_id.h
index af92ac0ad94d827fd8d492bee1aa2b13a72efec9..20cd3b9f5e2d129bb2e37028d98803e96a89ff87 100644 (file)
--- a/effect_id.h
+++ b/effect_id.h
@@ -8,6 +8,7 @@ enum EffectId {
 
        // Color.
        LIFT_GAMMA_GAIN,
+       SATURATION,
 };
 
 #endif // !defined(_EFFECT_ID_H)

diff --git a/lift_gamma_gain_effect.cpp b/lift_gamma_gain_effect.cpp
index b32ed93027f265873accad9ecf94f609315555eb..cd5477351f5f405a5ec81481fcd9d54111ac6035 100644 (file)
--- a/lift_gamma_gain_effect.cpp
+++ b/lift_gamma_gain_effect.cpp
@@ -10,13 +10,11 @@
 LiftGammaGainEffect::LiftGammaGainEffect()
        : lift(0.0f, 0.0f, 0.0f),
          gamma(1.0f, 1.0f, 1.0f),
-         gain(1.0f, 1.0f, 1.0f),
-         saturation(1.0f)
+         gain(1.0f, 1.0f, 1.0f)
 {
        register_vec3("lift", (float *)&lift);
        register_vec3("gamma", (float *)&gamma);
        register_vec3("gain", (float *)&gain);
-       register_float("saturation", &saturation);
 }
 
 std::string LiftGammaGainEffect::output_glsl()

diff --git a/lift_gamma_gain_effect.h b/lift_gamma_gain_effect.h
index 097195583264764189283efda1bbc5d3cdf73f81..622493491f79c865729542e97dc4eca08efe69a3 100644 (file)
--- a/lift_gamma_gain_effect.h
+++ b/lift_gamma_gain_effect.h
@@ -12,7 +12,6 @@ public:
 
 private:
        RGBTriplet lift, gamma, gain;
-       float saturation;
 };
 
 #endif // !defined(_LIFT_GAMMA_GAIN_EFFECT_H)

diff --git a/main.cpp b/main.cpp
index d82369447b69ac8986bb4c55e34d69e9352a57cc..333cdfc1cccb7d6d1f4c2ee0569e6164c0521ba5 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -34,7 +34,7 @@ float gamma_theta = 0.0f, gamma_rad = 0.0f, gamma_v = 0.5f;
 float gain_theta = 0.0f, gain_rad = 0.0f, gain_v = 0.25f;
 float saturation = 1.0f;
 
-void update_hsv(Effect *lift_gamma_gain_effect)
+void update_hsv(Effect *lift_gamma_gain_effect, Effect *saturation_effect)
 {
        RGBTriplet lift(0.0f, 0.0f, 0.0f);
        RGBTriplet gamma(1.0f, 1.0f, 1.0f);
@@ -52,6 +52,8 @@ void update_hsv(Effect *lift_gamma_gain_effect)
        if (saturation < 0.0) {
                saturation = 0.0;
        }
+       ok = saturation_effect->set_float("saturation", saturation);
+       assert(ok);
 }
 
 void mouse(int x, int y)
@@ -182,6 +184,7 @@ int main(int argc, char **argv)
 
        chain.add_input(inout_format);
        Effect *lift_gamma_gain_effect = chain.add_effect(LIFT_GAMMA_GAIN);
+       Effect *saturation_effect = chain.add_effect(SATURATION);
        chain.add_output(inout_format);
        chain.finalize();
 
@@ -277,7 +280,7 @@ int main(int argc, char **argv)
 
                ++frame;
 
-               update_hsv(lift_gamma_gain_effect);
+               update_hsv(lift_gamma_gain_effect, saturation_effect);
                chain.render_to_screen(src_img);
                
                glReadPixels(0, 0, WIDTH, HEIGHT, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, BUFFER_OFFSET(0));

diff --git a/saturation_effect.cpp b/saturation_effect.cpp
new file mode 100644 (file)
index 0000000..376e0fc
--- /dev/null
+++ b/saturation_effect.cpp
@@ -0,0 +1,15 @@
+#define GL_GLEXT_PROTOTYPES 1
+
+#include "saturation_effect.h"
+#include "util.h"
+
+SaturationEffect::SaturationEffect()
+       : saturation(1.0f)
+{
+       register_float("saturation", &saturation);
+}
+
+std::string SaturationEffect::output_glsl()
+{
+       return read_file("saturation_effect.glsl");
+}

diff --git a/saturation_effect.glsl b/saturation_effect.glsl
new file mode 100644 (file)
index 0000000..a68485a
--- /dev/null
+++ b/saturation_effect.glsl
@@ -0,0 +1,10 @@
+// Saturate/desaturate (in linear space).
+
+vec4 FUNCNAME(vec2 tc) {
+       vec4 x = LAST_INPUT(tc);
+
+       float luminance = dot(x.rgb, vec3(0.2126, 0.7152, 0.0722));
+       x.rgb = mix(vec3(luminance), x.rgb, PREFIX(saturation));
+
+       return x;
+}

diff --git a/saturation_effect.h b/saturation_effect.h
new file mode 100644 (file)
index 0000000..3f057e9
--- /dev/null
+++ b/saturation_effect.h
@@ -0,0 +1,15 @@
+#ifndef _SATURATION_EFFECT_H
+#define _SATURATION_EFFECT_H 1
+
+#include "effect.h"
+
+class SaturationEffect : public Effect {
+public:
+       SaturationEffect();
+       std::string output_glsl();
+
+private:
+       float saturation;
+};
+
+#endif // !defined(_SATURATION_EFFECT_H)