Changeset 3130

Timestamp:

11/17/08 08:47:04 (16 years ago)

Author:

mattausch

Message:

worked on reducing flickering
try: use box filter instead of poisson kernel for blurring + for blurring temporal coherence values
try: use full resolution offset texture or try linear interpol, otherwise strange effects

File:

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

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

@@ -87 +87 @@
 
                 //depthFactor = clamp(1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w), 1e-3f, 1.0f);
-                depthFactor = max(step(5e-2f, 1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w)), 1e-3f);
-                normalFactor = max(step(0.5f, dot(sampleNorm, norm)), 1e-3f);
+                depthFactor = max(step(5e-1f, 1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w)), 1e-3f);
+                normalFactor = max(step(0.6f, dot(sampleNorm, norm)), 1e-3f);
 
                 w = filterWeights[i] * normalFactor * depthFactor;
@@ -119 +119 @@
         if (col.w < 1e10f)
         {
-                //const static float scaleFactor = 50.0f;
-                const static float scaleFactor = 10.0f;
-                const static float adaptFactor = 10.0f;
+                const static float scaleFactor = 1.0f;
+                //const static float scaleFactor = 10.0f;
+                const static float adaptFactor = 50.0f;
 
                 //ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
                 //ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights, 1.0f / (1.0f + ao.y));
-                //ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, scaleFactor / (scaleFactor + ao.y));
-                ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, adaptFactor * scaleFactor * ao.z  / (adaptFactor + ao.y), 0);
-        }
-
-        OUT.illum_col.xyz = col.xyz * ao.x;
+                //ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, adaptFactor * scaleFactor * ao.z  / (adaptFactor + ao.y), 0);
+                ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, adaptFactor * scaleFactor  / (adaptFactor + ao.y), 0);
+        }
+
+        //OUT.illum_col.xyz = col.xyz * ao.x;
         //OUT.illum_col = float4(ao.x, ao.x, ao.x, col.w);
-        //OUT.illum_col.xyz = float3(1.0f - ao.x, 1.0f - ao.y * 1e-2f, 1);
+        OUT.illum_col.xyz = float3(1.0f - ao.x, clamp(1.0f - ao.y * 1e-2f, 0, 1), 1);
         OUT.illum_col.w = col.w;
 
@@ -168 +168 @@
                 //depthFactor = clamp(1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w), 1e-3f, 1.0f);
                 depthFactor = max(step(5e-1f, 1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w)), 1e-3f);
-                normalFactor = max(step(0.3f, dot(sampleNorm, norm)), 1e-3f);
+                normalFactor = max(step(0.6f, dot(sampleNorm, norm)), 1e-3f);
 
                 //w = filterWeights[i] * normalFactor * depthFactor;
@@ -196 +196 @@
         const static float scaleFactor = 10.0f;
         ao.y = DiscontinuityFilter2(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, scaleFactor * ao.z, 1);
+        //ao.y = DiscontinuityFilter2(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, scaleFactor, 1);
         
         OUT.illum_col = ao;