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

Timestamp:

09/03/08 01:57:45 (16 years ago)

Author:

mattausch

Message:

improved shadow mapping

Location:

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

Files:

• globillum.cg (modified) (2 diffs)
• ssao.cg (modified) (3 diffs)

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

@@ -121 +121 @@
                    const uniform float4x4 oldModelViewProj,
                    uniform float maxDepth,
-                   uniform float expFactor
+                   uniform float temporalCoherence
                    )
 {
@@ -167 +167 @@
         const float depthDif = 1.0f - newDepth / oldDepth;
 
-
-        if ((tex.x >= 0.0f) && (tex.x < 1.0f) && 
+        float oldWeight = clamp(oldSsao.z, 0, temporalCoherence);
+        float newWeight;
+
+        if ((temporalCoherence > 0.0f) &&
+                (tex.x >= 0.0f) && (tex.x < 1.0f) && 
                 (tex.y >= 0.0f) && (tex.y < 1.0f) && 
                 (abs(depthDif)  < 1e-3f))
         {
-                OUT.ssao_col.x = new_color.w * expFactor + oldSsao.x * (1.0f - expFactor);
-                OUT.illum_col = new_color * expFactor + oldIllum * (1.0f - expFactor);
+                newWeight = oldWeight + 1;
+
+                //OUT.illum_col = (float4)ao * expFactor + oldCol.x * (1.0f - expFactor);
+                OUT.ssao_col.x = (new_color.w + oldSsao.x * oldWeight) / newWeight;
+                OUT.illum_col  = (new_color + oldIllum * oldWeight) / newWeight;
+
+                //OUT.ssao_col.x = new_color.w * expFactor + oldSsao.x * (1.0f - expFactor);
+                //OUT.illum_col = new_color * expFactor + oldIllum * (1.0f - expFactor);
         }
         else
         {
+                newWeight = 0;
+
                 OUT.ssao_col.x = new_color.w;
                 OUT.illum_col = new_color;
         }
 
+        OUT.ssao_col.z = newWeight;
         OUT.ssao_col.w = currentDepth;
 

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

@@ -114 +114 @@
                    const uniform float4x4 oldModelViewProj,
                    uniform float maxDepth,
-                   uniform float expFactor
+                   uniform float temporalCoherence
                    )
 {
@@ -157 +157 @@
         const float depthDif = 1.0f - newDepth / oldDepth;
 
-
-        if ((tex.x >= 0.0f) && (tex.x < 1.0f) && 
+        float oldWeight = clamp(oldCol.z, 0, temporalCoherence);
+        float newWeight;
+
+        if ((temporalCoherence > 0) &&
+                (tex.x >= 0.0f) && (tex.x < 1.0f) && 
                 (tex.y >= 0.0f) && (tex.y < 1.0f) && 
-                (abs(depthDif) < 1e-3f))
+                (abs(depthDif) < 1e-4f))
         {
-                OUT.illum_col = (float4)ao * expFactor + oldCol.x * (1.0f - expFactor);
+                newWeight = oldWeight + 1;
+
+                //OUT.illum_col = (float4)ao * expFactor + oldCol.x * (1.0f - expFactor);
+                OUT.illum_col = (float4)(ao + oldCol.x * oldWeight) / newWeight;
         }
         else
         {
                 OUT.illum_col = (float4)ao;
+                newWeight = 0;
         }
 
-        //OUT.illum_col.xyz = viewDir;
+
+        OUT.illum_col.z = newWeight;
         OUT.illum_col.w = currentDepth;
 
@@ -188 +196 @@
         //OUT.illum_col = ao;
 
+        //OUT.illum_col.z = ao.z;
         OUT.illum_col.w = ao.w;