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

Timestamp:

09/17/08 19:35:11 (16 years ago)

Author:

mattausch

Message:

implemented sun color

File:

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

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

@@ -36 +36 @@
                          float3 lightDir)
 {
-        const float diffuseLight = saturate(dot(normal, lightDir));
-        
         /*
         float4 lightDir2 = float4(-0.5f, 0.5f, 0.4f, 0.0f);
@@ -43 +41 @@
         float diffuseLight2 = saturate(dot(normal, light2));
 */
-        float diffuse = diffuseLight;// + diffuseLight2;
+        // diffuse intensity
+        const float angle = saturate(dot(normal, lightDir)); 
+        
+        float4 lightDiffuse = glstate.light[0].diffuse;
+        float4 diffuse = angle * lightDiffuse;
 
         // global ambient
-        const float4 ambient = 0.25f;
-        //const float4 ambient = 0.0f;
-
+        const float4 ambient = glstate.light[0].ambient;
+        
         return (ambient + diffuse) * color * (1.0f - amb) + amb * color;
 }
@@ -76 +77 @@
         float4 col = shade(IN, color, position, normal, amb, lightDir);
         
-        //OUT.color = float4(1.0f);
         OUT.color = col;
         OUT.color.w = color.w;
@@ -93 +93 @@
                                          )
 {
+        //float shadowDepth = tex2D(shadowMap, lightSpacePos).x;
+        //return step(depth, shadowDepth);
+
         float total_d = 0.0;
-
+        
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
@@ -120 +123 @@
         return total_d;
 }
-
-
-#if 0
-/** The mrt shader for standard rendering
-*/
-pixel main_shadow(fragment IN, 
-                                  uniform sampler2D colors,
-                                  uniform sampler2D positions,
-                                  uniform sampler2D normals,               
-                                  uniform sampler2D shadowMap,
-                                  uniform float4x4 shadowMatrix,
-                                  uniform float maxDepth,
-                                  uniform float sampleWidth,
-                                  uniform float3 lightDir
-                                  )
-{
-        pixel OUT;
-
-        float4 norm = tex2D(normals, IN.texCoord.xy);
-        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 shadowDepth[9];
-
-        float w = sampleWidth;
-
-        // pcf sampling using 3 x 3 tab
-        shadowDepth[0] = tex2D(shadowMap, lightSpacePos.xy).x;
-        
-        shadowDepth[1] = tex2D(shadowMap, lightSpacePos.xy + float2( w,  w)).x;
-        shadowDepth[2] = tex2D(shadowMap, lightSpacePos.xy + float2( w, -w)).x;
-        shadowDepth[3] = tex2D(shadowMap, lightSpacePos.xy + float2(-w, -w)).x;
-        shadowDepth[4] = tex2D(shadowMap, lightSpacePos.xy + float2(-w,  w)).x;
-
-        shadowDepth[5] = tex2D(shadowMap, lightSpacePos.xy + float2( w,  0)).x;
-        shadowDepth[6] = tex2D(shadowMap, lightSpacePos.xy + float2( 0,  w)).x;
-        shadowDepth[7] = tex2D(shadowMap, lightSpacePos.xy + float2(-w,  0)).x;
-        shadowDepth[8] = tex2D(shadowMap, lightSpacePos.xy + float2( 0, -w)).x;
-
-        
-        float depth = lightSpacePos.z;
-
-        float d = 0.0f;
-
-        for (int i = 0; i < 9; ++ i)
-        {
-                d += step(shadowDepth[i], depth);
-        }
-
-        d /= 9.0f;
-        
-        if (amb < 0.9f) // hack: prevent shadowing the sky      
-        {
-                // base lighting
-                const float x = 0.4f;
-                OUT.color *= x + (1.0f - x) * (1.0f - d);
-        }
-        
-        /*
-        // hard shadows
-        float shadowDepth = tex2D(shadowMap, lightSpacePos.xy).x;
-
-        if ((amb < 0.9f) && // hack: prevent shadowing the sky  
-                (lightSpacePos.z > shadowDepth))
-        {
-                OUT.color *= 0.1f;
-        }*/
-
-        OUT.color.w = color.w;
-
-        return OUT;
-}
-
-#else
 
 
@@ -237 +151 @@
         // diffuse intensity
         const float angle = saturate(dot(normal, lightDir)); 
-        float diffuse = angle;
+        //float4 lightDiffuse = float4(1.0f, 1.0f, 0.9f, 1.0f);
+        float4 lightDiffuse = glstate.light[0].diffuse;
+        //float4(1.0f, 1.0f, 0.9f, 1.0f);
+
+        float4 diffuse = lightDiffuse * angle;
 
         // calc diffuse illumination + shadow term
@@ -256 +174 @@
 
         // global ambient
-        const float4 ambient = 0.25f;
+        //const float4 ambient = 0.25f;
+        const float4 ambient = glstate.light[0].ambient;
         
         // base lighting
@@ -266 +185 @@
         return OUT;
 }
-
-#endif