X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=9ff200bacde5d01258ffa2b7040181f266824efa;hp=74bd939f3f1e811303519e4aaf5d5ed2dac615bb;hb=f653817a84050a9b12c953eadd2999c8642ee025;hpb=cfe0bc4fa1e2a56eeb12c33e596f79c1292292c8

diff --git a/effect.cpp b/effect.cpp
index 74bd939..9ff200b 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -35,17 +35,6 @@ 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)
-{
-	GLint location = get_uniform_location(glsl_program_num, prefix, key);
-	if (location == -1) {
-		return;
-	}
-	check_error();
-	glUniform1fv(location, num_values, values);
-	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);
@@ -79,7 +68,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) {
@@ -89,8 +78,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);