X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.h;h=2f0172a9bc2c983222653aef5620c2dd3e626ea9;hp=623915b8cd5fea8e4d3ed90fe70679d55ee7d336;hb=75c27c449aabb27ed0b028b57b20d70005a6e447;hpb=a592c55caca0fb654bad4ec43b84c46abcee21c2

diff --git a/effect.h b/effect.h
index 623915b..2f0172a 100644
--- a/effect.h
+++ b/effect.h
@@ -4,6 +4,16 @@
 #include <map>
 #include <string>
 
+#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 {
 	RGBTriplet(float r, float g, float b)
@@ -12,29 +22,53 @@ 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);
+
 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 std::string output_glsl() = 0;
+	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 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_vec2(const std::string &key, const float *values);
 	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)