Add a glow effect, and an effect that linearly mixes two sources (because glow needed...

diff --git a/Makefile b/Makefile
index b79bd788cafee6a1ddcca2d65f1b9793a5527436..7f7e7c1b5f75b37497e9189cce91c8c18796b0c6 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 input.o
-OBJS += lift_gamma_gain_effect.o gamma_expansion_effect.o gamma_compression_effect.o colorspace_conversion_effect.o saturation_effect.o vignette_effect.o mirror_effect.o blur_effect.o diffusion_effect.o sandbox_effect.o
+OBJS += lift_gamma_gain_effect.o gamma_expansion_effect.o gamma_compression_effect.o colorspace_conversion_effect.o saturation_effect.o vignette_effect.o mirror_effect.o blur_effect.o diffusion_effect.o glow_effect.o mix_effect.o sandbox_effect.o
 
 test: $(OBJS)
        $(CXX) -o test $(OBJS) $(LDFLAGS)

diff --git a/effect_chain.cpp b/effect_chain.cpp
index f4706a4324239e3e34b300423f9c6204e22e9fac..a8b66ce3caa199320012dd7180d6c3bb5981848e 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -22,6 +22,8 @@
 #include "vignette_effect.h"
 #include "blur_effect.h"
 #include "diffusion_effect.h"
+#include "glow_effect.h"
+#include "mix_effect.h"
 #include "input.h"
 
 EffectChain::EffectChain(unsigned width, unsigned height)
@@ -85,6 +87,10 @@ Effect *instantiate_effect(EffectId effect)
                return new BlurEffect();
        case EFFECT_DIFFUSION:
                return new DiffusionEffect();
+       case EFFECT_GLOW:
+               return new GlowEffect();
+       case EFFECT_MIX:
+               return new MixEffect();
        }
        assert(false);
 }

diff --git a/effect_id.h b/effect_id.h
index 545a7be3043f61e26789096448f2b88c0e94497e..227cf97f8d50f7a66c42432319ba2bae29774a2d 100644 (file)
--- a/effect_id.h
+++ b/effect_id.h
@@ -17,6 +17,10 @@ enum EffectId {
        EFFECT_VIGNETTE,
        EFFECT_BLUR,
        EFFECT_DIFFUSION,
+       EFFECT_GLOW,
+
+       // Combining.
+       EFFECT_MIX,
 };
 
 #endif // !defined(_EFFECT_ID_H)

diff --git a/glow_effect.cpp b/glow_effect.cpp
new file mode 100644 (file)
index 0000000..e4c9a42
--- /dev/null
+++ b/glow_effect.cpp
@@ -0,0 +1,33 @@
+#include <math.h>
+#include <assert.h>
+
+#include "glow_effect.h"
+#include "blur_effect.h"
+#include "mix_effect.h"
+#include "effect_chain.h"
+#include "util.h"
+
+GlowEffect::GlowEffect()
+       : blur(new BlurEffect),
+         mix(new MixEffect)
+{
+       mix->set_float("strength_first", 1.0f);
+       mix->set_float("strength_second", 0.3f);
+}
+
+void GlowEffect::add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &inputs) {
+       assert(inputs.size() == 1);
+       blur->add_self_to_effect_chain(chain, inputs);
+
+       std::vector<Effect *> mix_inputs;
+       mix_inputs.push_back(inputs[0]);
+       mix_inputs.push_back(chain->last_added_effect());  // FIXME
+       mix->add_self_to_effect_chain(chain, mix_inputs);
+}
+
+bool GlowEffect::set_float(const std::string &key, float value) {
+       if (key == "blurred_mix_amount") {
+               return mix->set_float("strength_second", value);
+       }
+       return blur->set_float(key, value);
+}

diff --git a/glow_effect.h b/glow_effect.h
new file mode 100644 (file)
index 0000000..7ee164d
--- /dev/null
+++ b/glow_effect.h
@@ -0,0 +1,32 @@
+#ifndef _GLOW_EFFECT_H
+#define _GLOW_EFFECT_H 1
+
+// Glow: Simply add a blurred version of the image to itself.
+
+#include "effect.h"
+
+class BlurEffect;
+class MixEffect;
+
+class GlowEffect : public Effect {
+public:
+       GlowEffect();
+
+       virtual bool needs_srgb_primaries() const { return false; }
+
+       virtual void add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &input);
+       virtual bool set_float(const std::string &key, float value);
+
+       virtual std::string output_fragment_shader() {
+               assert(false);
+       }
+       virtual void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) {
+               assert(false);
+       }
+
+private:
+       BlurEffect *blur;
+       MixEffect *mix;
+};
+
+#endif // !defined(_GLOW_EFFECT_H)

diff --git a/mix_effect.cpp b/mix_effect.cpp
new file mode 100644 (file)
index 0000000..0f80a8f
--- /dev/null
+++ b/mix_effect.cpp
@@ -0,0 +1,14 @@
+#include "mix_effect.h"
+#include "util.h"
+
+MixEffect::MixEffect()
+       : strength_first(0.5f), strength_second(0.5f)
+{
+       register_float("strength_first", &strength_first);
+       register_float("strength_second", &strength_second);
+}
+
+std::string MixEffect::output_fragment_shader()
+{
+       return read_file("mix_effect.frag");
+}

diff --git a/mix_effect.frag b/mix_effect.frag
new file mode 100644 (file)
index 0000000..f76881b
--- /dev/null
+++ b/mix_effect.frag
@@ -0,0 +1,5 @@
+vec4 FUNCNAME(vec2 tc) {
+       vec4 first = INPUT1(tc);
+       vec4 second = INPUT2(tc);
+       return vec4(PREFIX(strength_first)) * first + vec4(PREFIX(strength_second)) * second;
+}

diff --git a/mix_effect.h b/mix_effect.h
new file mode 100644 (file)
index 0000000..7342b90
--- /dev/null
+++ b/mix_effect.h
@@ -0,0 +1,20 @@
+#ifndef _MIX_EFFECT_H
+#define _MIX_EFFECT_H 1
+
+// Combine two images: a*x + b*y. (If you set a within [0,1] and b=1-a, you will get a fade.)
+
+#include "effect.h"
+
+class MixEffect : public Effect {
+public:
+       MixEffect();
+       std::string output_fragment_shader();
+
+       virtual bool needs_srgb_primaries() const { return false; }
+       virtual unsigned num_inputs() const { return 2; }
+
+private:
+       float strength_first, strength_second;
+};
+
+#endif // !defined(_MIX_EFFECT_H)