X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=483828bda88fcabb03b1da4ec23946f4ccab274e;hp=02fc1f729cd5bec757860fe3039624a145392176;hb=4e1cc130959901f8be5566eacf7ecadbc7e0e9b2;hpb=2ced784c6599cb0b21427481ee17f4c8f6afdada

diff --git a/effect.cpp b/effect.cpp
index 02fc1f7..483828b 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,62 +1,13 @@
-#define GL_GLEXT_PROTOTYPES 1
-
+#include <GL/glew.h>
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
+#include <utility>
+
 #include "effect.h"
+#include "effect_util.h"
 #include "util.h"
 
-#include <GL/gl.h>
-#include <GL/glext.h>
-
-void set_uniform_int(GLuint glsl_program_num, const std::string &prefix, const std::string &key, int value)
-{
-	std::string name = prefix + "_" + key;
-	GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
-	if (l == -1) {
-		return;
-	}
-	check_error();
-	glUniform1i(l, value);
-	check_error();
-}
-
-void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const std::string &key, float value)
-{
-	std::string name = prefix + "_" + key;
-	GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
-	if (l == -1) {
-		return;
-	}
-	check_error();
-	glUniform1f(l, value);
-	check_error();
-}
-
-void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
-{
-	std::string name = prefix + "_" + key;
-	GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
-	if (l == -1) {
-		return;
-	}
-	check_error();
-	glUniform2fv(l, 1, values);
-	check_error();
-}
-
-void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
-{
-	std::string name = prefix + "_" + key;
-	GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
-	if (l == -1) {
-		return;
-	}
-	check_error();
-	glUniform3fv(l, 1, values);
-	check_error();
-}
-
 bool Effect::set_int(const std::string &key, int value)
 {
 	if (params_int.count(key) == 0) {
@@ -93,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);
@@ -117,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);
@@ -147,7 +113,7 @@ void Effect::invalidate_1d_texture(const std::string &key)
 
 // Output convenience uniforms for each parameter.
 // These will be filled in per-frame.
-std::string Effect::output_convenience_uniforms()
+std::string Effect::output_convenience_uniforms() const
 {
 	std::string output = "";
 	for (std::map<std::string, float*>::const_iterator it = params_float.begin();
@@ -171,6 +137,13 @@ std::string Effect::output_convenience_uniforms()
 		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) {
@@ -181,7 +154,7 @@ std::string Effect::output_convenience_uniforms()
 	return output;
 }
 
-void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
+void Effect::set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
 {
 	for (std::map<std::string, float*>::const_iterator it = params_float.begin();
 	     it != params_float.end();
@@ -198,8 +171,13 @@ void Effect::set_uniforms(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>::const_iterator it = params_tex_1d.begin();
+	for (std::map<std::string, Texture1D>::iterator it = params_tex_1d.begin();
 	     it != params_tex_1d.end();
 	     ++it) {
 		glActiveTexture(GL_TEXTURE0 + *sampler_num);
@@ -210,9 +188,12 @@ void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix, un
 		if (it->second.needs_update) {
 			glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE16F_ARB, it->second.size, 0, GL_LUMINANCE, GL_FLOAT, it->second.values);
 			check_error();
+			it->second.needs_update = false;
 		}
 
 		set_uniform_int(glsl_program_num, prefix, it->first, *sampler_num);
 		++*sampler_num;
 	}
 }
+
+void Effect::clear_gl_state() {}