Changeset 3363 for GTP/trunk

Timestamp:

04/27/09 18:58:18 (16 years ago)

Author:

mattausch

Message:

still having ugly artifacts because of missed disocclusions

Location:

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

Files:

• shaderenv.h (modified) (1 diff)
• shaders/combineSsaoSep.cg (modified) (3 diffs)

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

@@ -13 +13 @@
 //#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
-#define NUM_SAMPLES 32
-//#define NUM_SAMPLES 48
+//#define NUM_SAMPLES 32
+#define NUM_SAMPLES 48
 
+#define MIN_SAMPLES 8
 //#define MIN_SAMPLES 48
-#define MIN_SAMPLES 8
 
 #define DISTANCE_SCALE 1e-2f

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

@@ -110 +110 @@
         const float3 centerPos = ReconstructSamplePos(colorsTex, texCoord, bl, br, tl, tr);
 
-#if 0
+#if 1
         //const float scale = saturate((SSAO_CONVERGENCE_THRESHOLD - convergence + 100) / SSAO_CONVERGENCE_THRESHOLD);
         const float scale = saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
         
-        //for (int i = -SSAO_FILTER_RADIUS; i <= SSAO_FILTER_RADIUS; ++ i)
+        for (int i = -SSAO_FILTER_RADIUS; i <= SSAO_FILTER_RADIUS; ++ i)
         {
                 const float4 sampleTexCoord = float4(texCoord + i * xyStep * scale, .0f, .0f);
@@ -121 +121 @@
 #else
 
-        const int radius = SSAO_FILTER_RADIUS * saturate((SSAO_CONVERGENCE_THRESHOLD - convergence + 100) / SSAO_CONVERGENCE_THRESHOLD);
+        const float radius = SSAO_FILTER_RADIUS * saturate((SSAO_CONVERGENCE_THRESHOLD - convergence + 100) / SSAO_CONVERGENCE_THRESHOLD);
 
         for (int i = -radius; i <= radius; ++ i)
@@ -205 +205 @@
 
         // filter up to a certain convergance value and leave out background (sky) by checking depth
-        if ((!USE_OPTIMIZATION || convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < DEPTH_THRESHOLD))
+        if ((!USE_OPTIMIZATION || convergence < SSAO_CONVERGENCE_THRESHOLD) && 
+                (depth < DEPTH_THRESHOLD))
         {
                 // the filtered ssao value