Revert "Move calculation of normalized position for the vignette into the vertex...

This is not correct, since tc can be changed by the fragment shader
_and_ by later vertex shaders. We need to do some rethinking here,
seemingly.

This reverts commit 2b4a7d868112b4995bf6699f5b3aa68e9ec2b308.

diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index e1403100bc945489dedc521f826dc7fe666f912c..f1449aec6073313df76a5189a24ee547589dface 100644 (file)
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -17,11 +17,6 @@ VignetteEffect::VignetteEffect()
        register_float("inner_radius", (float *)&inner_radius);
 }
 
        register_float("inner_radius", (float *)&inner_radius);
 }
 

-std::string VignetteEffect::output_vertex_shader()
-{
-       return read_file("vignette_effect.vert");
-}
-

 std::string VignetteEffect::output_fragment_shader()
 {
        return read_file("vignette_effect.frag");
 std::string VignetteEffect::output_fragment_shader()
 {
        return read_file("vignette_effect.frag");

diff --git a/vignette_effect.frag b/vignette_effect.frag
index c7e1d6143785f2a5a484aadb7f955544945ebb6e..bc84516437685727301a7f512f0f9aba911cd724 100644 (file)
--- a/vignette_effect.frag
+++ b/vignette_effect.frag
@@ -1,14 +1,15 @@
 // A simple, circular vignette, with a cos² falloff.
        
 uniform float PREFIX(inv_radius);
 // A simple, circular vignette, with a cos² falloff.
        
 uniform float PREFIX(inv_radius);

-varying vec2 PREFIX(normalized_pos);
+uniform vec2 PREFIX(aspect_correction);

 
 vec4 FUNCNAME(vec2 tc) {
        vec4 x = LAST_INPUT(tc);
 
        const float pihalf = 0.5 * 3.14159265358979324;
 
 
 vec4 FUNCNAME(vec2 tc) {
        vec4 x = LAST_INPUT(tc);
 
        const float pihalf = 0.5 * 3.14159265358979324;
 

-       float dist = (length(PREFIX(normalized_pos)) - PREFIX(inner_radius)) * PREFIX(inv_radius);
+       vec2 normalized_pos = (tc - PREFIX(center)) * PREFIX(aspect_correction);
+       float dist = (length(normalized_pos) - PREFIX(inner_radius)) * PREFIX(inv_radius);

        float linear_falloff = clamp(dist, 0.0, 1.0) * pihalf;
        float falloff = cos(linear_falloff) * cos(linear_falloff);
        x.rgb *= vec3(falloff);
        float linear_falloff = clamp(dist, 0.0, 1.0) * pihalf;
        float falloff = cos(linear_falloff) * cos(linear_falloff);
        x.rgb *= vec3(falloff);

diff --git a/vignette_effect.h b/vignette_effect.h
index 1d75f7e63b11432677a6944e9d2bd2f89ccb296e..b8e0f68c7f1c5cfe16bc82fef2d9c5abcb9fd83f 100644 (file)
--- a/vignette_effect.h
+++ b/vignette_effect.h
@@ -6,7 +6,6 @@
 class VignetteEffect : public Effect {
 public:
        VignetteEffect();
 class VignetteEffect : public Effect {
 public:
        VignetteEffect();

-       std::string output_vertex_shader();

        std::string output_fragment_shader();
 
        void set_uniforms(GLuint glsl_program_num, const std::string &prefix);
        std::string output_fragment_shader();
 
        void set_uniforms(GLuint glsl_program_num, const std::string &prefix);

diff --git a/vignette_effect.vert b/vignette_effect.vert
deleted file mode 100644 (file)
index 44edeb8..0000000
--- a/vignette_effect.vert
+++ /dev/null
@@ -1,9 +0,0 @@
-uniform vec2 PREFIX(aspect_correction);
-varying vec2 PREFIX(normalized_pos);
-
-vec2 FUNCNAME()
-{
-       vec2 temp = LAST_INPUT();
-       PREFIX(normalized_pos) = (temp - PREFIX(center)) * PREFIX(aspect_correction);
-       return temp;
-}