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

Timestamp:

02/16/09 17:08:51 (15 years ago)

Author:

mattausch

Message:

reverted back to before poisson sampling scheme

File:

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

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

@@ -114 +114 @@
 }
 
+/** In between step that only filters in one direction
+*/
+pixel FilterSsaoFullRes(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));
+        // just take unfiltered convergence in current pixel
+        const float convergence = OUT.illum_col.y;
+
+        // filter reaches size 1 pixel when sample size reaches threshold 
+        // afterwards we do not use the filter anymore
+
+        float2 xyStep = float2(1.0f / res.x, 0);
+
+        // 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
@@ -151 +185 @@
 }
 
-
-/** In between step that only filters in one direction
-*/
-pixel FilterSsaoFullRes(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));
-        // just take unfiltered convergence in current pixel
-        const float convergence = OUT.illum_col.y;
-
-        // filter reaches size 1 pixel when sample size reaches threshold 
-        // afterwards we do not use the filter anymore
-
-        const float2 xyStep = float2(1.0f / res.x, 0);
-
-        // 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 
     depth and convergence aware discontinuity filter.