Ask Google Test not to use exceptions.

[movit] / effect.cpp

diff --git a/effect.cpp b/effect.cpp
index d0222dec91f936e662d5c82adb1c05ccf0eb4110..39e949078390e1bb21210e7ac586f3abad053b98 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,12 +1,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include <GL/glew.h>
+
 #include "effect.h"
 #include "effect_chain.h"
 #include "util.h"
 
-#include "opengl.h"
-
 GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key)
 {
        std::string name = prefix + "_" + key;
@@ -35,36 +35,36 @@ void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const
        check_error();
 }
 
-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)
 {
        GLint location = get_uniform_location(glsl_program_num, prefix, key);
        if (location == -1) {
                return;
        }
        check_error();
-       glUniform1fv(location, num_values, values);
+       glUniform2fv(location, 1, values);
        check_error();
 }
 
-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)
 {
        GLint location = get_uniform_location(glsl_program_num, prefix, key);
        if (location == -1) {
                return;
        }
        check_error();
-       glUniform2fv(location, 1, values);
+       glUniform3fv(location, 1, values);
        check_error();
 }
 
-void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec4(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);
+       glUniform4fv(location, 1, values);
        check_error();
 }
 
@@ -79,6 +79,26 @@ void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix,
        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) {
@@ -115,6 +135,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);
@@ -139,6 +168,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);
@@ -193,6 +228,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) {
@@ -220,6 +262,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();