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

Timestamp:

02/16/09 18:02:02 (15 years ago)

Author:

mattausch

Message:

reverted to old sampling scheme

File:

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

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

@@ -68 +68 @@
         //samplePos = ReconstructSamplePos(ssaoTex, sampleTexCoord.xy, bl, br, tl, tr);
 
-        float len = min(SqrLen(centerPos - samplePos), 1e2f);
+        //float len = min(SqrLen(centerPos - samplePos), 1e2f);
+        float len = distance(centerPos, samplePos);
         float spatialFactor = 1.0f / max(len, 1e-3f);
 
@@ -74 +75 @@
 
         // combine the weights
-        float w = convergenceFactor * convergenceFactor * spatialFactor;// * normalFactor;
+        //float w = convergenceFactor * convergenceFactor * spatialFactor;
+        float w = convergenceFactor * spatialFactor;
+        //float w = spatialFactor;
         float average = aoSample.x * w;
 
@@ -114 +117 @@
 }
 
+
+/** In between step that only filters in one direction
+*/
+pixel FilterSsaoHalfRes(fragment IN, 
+                                                uniform sampler2D colorsTex,
+                                                uniform sampler2D ssaoTex,
+                                                uniform float3 bl,
+                                                uniform float3 br,
+                                                uniform float3 tl,
+                                                uniform float3 tr,
+                                                uniform float2 res
+                                                 )
+{
+        pixel OUT;
+
+        const float depth = tex2Dlod(colorsTex, float4(IN.texCoord, 0, 0)).w;
+
+        OUT.illum_col = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
+        // compute minimal convergence for savetly reasons, write it out
+        const float convergence = ComputeConvergenceHalfRes(ssaoTex, IN.texCoord, res * 0.5f);
+        OUT.illum_col.y = convergence;
+
+        const float2 xyStep = float2(1.0f / res.x, 0);
+
+        // filter reaches size 1 pixel when sample size reaches threshold 
+        // afterwards we do not use the filter anymore
+
+        // filter up to a certain convergance value and leave out background (sky) by checking depth
+        if ((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);
+        }
+
+        return OUT;
+}
+
 /** In between step that only filters in one direction
 */
@@ -149 +189 @@
 }
 
-/** In between step that only filters in one direction
-*/
-pixel FilterSsaoHalfRes(fragment IN, 
-                                                uniform sampler2D colorsTex,
-                                                uniform sampler2D ssaoTex,
-                                                uniform float3 bl,
-                                                uniform float3 br,
-                                                uniform float3 tl,
-                                                uniform float3 tr,
-                                                uniform float2 res
-                                                 )
-{
-        pixel OUT;
-
-        const float depth = tex2Dlod(colorsTex, float4(IN.texCoord, 0, 0)).w;
-
-        OUT.illum_col = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
-        // compute minimal convergence for savetly reasons, write it out
-        const float convergence = ComputeConvergenceHalfRes(ssaoTex, IN.texCoord, res * 0.5f);
-        OUT.illum_col.y = convergence;
-
-        const float2 xyStep = float2(1.0f / res.x, 0);
-
-        // filter reaches size 1 pixel when sample size reaches threshold 
-        // afterwards we do not use the filter anymore
-
-        // filter up to a certain convergance value and leave out background (sky) by checking depth
-        if ((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);
-        }
-
-        return OUT;
-}
 
 /** Function combining image and indirect illumination buffer using a 
@@ -223 +228 @@
         {
                 //OUT.illum_col.xyz = col.xyz * max(2e-2f, 1.0f - ao.x);
-                OUT.illum_col.xyz = max(2e-2f, 1.0f - ao.x);
+                OUT.illum_col.xyz = max(1e-3f, 1.0f - ao.x);
         }
         else