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

Timestamp:

10/12/08 11:46:50 (16 years ago)

Author:

mattausch

Message:

worked on cg shader wrapper class

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/deferred.cg (modified) (4 diffs)

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

@@ -91 +91 @@
 float CalcShadowTerm(fragment IN,
                                          uniform sampler2D shadowMap,
-                                         uniform float w,
+                                         uniform float scale,
                                          uniform float2 lightSpacePos,
                                          uniform float depth,
                                          uniform float2 samples[NUM_PCF_TABS],
+                                         uniform float weights[NUM_PCF_TABS],
                                          uniform sampler2D noiseTexture
                                          )
@@ -101 +102 @@
         //return step(depth, shadowDepth);
 
-        float total_d = 0.0;
-        
+        float total_d = .0f;
+        float total_w = .0f;
+
         for (int i = 0; i < NUM_PCF_TABS; ++ i) 
         {
                 const float2 offset = samples[i];
+                const float w = weights[i];
 
 #if 1
@@ -117 +120 @@
 #endif
                 // weight with projected coordinate to reach similar kernel size for near and far
-                float2 texcoord = lightSpacePos + offsetTransformed * w;
+                float2 texcoord = lightSpacePos + offsetTransformed * scale;
 
                 float shadowDepth = tex2D(shadowMap, texcoord).x;
 
-                total_d += step(depth, shadowDepth);
+                total_d += w * step(depth, shadowDepth);
+                total_w += w;
         }
 
-        total_d /= (float)NUM_PCF_TABS;
+        total_d /= (float)total_w;
 
         return total_d;
 }
+
 
 inline float3 Interpol(float2 w, float3 bl, float3 br, float3 tl, float3 tr)
@@ -195 +200 @@
 
                 float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, weights, noiseTexture);
+                //float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, noiseTexture);
 
                 diffuse *= shadowTerm;