Changeset 3143 for GTP/trunk/App/Demos/Vis

Timestamp:

11/19/08 02:35:37 (16 years ago)

Author:

mattausch

Message:

managed to remove halo by modifying depth / normal discontinuity filter

Location:

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

Files:

• DeferredRenderer.cpp (modified) (1 diff)
• shaderenv.h (modified) (1 diff)
• shaders/combineSsao.cg (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

@@ -447 +447 @@
         ///////////
 
-        const float filterWidth = 50.0f;
+        const float filterWidth = 100.0f;
+        //const float filterWidth = 1000.0f;
 
 #if 1

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -10 +10 @@
 
 // for quadratic falloff
-//#define SAMPLE_INTENSITY 0.1f
+//#define SAMPLE_INTENSITY 0.2f
 #define SAMPLE_INTENSITY 0.07f
 //#define SAMPLE_INTENSITY 0.015f

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

@@ -105 +105 @@
                 sampleTexCoord = float4(texCoord + filterOffs[i] * scale, 0, 0);
 
-
                 aoSample = tex2Dlod(ssaoTex, sampleTexCoord);
                 sampleNorm = normalize(tex2Dlod(normalsTex, sampleTexCoord).xyz);
@@ -117 +116 @@
                 //sampleDepth = aoSample.w;
                 //depthFactor = max(step(1e-1f, 1.0f - abs(1.0f - eyeSpaceDepth / sampleDepth)), 1e-3f);
-                depthFactor = max(1.0f - abs(1.0f - eyeSpaceDepth / sampleDepth), 1e-3f);
+                //depthFactor = max(1.0f - abs(1.0f - eyeSpaceDepth / sampleDepth), 1e-6f);
+                //depthFactor = max(1.0f - abs(1.0f - eyeSpaceDepth / sampleDepth), 1e-6f);
+
+                depthFactor = 1.0f / max(abs(eyeSpaceDepth - sampleDepth), 1e-3f);
 #endif
-                //normalFactor = max(step(0.9f, dot(sampleNorm, centerNormal)), 1e-3f);
-                normalFactor = max(dot(sampleNorm, centerNormal), 1e-3f);
-                convergenceFactor = min(1000.0f, aoSample.y) * 0.01f;//max(step(18.5f, aoSample.y), 1e-3f);
+                //normalFactor = max(step(0.6f, dot(sampleNorm, centerNormal)), 1e-6f);
+                normalFactor = max(dot(sampleNorm, centerNormal), 1e-6f);
+                convergenceFactor = min(200.0f, aoSample.y) * 0.01f;//max(step(18.5f, aoSample.y), 1e-3f);
 
                 //w = filterWeights[i] * normalFactor * depthFactor * convergenceFactor;
-                w = normalFactor * depthFactor * convergenceFactor;
+                //w = 1000.0f * normalFactor * depthFactor;// * convergenceFactor;
+                //w = normalFactor;
+                w = depthFactor * normalFactor * convergenceFactor;
                 //w = filterWeights[i] * normalFactor * converganceFactor;
                 //w = filterWeights[i] * normalFactor * depthFactor;
@@ -130 +134 @@
 
                 average += aoSample.x * w;
+                //average += aoSample.x;
                 total_w += w;
         }
 
-        average *= 1.0f / max(total_w, 1e-1f);
-
-        return saturate(average);
+        average /= max(total_w, 1e-1f);
+        //average /= NUM_SSAO_FILTERSAMPLES;
+
+        return saturate(average );
 }
 
@@ -161 +167 @@
                 const float scaleFactor = 1.0f;
                 const float adaptFactor = 10.0f;
+                //const float adaptFactor = 500000.0f;
 
                 //ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
@@ -168 +175 @@
 
                 const float scale =     adaptFactor * scaleFactor * ao.z  / (adaptFactor + ao.y);
-
+                //const float scale = scaleFactor * ao.z;
+                
                 ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, scale, bl, br, tl, tr);
                 //if (ao.y < 50.5f) ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, ao.z, bl, br, tl, tr);