Reduce the amount of arithmetic in the BlurEffect shader a bit.

[movit] / diffusion_effect.h

diff --git a/diffusion_effect.h b/diffusion_effect.h
index f8ed77c35af528cdb71e896e80522dfa3c270ae8..2c31e4ae348524e23ba2b55e344a739d01b2092c 100644 (file)
--- a/diffusion_effect.h
+++ b/diffusion_effect.h
@@ -1,5 +1,5 @@
-#ifndef _DIFFUSION_EFFECT_H
-#define _DIFFUSION_EFFECT_H 1
+#ifndef _MOVIT_DIFFUSION_EFFECT_H
+#define _MOVIT_DIFFUSION_EFFECT_H 1
 
 // There are many different effects that go under the name of "diffusion",
 // seemingly all of the inspired by the effect you get when you put a
@@ -12,9 +12,17 @@
 // where we first blur the picture, and then overlay it on the original
 // using the original as a matte.
 
+#include <GL/glew.h>
+#include <assert.h>
+#include <string>
+
 #include "effect.h"
 
+namespace movit {
+
 class BlurEffect;
+class EffectChain;
+class Node;
 class OverlayMatteEffect;
 
 class DiffusionEffect : public Effect {
@@ -22,7 +30,7 @@ public:
        DiffusionEffect();
        virtual std::string effect_type_id() const { return "DiffusionEffect"; }
 
-       virtual void add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &input);
+       virtual void rewrite_graph(EffectChain *graph, Node *self);
        virtual bool set_float(const std::string &key, float value);
        
        virtual std::string output_fragment_shader() {
@@ -44,6 +52,7 @@ public:
        OverlayMatteEffect();
        virtual std::string effect_type_id() const { return "OverlayMatteEffect"; }
        std::string output_fragment_shader();
+       virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
        unsigned num_inputs() const { return 2; }
 
@@ -51,5 +60,6 @@ private:
        float blurred_mix_amount;
 };
 
+}  // namespace movit
 
-#endif // !defined(_DIFFUSION_EFFECT_H)
+#endif // !defined(_MOVIT_DIFFUSION_EFFECT_H)