Fix major overstep with last commit

[carveJwlIkooP6JGAAIwe30JlM.git] / shaders / viewchar.fs

diff --git a/shaders/viewchar.fs b/shaders/viewchar.fs
index ffc969db347a2ca5d72796e4f504899c52e485fa..fedd3e1172721a0976c524b4572861298e75a62b 100644 (file)
--- a/shaders/viewchar.fs
+++ b/shaders/viewchar.fs
@@ -1,6 +1,7 @@
 out vec4 FragColor;
 
 uniform sampler2D uTexMain;
+uniform vec3 uCamera;
 
 in vec4 aColour;
 in vec2 aUv;
@@ -15,14 +16,18 @@ void main()
    vec3 vfrag = texture( uTexMain, aUv ).rgb;
 
    // Lighting
-   //vec3 halfview = uCamera - aWorldCo;
-   //float fdist = length( halfview );
-   //halfview /= fdist;
+   vec3 halfview = uCamera - aWorldCo;
+   float fdist = length( halfview );
+   halfview /= fdist;
 
-   //vfrag = do_light_diffuse( vfrag, aNorm );
-   //vfrag = do_light_spec( vfrag, aNorm, halfview, 0.1 );
-   //vfrag = do_light_shadowing( vfrag );
-   //vfrag = apply_fog( vfrag, fdist );
+   vec3 qnorm = normalize(floor(aNorm*2.0)*0.5) + vec3(0.001,0.0,0.0);
 
-   FragColor = vec4(aNorm,1.0);
+   vfrag = do_light_diffuse( vfrag, qnorm );
+   vfrag = do_light_spec( vfrag, qnorm, halfview, 0.1 );
+   vfrag = do_light_shadowing( vfrag );
+   vfrag = apply_fog( vfrag, fdist );
+
+   float opacity = clamp( fdist, 0.1, 1.0 );
+
+   FragColor = vec4(vfrag,opacity);
 }