Changeset 2893 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Timestamp:

09/02/08 00:56:48 (16 years ago)

Author:

mattausch

Message:

shadowing partly working

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Files:

• deferred.cg (modified) (3 diffs)
• ssao.cg (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/deferred.cg

@@ -80 +80 @@
                                   uniform sampler2D normals,               
                                   uniform sampler2D shadowMap,
-                                  uniform float4x4 shadowMatrix
+                                  uniform float4x4 shadowMatrix,
+                                  uniform float maxDepth
                                   )
 {
@@ -89 +90 @@
         float4 position = tex2D(positions, IN.texCoord.xy);
 
-        float4 lightSpacePos = mul(shadowMatrix, position);
-
-        float shadowDepth = tex2D(shadowMap, IN.texCoord.xy);
 
         // an ambient color term
@@ -99 +97 @@
         float4 col = shade(IN, color, position, normal, amb);
         
+        position *= maxDepth;
+        position.w = 1.0f;
+        
+        float4 lightSpacePos = mul(shadowMatrix, position);
+
+        float shadowDepth = tex2D(shadowMap, lightSpacePos.xy);
+
         OUT.color = col;
         
-        if (lightSpacePos.z / lightSpacePos.w < shadowDepth)
+        // hack: prevent shadowing the sky
+        if ((amb < 0.9) &&      
+                (lightSpacePos.z / lightSpacePos.w > shadowDepth))
         {
                 OUT.color *= 0.1f;
         }
         
-        //OUT.color = float4(lightSpacePos.z / lightSpacePos.w);
+        //OUT.color = lightSpacePos;//float4(lightSpacePos.z / lightSpacePos.w);
         //OUT.color = float4(shadowDepth);
         OUT.color.w = color.w;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/ssao.cg

@@ -71 +71 @@
                 float2 texcoord = IN.texCoord.xy + offsetTransformed * AREA_SIZE * w;
 
+                //if ((texcoord.x <= 1.0f) || (texcoord.x >= 0.0f) || (texcoord.y <= 1.0f) || (texcoord.y >= 0.0f))
+                
                 // sample downsampled texture in order to speed up texture accesses
                 float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, 1)).xyz;