Clean up stuff from the vertex shader.

[movit] / effect.h

diff --git a/effect.h b/effect.h
index c53a1556b28e500396387344f2dd6fd8aab28d27..3585e2df9a168a0439d7da808471dd0871dee102 100644 (file)
--- a/effect.h
+++ b/effect.h
@@ -4,6 +4,8 @@
 #include <map>
 #include <string>
 
+#include <GL/gl.h>
+
 // Can alias on a float[3].
 struct RGBTriplet {
        RGBTriplet(float r, float g, float b)
@@ -12,6 +14,10 @@ struct RGBTriplet {
        float r, g, b;
 };
 
+// Convenience functions that deal with prepending the prefix..
+void set_uniform_float(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, float value);
+void set_uniform_vec3(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
+
 class Effect {
 public: 
        virtual bool needs_linear_light() { return true; }
@@ -22,6 +28,8 @@ public:
        virtual std::string output_convenience_uniforms();
        virtual std::string output_glsl() = 0;
 
+       virtual void set_uniforms(GLhandleARB glsl_program_num, const std::string& prefix);
+
        // Neither of these take ownership.
        bool set_int(const std::string&, int value);
        bool set_float(const std::string &key, float value);