Makefile should now be in .gitignore.

[movit] / sandbox_effect.cpp

diff --git a/sandbox_effect.cpp b/sandbox_effect.cpp
index 85fa9001589a7356855acfcfdbc3d3fcadecd870..6aafb74d2b5f543cfcd98f4cd0311e0b39ebfb00 100644 (file)
--- a/sandbox_effect.cpp
+++ b/sandbox_effect.cpp
@@ -1,9 +1,4 @@
-#define GL_GLEXT_PROTOTYPES 1
-
-#include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
-#include <assert.h>
+#include <GL/glew.h>
 
 #include "sandbox_effect.h"
 #include "util.h"
@@ -19,9 +14,9 @@ std::string SandboxEffect::output_fragment_shader()
        return read_file("sandbox_effect.frag");
 }
 
-void SandboxEffect::set_uniforms(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void SandboxEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
 {
-       Effect::set_uniforms(glsl_program_num, prefix, sampler_num);
+       Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
        // Any OpenGL state you might want to set, goes here.
 }