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

diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index 0f5c688..d8b4f9b 100644
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -1,9 +1,14 @@
-#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),
@@ -16,7 +21,7 @@ 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");
 }
@@ -30,7 +35,7 @@ void VignetteEffect::inform_input_size(unsigned input_num, unsigned width, unsig
 	}
 }
 
-void VignetteEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+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);
 
@@ -40,3 +45,5 @@ void VignetteEffect::set_gl_state(GLuint glsl_program_num, const std::string &pr
 	Point2D flipped_center(center.x, 1.0f - center.y);
 	set_uniform_vec2(glsl_program_num, prefix, "flipped_center", (float *)&flipped_center);
 }
+
+}  // namespace movit