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

Timestamp:

04/24/09 18:00:06 (15 years ago)

Author:

mattausch

Message:

cleaned up algorithm

File:

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

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

@@ -105 +105 @@
                            )
 {
-        float2 result = float2(0.0f, 0.0f);
+        //return tex2Dlod(ssaoTex, float4(texCoord, .0f, .0f)).x;
+        float2 result = float2(.0f);
         
         const float3 centerPos = ReconstructSamplePos(colorsTex, texCoord, bl, br, tl, tr);
 
+#if 0
+        //const float scale = saturate((SSAO_CONVERGENCE_THRESHOLD - convergence + 100) / SSAO_CONVERGENCE_THRESHOLD);
         const float scale = saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
-        //const int radius = SSAO_FILTER_RADIUS * saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
         
-        //for (int i = -radius; i <= radius; ++ i)
-        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);
                 result += FilterSample(sampleTexCoord, ssaoTex, colorsTex, centerPos, bl, br, tl, tr, maxConvergence, spatialWeight);
         }
-
+#else
+
+        const int radius = SSAO_FILTER_RADIUS * saturate((SSAO_CONVERGENCE_THRESHOLD - convergence + 100) / SSAO_CONVERGENCE_THRESHOLD);
+
+        for (int i = -radius; i <= radius; ++ i)
+        {
+                const float4 sampleTexCoord = float4(texCoord + i * xyStep, .0f, .0f);
+                result += FilterSample(sampleTexCoord, ssaoTex, colorsTex, centerPos, bl, br, tl, tr, maxConvergence, spatialWeight);
+        }
+
+#endif
         result.x /= max(result.y, 1e-6f);
         return saturate(result.x);
@@ -133 +144 @@
                                                 uniform float3 tl,
                                                 uniform float3 tr,
-                                                uniform float2 res
+                                                uniform float2 res,
+                                                uniform float maxConvergence,
+                                                uniform float spatialWeight
+
                                                  )
 {
@@ -151 +165 @@
 
         // filter up to a certain convergance value and leave out background (sky) by checking depth
-        if ((convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < DEPTH_THRESHOLD))
+        if ((!USE_OPTIMIZATION || (convergence < SSAO_CONVERGENCE_THRESHOLD)) && 
+                (depth < DEPTH_THRESHOLD))
         {
                 // the filtered ssao value
-                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, 
+                                               bl, br, tl, tr, xyStep, 
+                                                                   convergence, maxConvergence, spatialWeight);
         }
 
@@ -185 +202 @@
         // afterwards we do not use the filter anymore
 
-        float2 xyStep = float2(1.0f / res.x, 0);
+        float2 xyStep = float2(1.0f / res.x, .0f);
 
         // filter up to a certain convergance value and leave out background (sky) by checking depth
-        if ((convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < DEPTH_THRESHOLD))
+        if ((!USE_OPTIMIZATION || convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < DEPTH_THRESHOLD))
         {
                 // the filtered ssao value
-                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, 
+                                               bl, br, tl, tr, xyStep, 
+                                                                   convergence, maxConvergence, spatialWeight);
         }
 
@@ -228 +247 @@
 
         // filter up to a certain convergance value and leave out background (sky) by checking depth
-        if ((convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < DEPTH_THRESHOLD))
+        if ((!USE_OPTIMIZATION || (convergence < SSAO_CONVERGENCE_THRESHOLD)) 
+                && (depth < DEPTH_THRESHOLD))
         {
                 // the filtered ssao value