DiffusionEffect should not have any GLSL stuff in it.

diff --git a/diffusion_effect.cpp b/diffusion_effect.cpp
index 4e996b83ed999693ea37119375d3d01811ffcc8e..8d2903bb8e17e08e571a13da8e47a1789fa8fbd9 100644 (file)
--- a/diffusion_effect.cpp
+++ b/diffusion_effect.cpp
@@ -12,11 +12,6 @@ DiffusionEffect::DiffusionEffect()
 {
 }
 
 {
 }
 

-std::string DiffusionEffect::output_fragment_shader()
-{
-       return read_file("sandbox_effect.frag");
-}
-

 void DiffusionEffect::add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &inputs) {
        assert(inputs.size() == 1);
        blur->add_self_to_effect_chain(chain, inputs);
 void DiffusionEffect::add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &inputs) {
        assert(inputs.size() == 1);
        blur->add_self_to_effect_chain(chain, inputs);

diff --git a/diffusion_effect.h b/diffusion_effect.h
index 4223d22aa8c0f1cf2f74b8ea2b42c2dba1bce7b7..bda264932b897f20cb727cca6a236aa6c488cb58 100644 (file)
--- a/diffusion_effect.h
+++ b/diffusion_effect.h
@@ -20,10 +20,16 @@ class OverlayMatteEffect;
 class DiffusionEffect : public Effect {
 public:
        DiffusionEffect();
 class DiffusionEffect : public Effect {
 public:
        DiffusionEffect();

-       std::string output_fragment_shader();

 
        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 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;
 
 private:
        BlurEffect *blur;