chill out cubemaps

[carveJwlIkooP6JGAAIwe30JlM.git] / shaders / model_character_view.fs

diff --git a/shaders/model_character_view.fs b/shaders/model_character_view.fs
index afeb78d40d9095964ec9848a64064a976dccd1a6..efee606c86b7b0151505dd268d258af035f9d8cd 100644 (file)
--- a/shaders/model_character_view.fs
+++ b/shaders/model_character_view.fs
@@ -3,6 +3,7 @@ uniform sampler2D uTexSceneDepth;
 uniform vec3 uCamera;
 uniform vec3 uInverseRatioDepth;
 uniform vec3 uInverseRatioMain;
+uniform bool uDepthCompare;
 
 in vec4 aColour;
 in vec2 aUv;
@@ -23,26 +24,29 @@ void main()
 {
    compute_motion_vectors();
 
-   vec3 qnorm     = normalize(floor(aNorm*2.0)*0.5) + vec3(0.001,0.0,0.0);
+   vec3 qnorm     = aNorm;
    vec3 diffuse   = texture( uTexMain, aUv ).rgb;
    vec3 composite = world_compute_lighting( diffuse, qnorm, aWorldCo, 1.0 );
 
    float dist    = distance( aWorldCo, uCamera ) - 0.08;
    float opacity = clamp( dist*dist, 0.0, 1.0 );
 
-   vec2 back_coord = gl_FragCoord.xy*uInverseRatioMain.xy*uInverseRatioDepth.xy;
-   float back_depth = texture( uTexSceneDepth, back_coord ).r;
-   float front_depth = gl_FragCoord.z/gl_FragCoord.w;
+   if( uDepthCompare ){
+      vec2 back_coord = gl_FragCoord.xy * uInverseRatioMain.xy 
+                                        * uInverseRatioDepth.xy;
+      float back_depth = texture( uTexSceneDepth, back_coord ).r;
+      float front_depth = gl_FragCoord.z/gl_FragCoord.w;
 
-   back_depth = linear_depth( back_depth, 0.1, 2100.0 );
-   float diff = back_depth - front_depth;
+      back_depth = linear_depth( back_depth, 0.1, 2100.0 );
+      float diff = back_depth - front_depth;
 
-   vec2 ssuv = gl_FragCoord.xy;
-   vec3 vDither = vec3( dot( vec2( 171.0, 231.0 ), ssuv) );
-   float dither = fract( vDither.g / 71.0 ) - 0.5;
+      vec2 ssuv = gl_FragCoord.xy;
+      vec3 vDither = vec3( dot( vec2( 171.0, 231.0 ), ssuv) );
+      float dither = fract( vDither.g / 71.0 ) - 0.5;
 
-   if( step(0.0,diff)+dither<0.3 )
-      discard;
+      if( step(0.0,diff)+dither<0.3 )
+         discard;
+   }
 
    oColour = vec4( composite, opacity );
 }