Changeset 420 for branches/thune/thread_safe/gl/data/shader/clsmap.gx

Timestamp:

06/30/07 08:14:01 (17 months ago)

Author:

krobillard

Message:

Thune GL - Added 'image & mouse button words. Fixes to specular model shaders.

Files:

• branches/thune/thread_safe/gl/data/shader/clsmap.gx (modified) (1 diff)

branches/thune/thread_safe/gl/data/shader/clsmap.gx

@@ -36 +36 @@
     vec3 n, col;
     vec4 texel, lumi;
-    float intensity, shadow, NdotHV;
+    float intensity, shade, NdotHV;
 
         lumi = texture2D(lmap, gl_TexCoord[0].st);
         n = normalize(normal);
-    shadow = shadow2DProj(smap, gl_TexCoord[1]).r;
-    intensity = max( min(shadow, dot(lightDir, n)), lumi.r);
+    shade = shadow2DProj(smap, gl_TexCoord[1]).r;
+    shade = min(shade, dot(lightDir, n));
+    intensity = max( shade, lumi.r);
 
     texel = texture2D(cmap, gl_TexCoord[0].st);
-    col = texel.rgb * (intensity + gl_LightSource[0].ambient.rgb);
+    col = texel.rgb *
+          (max(intensity * gl_LightSource[0].diffuse.rgb, lumi.r) +
+           gl_LightSource[0].ambient.rgb);
 
-        if( intensity > 0.0 )
+        if( shade > 0.0 )
         {
                 NdotHV = max(dot(normalize(halfVector), n), 0.0);