X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=39e949078390e1bb21210e7ac586f3abad053b98;hp=02fc1f729cd5bec757860fe3039624a145392176;hb=ad27ef8410ceeabbadd57ace746867f04337844b;hpb=2ced784c6599cb0b21427481ee17f4c8f6afdada diff --git a/effect.cpp b/effect.cpp index 02fc1f7..39e9490 100644 --- a/effect.cpp +++ b/effect.cpp @@ -1,59 +1,101 @@ -#define GL_GLEXT_PROTOTYPES 1 - #include #include #include +#include + #include "effect.h" +#include "effect_chain.h" #include "util.h" -#include -#include +GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key) +{ + std::string name = prefix + "_" + key; + return glGetUniformLocation(glsl_program_num, name.c_str()); +} 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) { + GLint location = get_uniform_location(glsl_program_num, prefix, key); + if (location == -1) { return; } check_error(); - glUniform1i(l, value); + glUniform1i(location, 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) { + GLint location = get_uniform_location(glsl_program_num, prefix, key); + if (location == -1) { return; } check_error(); - glUniform1f(l, value); + glUniform1f(location, 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) { + GLint location = get_uniform_location(glsl_program_num, prefix, key); + if (location == -1) { return; } check_error(); - glUniform2fv(l, 1, values); + glUniform2fv(location, 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) { + GLint location = get_uniform_location(glsl_program_num, prefix, key); + if (location == -1) { + return; + } + check_error(); + glUniform3fv(location, 1, values); + 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(); - glUniform3fv(l, 1, values); + 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); + if (location == -1) { + return; + } + check_error(); + glUniform4fv(location, num_values, values); + 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(); } @@ -93,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); @@ -117,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); @@ -147,7 +204,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::const_iterator it = params_float.begin(); @@ -171,6 +228,13 @@ std::string Effect::output_convenience_uniforms() sprintf(buf, "uniform vec3 PREFIX(%s);\n", it->first.c_str()); output.append(buf); } + for (std::map::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::const_iterator it = params_tex_1d.begin(); it != params_tex_1d.end(); ++it) { @@ -181,7 +245,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::const_iterator it = params_float.begin(); it != params_float.end(); @@ -198,8 +262,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::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::const_iterator it = params_tex_1d.begin(); + for (std::map::iterator it = params_tex_1d.begin(); it != params_tex_1d.end(); ++it) { glActiveTexture(GL_TEXTURE0 + *sampler_num); @@ -210,9 +279,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() {}