X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=fb66514a290d1cb780c6a87b2fae4b97a8d9627f;hp=74bd939f3f1e811303519e4aaf5d5ed2dac615bb;hb=a5a795f293fcf84f24ddcebd062a5d433f7be8e4;hpb=cfe0bc4fa1e2a56eeb12c33e596f79c1292292c8 diff --git a/effect.cpp b/effect.cpp index 74bd939..fb66514 100644 --- a/effect.cpp +++ b/effect.cpp @@ -1,103 +1,17 @@ +#include +#include #include #include -#include -#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; - 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) -{ - GLint location = get_uniform_location(glsl_program_num, prefix, key); - if (location == -1) { - return; - } - check_error(); - glUniform1i(location, value); - check_error(); -} - -void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const std::string &key, float value) -{ - GLint location = get_uniform_location(glsl_program_num, prefix, key); - if (location == -1) { - return; - } - check_error(); - glUniform1f(location, value); - 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); - if (location == -1) { - return; - } - check_error(); - 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) -{ - GLint location = get_uniform_location(glsl_program_num, prefix, key); - if (location == -1) { - return; - } - check_error(); - glUniform3fv(location, 1, values); - check_error(); -} +#include -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 Matrix3x3 matrix) -{ - GLint location = get_uniform_location(glsl_program_num, prefix, key); - if (location == -1) { - return; - } - check_error(); +#include "effect.h" +#include "effect_util.h" - // Convert to float (GLSL has no double matrices). - float matrixf[9]; - for (unsigned i = 0; i < 9; ++i) { - matrixf[i] = matrix[i]; - } +using namespace std; - glUniformMatrix3fv(location, 1, GL_FALSE, matrixf); - check_error(); -} +namespace movit { -bool Effect::set_int(const std::string &key, int value) +bool Effect::set_int(const string &key, int value) { if (params_int.count(key) == 0) { return false; @@ -106,7 +20,7 @@ bool Effect::set_int(const std::string &key, int value) return true; } -bool Effect::set_float(const std::string &key, float value) +bool Effect::set_float(const string &key, float value) { if (params_float.count(key) == 0) { return false; @@ -115,7 +29,7 @@ bool Effect::set_float(const std::string &key, float value) return true; } -bool Effect::set_vec2(const std::string &key, const float *values) +bool Effect::set_vec2(const string &key, const float *values) { if (params_vec2.count(key) == 0) { return false; @@ -124,7 +38,7 @@ bool Effect::set_vec2(const std::string &key, const float *values) return true; } -bool Effect::set_vec3(const std::string &key, const float *values) +bool Effect::set_vec3(const string &key, const float *values) { if (params_vec3.count(key) == 0) { return false; @@ -133,129 +47,105 @@ bool Effect::set_vec3(const std::string &key, const float *values) return true; } -void Effect::register_int(const std::string &key, int *value) +bool Effect::set_vec4(const 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 string &key, int *value) { assert(params_int.count(key) == 0); params_int[key] = value; } -void Effect::register_float(const std::string &key, float *value) +void Effect::register_float(const string &key, float *value) { assert(params_float.count(key) == 0); params_float[key] = value; } -void Effect::register_vec2(const std::string &key, float *values) +void Effect::register_vec2(const string &key, float *values) { assert(params_vec2.count(key) == 0); params_vec2[key] = values; } -void Effect::register_vec3(const std::string &key, float *values) +void Effect::register_vec3(const string &key, float *values) { assert(params_vec3.count(key) == 0); params_vec3[key] = values; } -void Effect::register_1d_texture(const std::string &key, float *values, size_t size) +void Effect::register_vec4(const string &key, float *values) { - 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; + assert(params_vec4.count(key) == 0); + params_vec4[key] = values; } // Output convenience uniforms for each parameter. // These will be filled in per-frame. -std::string Effect::output_convenience_uniforms() const +string Effect::output_convenience_uniforms() const { - std::string output = ""; - for (std::map::const_iterator it = params_float.begin(); + string output = ""; + for (map::const_iterator it = params_float.begin(); it != params_float.end(); ++it) { char buf[256]; sprintf(buf, "uniform float PREFIX(%s);\n", it->first.c_str()); output.append(buf); } - for (std::map::const_iterator it = params_vec2.begin(); + for (map::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::const_iterator it = params_vec3.begin(); + for (map::const_iterator it = params_vec3.begin(); it != params_vec3.end(); ++it) { char buf[256]; sprintf(buf, "uniform vec3 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(); + for (map::const_iterator it = params_vec4.begin(); + it != params_vec4.end(); ++it) { char buf[256]; - sprintf(buf, "uniform sampler1D PREFIX(%s);\n", it->first.c_str()); + sprintf(buf, "uniform vec4 PREFIX(%s);\n", it->first.c_str()); output.append(buf); } return output; } -void Effect::set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num) +void Effect::set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num) { - for (std::map::const_iterator it = params_float.begin(); + for (map::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::const_iterator it = params_vec2.begin(); + for (map::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::const_iterator it = params_vec3.begin(); + for (map::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::iterator it = params_tex_1d.begin(); - it != params_tex_1d.end(); + for (map::const_iterator it = params_vec4.begin(); + it != params_vec4.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; + set_uniform_vec4(glsl_program_num, prefix, it->first, it->second); } } void Effect::clear_gl_state() {} + +} // namespace movit