X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=fb66514a290d1cb780c6a87b2fae4b97a8d9627f;hp=483828bda88fcabb03b1da4ec23946f4ccab274e;hb=95edbfccb0843da3cc105dadc5bc6d8e102f6071;hpb=ad66f9714e4a36008c341355700272a52484a785 diff --git a/effect.cpp b/effect.cpp index 483828b..fb66514 100644 --- a/effect.cpp +++ b/effect.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -6,9 +6,12 @@ #include "effect.h" #include "effect_util.h" -#include "util.h" -bool Effect::set_int(const std::string &key, int value) +using namespace std; + +namespace movit { + +bool Effect::set_int(const string &key, int value) { if (params_int.count(key) == 0) { return false; @@ -17,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; @@ -26,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; @@ -35,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; @@ -44,7 +47,7 @@ bool Effect::set_vec3(const std::string &key, const float *values) return true; } -bool Effect::set_vec4(const std::string &key, const float *values) +bool Effect::set_vec4(const string &key, const float *values) { if (params_vec4.count(key) == 0) { return false; @@ -53,147 +56,96 @@ bool Effect::set_vec4(const std::string &key, const float *values) return true; } -void Effect::register_int(const std::string &key, int *value) +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_vec4(const std::string &key, float *values) +void Effect::register_vec4(const 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() 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_vec4.begin(); + for (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) { - char buf[256]; - sprintf(buf, "uniform sampler1D 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::const_iterator it = params_vec4.begin(); + for (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::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() {} + +} // namespace movit