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

diff --git a/effect.cpp b/effect.cpp
index c17ad3f..483828b 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,38 +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_float(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, float value)
-{
-	std::string name = prefix + "_" + key;
-	GLuint l = glGetUniformLocation(glsl_program_num, name.c_str());
-	if (l == -1) {
-		return;
-	}
-	check_error();
-	glUniform1f(l, value);
-	check_error();
-}
-
-void set_uniform_vec3(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
-{
-	std::string name = prefix + "_" + key;
-	GLuint 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) {
@@ -51,6 +26,15 @@ bool Effect::set_float(const std::string &key, float value)
 	return true;
 }
 
+bool Effect::set_vec2(const std::string &key, const float *values)
+{
+	if (params_vec2.count(key) == 0) {
+		return false;
+	}
+	memcpy(params_vec2[key], values, sizeof(float) * 2);
+	return true;
+}
+
 bool Effect::set_vec3(const std::string &key, const float *values)
 {
 	if (params_vec3.count(key) == 0) {
@@ -60,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);
@@ -72,15 +65,55 @@ void Effect::register_float(const std::string &key, float *value)
 	params_float[key] = value;
 }
 
+void Effect::register_vec2(const std::string &key, float *values)
+{
+	assert(params_vec2.count(key) == 0);
+	params_vec2[key] = values;
+}
+
 void Effect::register_vec3(const std::string &key, float *values)
 {
 	assert(params_vec3.count(key) == 0);
 	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);
+
+	Texture1D tex;
+	tex.values = values;
+	tex.size = size;
+	tex.needs_update = false;
+	glGenTextures(1, &tex.texture_num);
+
+	glBindTexture(GL_TEXTURE_1D, tex.texture_num);
+	check_error();
+	glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	check_error();
+	glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	check_error();
+	glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE16F_ARB, size, 0, GL_LUMINANCE, GL_FLOAT, values);
+	check_error();
+
+	params_tex_1d[key] = tex;
+}
+
+void Effect::invalidate_1d_texture(const std::string &key)
+{
+	assert(params_tex_1d.count(key) != 0);
+	params_tex_1d[key].needs_update = true;
+}
+
 // 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();
@@ -90,6 +123,13 @@ std::string Effect::output_convenience_uniforms()
 		sprintf(buf, "uniform float PREFIX(%s);\n", it->first.c_str());
 		output.append(buf);
 	}
+	for (std::map<std::string, float*>::const_iterator it = params_vec2.begin();
+	     it != params_vec2.end();
+	     ++it) {
+		char buf[256];
+		sprintf(buf, "uniform vec2 PREFIX(%s);\n", it->first.c_str());
+		output.append(buf);
+	}
 	for (std::map<std::string, float*>::const_iterator it = params_vec3.begin();
 	     it != params_vec3.end();
 	     ++it) {
@@ -97,19 +137,63 @@ 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) {
+		char buf[256];
+		sprintf(buf, "uniform sampler1D PREFIX(%s);\n", it->first.c_str());
+		output.append(buf);
+	}
 	return output;
 }
 
-void Effect::set_uniforms(GLhandleARB glsl_program_num, const std::string& prefix)
+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();
 	     ++it) {
 		set_uniform_float(glsl_program_num, prefix, it->first, *it->second);
 	}
+	for (std::map<std::string, float*>::const_iterator it = params_vec2.begin();
+	     it != params_vec2.end();
+	     ++it) {
+		set_uniform_vec2(glsl_program_num, prefix, it->first, it->second);
+	}
 	for (std::map<std::string, float*>::const_iterator it = params_vec3.begin();
 	     it != params_vec3.end();
 	     ++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();
+	     ++it) {
+		glActiveTexture(GL_TEXTURE0 + *sampler_num);
+		check_error();
+		glBindTexture(GL_TEXTURE_1D, it->second.texture_num);
+		check_error();
+
+		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() {}