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

Timestamp:

09/15/08 01:43:13 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -35 +35 @@
                          uniform float amb)
 {
-        float4 lightDir = float4(0.8f, -1.0f, 0.7f, 0.0f);
-        //float4 lightDir = float4(0.0f, 1.0f, 0.0f, 0.0f);
+        const float4 lightDir = float4(0.8f, -1.0f, 0.7f, 0.0f);
+        const float3 light = normalize(lightDir.xyz);
+        const float diffuseLight = saturate(dot(normal, light));
+        
+        /*
         float4 lightDir2 = float4(-0.5f, 0.5f, 0.4f, 0.0f);
+        float3 light2 = normalize(lightDir2.xyz);
+        float diffuseLight2 = saturate(dot(normal, light2));
+*/
+        float diffuse = diffuseLight;// + diffuseLight2;
 
         // global ambient
         const float4 ambient = 0.25f;
-
-        // float3 L = normalize(lightPosition - position);
-        float3 light = normalize(lightDir.xyz);
-        float3 light2 = normalize(lightDir2.xyz);
-
-        float diffuseLight = saturate(dot(normal, light));
-        float diffuseLight2 = saturate(dot(normal, light2));
-
-        float diffuse = diffuseLight + diffuseLight2;
+        //const float4 ambient = 0.0f;
 
         return (ambient + diffuse) * color * (1.0f - amb) + amb * color;
@@ -73 +72 @@
         float amb = norm.w;
 
-        // expand normal
-        float3 normal = normalize(norm.xyz);// * 2.0f - float4(1.0f));
+        float3 normal = normalize(norm.xyz);
 
         float4 col = shade(IN, color, position, normal, amb);
@@ -95 +93 @@
                                          )
 {
-        float s;
-
         float total_d = 0.0;
-        //float total_d = tex2D(shadowMap, lightSpacePos).x;
 
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
@@ -118 +113 @@
                 float shadowDepth = tex2D(shadowMap, texcoord).x;
 
-                total_d += step(shadowDepth, depth);
-                //total_d += length(offsetTransformed);
+                total_d += step(depth, shadowDepth);
         }
 
@@ -199 +193 @@
         
         /*
-
+        // hard shadows
         float shadowDepth = tex2D(shadowMap, lightSpacePos.xy).x;
 
@@ -212 +206 @@
         return OUT;
 }
+
 #else
+
 
 pixel main_shadow(fragment IN, 
@@ -231 +227 @@
         float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
         float4 position = tex2D(positions, IN.texCoord.xy);
-
-
-        // an ambient color term
-        float amb = norm.w;
-
-        float3 normal = normalize(norm.xyz);
-        float4 col = shade(IN, color, position, normal, amb);
-        
-        position *= maxDepth;
-        position.w = 1.0f;
-        
-        float4 lightSpacePos = mul(shadowMatrix, position);
-        lightSpacePos /= lightSpacePos.w;
-
-        OUT.color = col;
-
-        float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, noiseTexture);
-
-        if (amb < 0.9f) // hack: prevent shadowing the sky      
-        {
-                // base lighting
-                const float baseLighting = 0.3f;
-                OUT.color *= baseLighting + (1.0f - baseLighting) * (1.0f - shadowTerm);
-        }
-        
+        
+        const float3 normal = normalize(norm.xyz);
+        const float3 lightDir = normalize(float3(0.8f, -1.0f, 0.7f));
+
+        // hack: an emmisive color term
+        float emmisive = norm.w;
+
+        // diffuse intensity
+        const float angle = saturate(dot(normal, lightDir)); 
+        float diffuse = angle;
+
+        // calc diffuse illumination + shadow term
+        if ((emmisive < 0.95f) // hack: prevent shadowing the sky       
+                && (angle > 1e-3f)
+                )
+        {
+                position *= maxDepth;
+                position.w = 1.0f;
+
+                float4 lightSpacePos = mul(shadowMatrix, position);
+                lightSpacePos /= lightSpacePos.w;
+
+                float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, noiseTexture);
+
+                diffuse *= shadowTerm;
+        }
+
+        // global ambient
+        const float4 ambient = 0.25f;
+        
+        // base lighting
+        OUT.color = (ambient + diffuse) * color * (1.0f - emmisive) + emmisive * color;
+
         // also write out depth component
         OUT.color.w = color.w;