X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=sandbox_effect.cpp;h=1ec093d43fbda2fd9bb370f076f9fbd6aadb9c1a;hp=561048d416fd0241af4e4bac1c9edc34e9a4c1e3;hb=ddf71f853e64c3912eed4ab98bfe7503826ce8e1;hpb=ab636361e865c389fe60584562372ec39ac4c511

diff --git a/sandbox_effect.cpp b/sandbox_effect.cpp
index 561048d..1ec093d 100644
--- a/sandbox_effect.cpp
+++ b/sandbox_effect.cpp
@@ -1,9 +1,11 @@
-#include <math.h>
-#include <assert.h>
+#include <epoxy/gl.h>
 
 #include "sandbox_effect.h"
 #include "util.h"
-#include "opengl.h"
+
+using namespace std;
+
+namespace movit {
 
 SandboxEffect::SandboxEffect()
 	: parm(0.0f)
@@ -11,14 +13,16 @@ SandboxEffect::SandboxEffect()
 	register_float("parm", &parm);
 }
 
-std::string SandboxEffect::output_fragment_shader()
+string SandboxEffect::output_fragment_shader()
 {
 	return read_file("sandbox_effect.frag");
 }
 
-void SandboxEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void SandboxEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
 	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
 	// Any OpenGL state you might want to set, goes here.
 }
+
+}  // namespace movit