Install effect_util.h; it is useful for people implementing their own effects.

[movit] / effect.cpp

diff --git a/effect.cpp b/effect.cpp
index 384e8c2944e741ce53bade017d4e7b9064148228..483828bda88fcabb03b1da4ec23946f4ccab274e 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,93 +1,13 @@
+#include <GL/glew.h>
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
-#include <GL/glew.h>
+#include <utility>
 
 #include "effect.h"
-#include "effect_chain.h"
+#include "effect_util.h"
 #include "util.h"
 
-GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key)
-{
-       std::string name = prefix + "_" + key;
-       return glGetUniformLocation(glsl_program_num, name.c_str());
-}
-
-void set_uniform_int(GLuint glsl_program_num, const std::string &prefix, const std::string &key, int value)
-{
-       GLint location = get_uniform_location(glsl_program_num, prefix, key);
-       if (location == -1) {
-               return;
-       }
-       check_error();
-       glUniform1i(location, value);
-       check_error();
-}
-
-void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const std::string &key, float value)
-{
-       GLint location = get_uniform_location(glsl_program_num, prefix, key);
-       if (location == -1) {
-               return;
-       }
-       check_error();
-       glUniform1f(location, value);
-       check_error();
-}
-
-void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
-{
-       GLint location = get_uniform_location(glsl_program_num, prefix, key);
-       if (location == -1) {
-               return;
-       }
-       check_error();
-       glUniform2fv(location, 1, values);
-       check_error();
-}
-
-void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
-{
-       GLint location = get_uniform_location(glsl_program_num, prefix, key);
-       if (location == -1) {
-               return;
-       }
-       check_error();
-       glUniform3fv(location, 1, values);
-       check_error();
-}
-
-void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values)
-{
-       GLint location = get_uniform_location(glsl_program_num, prefix, key);
-       if (location == -1) {
-               return;
-       }
-       check_error();
-       glUniform4fv(location, num_values, values);
-       check_error();
-}
-
-void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const Eigen::Matrix3d& matrix)
-{
-       GLint location = get_uniform_location(glsl_program_num, prefix, key);
-       if (location == -1) {
-               return;
-       }
-       check_error();
-
-       // Convert to float (GLSL has no double matrices).
-       float matrixf[9];
-       for (unsigned y = 0; y < 3; ++y) {
-               for (unsigned x = 0; x < 3; ++x) {
-                       matrixf[y + x * 3] = matrix(y, x);
-               }
-       }
-
-       glUniformMatrix3fv(location, 1, GL_FALSE, matrixf);
-       check_error();
-}
-
 bool Effect::set_int(const std::string &key, int value)
 {
        if (params_int.count(key) == 0) {
@@ -124,6 +44,15 @@ bool Effect::set_vec3(const std::string &key, const float *values)
        return true;
 }
 
+bool Effect::set_vec4(const std::string &key, const float *values)
+{
+       if (params_vec4.count(key) == 0) {
+               return false;
+       }
+       memcpy(params_vec4[key], values, sizeof(float) * 4);
+       return true;
+}
+
 void Effect::register_int(const std::string &key, int *value)
 {
        assert(params_int.count(key) == 0);
@@ -148,6 +77,12 @@ void Effect::register_vec3(const std::string &key, float *values)
        params_vec3[key] = values;
 }
 
+void Effect::register_vec4(const std::string &key, float *values)
+{
+       assert(params_vec4.count(key) == 0);
+       params_vec4[key] = values;
+}
+
 void Effect::register_1d_texture(const std::string &key, float *values, size_t size)
 {
        assert(params_tex_1d.count(key) == 0);
@@ -202,6 +137,13 @@ std::string Effect::output_convenience_uniforms() const
                sprintf(buf, "uniform vec3 PREFIX(%s);\n", it->first.c_str());
                output.append(buf);
        }
+       for (std::map<std::string, float*>::const_iterator it = params_vec4.begin();
+            it != params_vec4.end();
+            ++it) {
+               char buf[256];
+               sprintf(buf, "uniform vec4 PREFIX(%s);\n", it->first.c_str());
+               output.append(buf);
+       }
        for (std::map<std::string, Texture1D>::const_iterator it = params_tex_1d.begin();
             it != params_tex_1d.end();
             ++it) {
@@ -229,6 +171,11 @@ void Effect::set_gl_state(GLuint glsl_program_num, const std::string& prefix, un
             ++it) {
                set_uniform_vec3(glsl_program_num, prefix, it->first, it->second);
        }
+       for (std::map<std::string, float*>::const_iterator it = params_vec4.begin();
+            it != params_vec4.end();
+            ++it) {
+               set_uniform_vec4(glsl_program_num, prefix, it->first, it->second);
+       }
 
        for (std::map<std::string, Texture1D>::iterator it = params_tex_1d.begin();
             it != params_tex_1d.end();