X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=vignette_effect.cpp;h=d8b4f9bf24d674fc1cf6b815e7e6f07c16e8ff78;hp=ac5197781cc4fc17f95ad2f5211df6021c0bc700;hb=12c11c0e615f7fc17ef7a600ff0c9099f7908dbc;hpb=ad66f9714e4a36008c341355700272a52484a785

diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index ac51977..d8b4f9b 100644
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -1,12 +1,18 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
+#include <assert.h>
 #include <math.h>
 
 #include "effect_util.h"
-#include "vignette_effect.h"
 #include "util.h"
+#include "vignette_effect.h"
+
+using namespace std;
+
+namespace movit {
 
 VignetteEffect::VignetteEffect()
 	: center(0.5f, 0.5f),
+	  aspect_correction(1.0f, 1.0f),
 	  radius(0.3f),
 	  inner_radius(0.3f)
 {
@@ -15,17 +21,29 @@ VignetteEffect::VignetteEffect()
 	register_float("inner_radius", (float *)&inner_radius);
 }
 
-std::string VignetteEffect::output_fragment_shader()
+string VignetteEffect::output_fragment_shader()
 {
 	return read_file("vignette_effect.frag");
 }
 
-void VignetteEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void VignetteEffect::inform_input_size(unsigned input_num, unsigned width, unsigned height) {
+	assert(input_num == 0);
+	if (width >= height) {
+		aspect_correction = Point2D(float(width) / float(height), 1.0f);
+	} else {
+		aspect_correction = Point2D(1.0f, float(height) / float(width));
+	}
+}
+
+void VignetteEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
 	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
 	set_uniform_float(glsl_program_num, prefix, "pihalf_div_radius", 0.5 * M_PI / radius);
+	set_uniform_vec2(glsl_program_num, prefix, "aspect_correction", (float *)&aspect_correction);
 
-	Point2D aspect(16.0f / 9.0f, 1.0f);  // FIXME
-	set_uniform_vec2(glsl_program_num, prefix, "aspect_correction", (float *)&aspect);
+	Point2D flipped_center(center.x, 1.0f - center.y);
+	set_uniform_vec2(glsl_program_num, prefix, "flipped_center", (float *)&flipped_center);
 }
+
+}  // namespace movit