Make a new system for meta-effects, and convert the blur to use it. Hides the two...

[movit] / effect.h

diff --git a/effect.h b/effect.h
index a7b0e4be0565a0375b0ed4231c3bf03e5894b75a..cd6f00882d91e0a9086c5f691a473801a132dfe7 100644 (file)
--- a/effect.h
+++ b/effect.h
@@ -3,6 +3,17 @@
 
 #include <map>
 #include <string>
+#include <vector>
+
+#include <GL/gl.h>
+
+// Can alias on a float[2].
+struct Point2D {
+       Point2D(float x, float y)
+               : x(x), y(y) {}
+
+       float x, y;
+};
 
 // Can alias on a float[3].
 struct RGBTriplet {
@@ -12,28 +23,57 @@ struct RGBTriplet {
        float r, g, b;
 };
 
+// Convenience functions that deal with prepending the prefix.
+void set_uniform_int(GLuint glsl_program_num, const std::string &prefix, const std::string &key, int value);
+void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const std::string &key, float value);
+void set_uniform_float_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values);
+void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
+void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
+void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values);
+
 class Effect {
 public: 
-       virtual bool needs_linear_light() { return true; }
-       virtual bool needs_srgb_primaries() { return true; }
-       virtual bool needs_many_samples() { return false; }
-       virtual bool needs_mipmaps() { return false; }
+       virtual bool needs_linear_light() const { return true; }
+       virtual bool needs_srgb_primaries() const { return true; }
+       virtual bool needs_many_samples() const { return false; }
+       virtual bool needs_mipmaps() const { return false; }
+       virtual void add_self_to_effect_chain(std::vector<Effect *> *chain) {
+               chain->push_back(this);
+       }
+
+       virtual std::string output_convenience_uniforms() const;
+       virtual std::string output_fragment_shader() = 0;
+
+       virtual void set_uniforms(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num);
 
        // Neither of these take ownership.
-       bool set_int(const std::string&, int value);
-       bool set_float(const std::string &key, float value);
-       bool set_vec3(const std::string &key, const float *values);
+       virtual bool set_int(const std::string&, int value);
+       virtual bool set_float(const std::string &key, float value);
+       virtual bool set_vec2(const std::string &key, const float *values);
+       virtual bool set_vec3(const std::string &key, const float *values);
 
 protected:
        // Neither of these take ownership.
        void register_int(const std::string &key, int *value);
        void register_float(const std::string &key, float *value);
+       void register_vec2(const std::string &key, float *values);
        void register_vec3(const std::string &key, float *values);
+       void register_1d_texture(const std::string &key, float *values, size_t size);
+       void invalidate_1d_texture(const std::string &key);
        
 private:
+       struct Texture1D {
+               float *values;
+               size_t size;
+               bool needs_update;
+               GLuint texture_num;
+       };
+
        std::map<std::string, int *> params_int;
        std::map<std::string, float *> params_float;
+       std::map<std::string, float *> params_vec2;
        std::map<std::string, float *> params_vec3;
+       std::map<std::string, Texture1D> params_tex_1d;
 };
 
 #endif // !defined(_EFFECT_H)