Remove the finalize() member function from Input.

[movit] / vignette_effect.h

diff --git a/vignette_effect.h b/vignette_effect.h
index 2567e83c38844be7415a2428da01d1a4895dc93a..4501ebea45978846a12d8b868b0f7a746c643b63 100644 (file)
--- a/vignette_effect.h
+++ b/vignette_effect.h
@@ -1,23 +1,29 @@
-#ifndef _VIGNETTE_EFFECT_H
-#define _VIGNETTE_EFFECT_H 1
+#ifndef _MOVIT_VIGNETTE_EFFECT_H
+#define _MOVIT_VIGNETTE_EFFECT_H 1

 
 // A circular vignette, falling off as cos² of the distance from the center
 // (the classic formula for approximating a real lens).
 
 
 // A circular vignette, falling off as cos² of the distance from the center
 // (the classic formula for approximating a real lens).
 

+#include <GL/glew.h>
+#include <string>
+

 #include "effect.h"
 
 class VignetteEffect : public Effect {
 public:
        VignetteEffect();
 #include "effect.h"
 
 class VignetteEffect : public Effect {
 public:
        VignetteEffect();

+       virtual std::string effect_type_id() const { return "VignetteEffect"; }

        std::string output_fragment_shader();
 
        virtual bool needs_srgb_primaries() const { return false; }
        std::string output_fragment_shader();
 
        virtual bool needs_srgb_primaries() const { return false; }

+       virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; }

 
 

-       void set_uniforms(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
+       virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
+       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);

 
 private:
 
 private:

-       Point2D center;
+       Point2D center, aspect_correction;

        float radius, inner_radius;
 };
 
        float radius, inner_radius;
 };
 

-#endif // !defined(_VIGNETTE_EFFECT_H)
+#endif // !defined(_MOVIT_VIGNETTE_EFFECT_H)