X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=39e949078390e1bb21210e7ac586f3abad053b98;hp=1847f4831f4792b73edc62fcf6f4df07c60406c3;hb=6e03d8c6dec4b4639137893fe4e1aff224836f59;hpb=8120b8fad20a35936c7d3316d5564af446a20c0f

diff --git a/effect.cpp b/effect.cpp
index 1847f48..39e9490 100644
--- 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;
@@ -57,6 +57,17 @@ void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const
 	check_error();
 }
 
+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();
+	glUniform4fv(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);
@@ -68,7 +79,7 @@ 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 Matrix3x3 matrix)
+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) {
@@ -78,8 +89,10 @@ void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const
 
 	// Convert to float (GLSL has no double matrices).
 	float matrixf[9];
-	for (unsigned i = 0; i < 9; ++i) {
-		matrixf[i] = matrix[i];
+	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);
@@ -122,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);
@@ -146,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);
@@ -200,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) {
@@ -227,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();