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

Timestamp:

11/27/08 02:14:31 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• antialiasing.cg (modified) (1 diff)
• combineSsao.cg (modified) (3 diffs)
• deferred.cg (modified) (1 diff)

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

@@ -76 +76 @@
 
         //const float de = saturate(dot(dd, weights.y));
-        const float de = weights.y * dd.x + dd.y + dd.z + dd.w;
+        const float de = weights.y * dd.x * dd.y * dd.z * dd.w;
 
 

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

@@ -130 +130 @@
                 spatialFactor = 1.0f / max(len, 1e-3f);
 
-                //normalFactor = max(step(0.6f, dot(sampleNorm, centerNormal)), 1e-3f);
-                normalFactor = max(dot(sampleNorm, samplePos), 1e-3f);
+                normalFactor = max(step(.0f, dot(sampleNorm, centerNormal)), 1e-3f);
+                //normalFactor = max(dot(sampleNorm, samplePos), 1e-3f);
                 //convergenceFactor = min(100.0f, aoSample.y);
                 convergenceFactor = aoSample.y;
@@ -137 +137 @@
                 // combine the weights
                 w = convergenceFactor * spatialFactor * normalFactor;
+                //w = convergenceFactor * spatialFactor;
 
                 average += aoSample.x * w;
@@ -169 +170 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        // reconstruct position from the eye space depth
-        /*const float4 worldPos = float4(-IN.view * eyeSpaceDepth, 1.0f);
-        // compute w factor from projection in order to control filter size
-        const float4 projPos = mul(modelViewProj, worldPos);
-        const float distanceScale = 1.0f / projPos.w;
-*/
-
         // filter up to a certain convergance value and leave out background (sky) by checking depth
         if ((ao.y < 100.0f) && (col.w < 1e10f))

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

@@ -290 +290 @@
         float validPixel;
 
-        if ((((squaredLen <= DYNAMIC_OBJECTS_THRESHOLD) && (oldPixel.z <= DYNAMIC_OBJECTS_THRESHOLD)) || 
-                (depthDif <= MIN_DEPTH_DIFF))
+        const bool oldDynamic = (squaredLen <= DYNAMIC_OBJECTS_THRESHOLD);
+        const bool newDynamic = (oldPixel.z <= DYNAMIC_OBJECTS_THRESHOLD);
+
+        if (!(oldDynamic && !newDynamic) && !(!oldDynamic && newDynamic) &&
+                !(oldDynamic && newDynamic && (depthDif > MIN_DEPTH_DIFF))
                 && (oldTexCoords.x >= 0.0f) && (oldTexCoords.x < 1.0f)
                 && (oldTexCoords.y >= 0.0f) && (oldTexCoords.y < 1.0f)