Makefile should now be in .gitignore.

[movit] / blur_effect.cpp

diff --git a/blur_effect.cpp b/blur_effect.cpp
index 579521fde00b2e952824681bf5dcaa1aea178e7e..0ec1b1dc857fbec5dbb30568d30058ebb274841b 100644 (file)
--- a/blur_effect.cpp
+++ b/blur_effect.cpp
@@ -1,10 +1,12 @@
-#include <math.h>
+#include <GL/glew.h>
 #include <assert.h>
+#include <math.h>
+#include <algorithm>
 
 #include "blur_effect.h"
 #include "effect_chain.h"
+#include "effect_util.h"
 #include "util.h"
-#include "opengl.h"
 
 // Must match blur_effect.frag.
 #define NUM_TAPS 16
@@ -16,9 +18,9 @@ BlurEffect::BlurEffect()
 {
        // The first blur pass will forward resolution information to us.
        hpass = new SingleBlurPassEffect(this);
-       hpass->set_int("direction", SingleBlurPassEffect::HORIZONTAL);
+       CHECK(hpass->set_int("direction", SingleBlurPassEffect::HORIZONTAL));
        vpass = new SingleBlurPassEffect(NULL);
-       vpass->set_int("direction", SingleBlurPassEffect::VERTICAL);
+       CHECK(vpass->set_int("direction", SingleBlurPassEffect::VERTICAL));
 
        update_radius();
 }
@@ -64,10 +66,14 @@ void BlurEffect::update_radius()
        bool ok = hpass->set_float("radius", adjusted_radius);
        ok |= hpass->set_int("width", mipmap_width);
        ok |= hpass->set_int("height", mipmap_height);
+       ok |= hpass->set_int("virtual_width", mipmap_width);
+       ok |= hpass->set_int("virtual_height", mipmap_height);
 
        ok |= vpass->set_float("radius", adjusted_radius);
        ok |= vpass->set_int("width", mipmap_width);
        ok |= vpass->set_int("height", mipmap_height);
+       ok |= vpass->set_int("virtual_width", input_width);
+       ok |= vpass->set_int("virtual_height", input_height);
 
        assert(ok);
 }
@@ -92,6 +98,8 @@ SingleBlurPassEffect::SingleBlurPassEffect(BlurEffect *parent)
        register_int("direction", (int *)&direction);
        register_int("width", &width);
        register_int("height", &height);
+       register_int("virtual_width", &virtual_width);
+       register_int("virtual_height", &virtual_height);
 }
 
 std::string SingleBlurPassEffect::output_fragment_shader()
@@ -162,13 +170,8 @@ void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const std::stri
                float w2 = weight[base_pos + 1];
 
                float offset, total_weight;
-               if (w1 + w2 < 1e-6) {
-                       offset = 0.5f;
-                       total_weight = 0.0f;
-               } else {
-                       offset = w2 / (w1 + w2);
-                       total_weight = w1 + w2;
-               }
+               combine_two_samples(w1, w2, &offset, &total_weight, NULL);
+
                float x = 0.0f, y = 0.0f;
 
                if (direction == HORIZONTAL) {