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

Timestamp:

04/14/09 08:59:19 (15 years ago)

Author:

mattausch

Message:

implemented ssao for diffuse illumination

File:

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

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

@@ -24 +24 @@
                          uniform float4 color,
                          uniform float3 normal,
-                         float3 lightDir)
+                         float3 lightDir,
+                         float4 ao)
 {
         // diffuse intensity
@@ -44 +45 @@
         else 
         {
-                outColor = (ambient + diffuse) * color;
+                outColor = (ambient * ao + diffuse) * color;
+                //outColor = ambient + diffuse * color;
         }
 
@@ -57 +59 @@
                    uniform sampler2D colors,
                    uniform sampler2D normals,
-                   uniform float3 lightDir
+                   uniform float3 lightDir,
+                   uniform sampler2D aoTex
                    )
 {
@@ -64 +67 @@
         float4 norm = tex2D(normals, IN.texCoord);
         float4 color = tex2Dlod(colors, float4(IN.texCoord, 0, 0));
+        float4 ao = tex2Dlod(aoTex, float4(IN.texCoord, 0, 0));
         
         float3 normal = normalize(norm.xyz);
-        float4 col = shade(IN, color, normal, lightDir);
+        float4 col = shade(IN, color, normal, lightDir, ao);
         
         OUT.color = col;
-        // store scaled view vector so wie don't have to normalize for e.g., ssao
+        // store scaled view vector so wie don't have to normalize for later
         //OUT.color.w = color.w / length(IN.view);
         OUT.color.w = color.w;
@@ -172 +176 @@
 
                 float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, 
-                                                      lightSpacePos.xy, lightSpacePos.z, samples, weights, noiseTex);
+                                                      lightSpacePos.xy, lightSpacePos.z, samples, 
+                                                                                  weights, noiseTex);
                 diffuse *= shadowTerm;
         }