Make Input an abstract base class, and move the current functionality into FlatInput...

[movit] / vignette_effect.cpp

diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index 8fde1f7e3b33ae65ab94d76c3e4d875f0aece988..b3a6c04ed6678b2e167c39aeaacd6319143256ba 100644 (file)
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -17,14 +17,14 @@ VignetteEffect::VignetteEffect()
        register_float("inner_radius", (float *)&inner_radius);
 }
 
        register_float("inner_radius", (float *)&inner_radius);
 }
 

-std::string VignetteEffect::output_glsl()
+std::string VignetteEffect::output_fragment_shader()

 {
 {

-       return read_file("vignette_effect.glsl");
+       return read_file("vignette_effect.frag");

 }
 
 }
 

-void VignetteEffect::set_uniforms(GLuint glsl_program_num, const std::string &prefix)
+void VignetteEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)

 {
 {

-       Effect::set_uniforms(glsl_program_num, prefix);
+       Effect::set_gl_state(glsl_program_num, prefix, sampler_num);

 
        set_uniform_float(glsl_program_num, prefix, "inv_radius", 1.0f / radius);
 
 
        set_uniform_float(glsl_program_num, prefix, "inv_radius", 1.0f / radius);