Add a high-cutoff filter to the glow effect.

[movit] / effect.cpp

diff --git a/effect.cpp b/effect.cpp
index 8cba87bc7b388a6761b81acc8939a6df5cef397a..9ff200bacde5d01258ffa2b7040181f266824efa 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,83 +1,90 @@
-#define GL_GLEXT_PROTOTYPES 1
-

 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include "effect.h"
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include "effect.h"

+#include "effect_chain.h"

 #include "util.h"
 
 #include "util.h"
 

-#include <GL/gl.h>
-#include <GL/glext.h>
+#include "opengl.h"

 
 

-void set_uniform_int(GLuint glsl_program_num, const std::string &prefix, const std::string &key, int value)
+GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key)

 {
        std::string name = prefix + "_" + key;
 {
        std::string name = prefix + "_" + key;

-       GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
-       if (l == -1) {
+       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();
                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)
 {
        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();
                return;
        }
        check_error();

-       glUniform1f(l, value);
+       glUniform1f(location, value);

        check_error();
 }
 
        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)
+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();
                return;
        }
        check_error();

-       glUniform1fv(l, num_values, values);
+       glUniform2fv(location, 1, values);

        check_error();
 }
 
        check_error();
 }
 

-void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+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();
                return;
        }
        check_error();

-       glUniform2fv(l, 1, values);
+       glUniform3fv(location, 1, values);

        check_error();
 }
 
        check_error();
 }
 

-void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_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();
                return;
        }
        check_error();

-       glUniform3fv(l, 1, values);
+       glUniform4fv(location, num_values, values);

        check_error();
 }
 
        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)
+void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const Eigen::Matrix3d& matrix)

 {
 {

-       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();
                return;
        }
        check_error();

-       glUniform4fv(l, num_values, values);
+
+       // 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();
 }
 
        check_error();
 }
 


@@ -205,7 +212,7 @@ std::string Effect::output_convenience_uniforms() const
        return output;
 }
 
        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();
 {
        for (std::map<std::string, float*>::const_iterator it = params_float.begin();
             it != params_float.end();


@@ -223,7 +230,7 @@ void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix, un
                set_uniform_vec3(glsl_program_num, prefix, it->first, it->second);
        }
 
                set_uniform_vec3(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);
             it != params_tex_1d.end();
             ++it) {
                glActiveTexture(GL_TEXTURE0 + *sampler_num);


@@ -234,9 +241,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();
                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_int(glsl_program_num, prefix, it->first, *sampler_num);
                ++*sampler_num;
        }
 }

+
+void Effect::clear_gl_state() {}