Changeset 3303 for GTP/trunk

Timestamp:

02/12/09 10:15:57 (16 years ago)

Author:

mattausch

Message:

filter working fine!

Location:

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

Files:

• combineSsaoSep.cg (modified) (2 diffs)
• ssao.cg (modified) (1 diff)

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

@@ -96 +96 @@
         const float depth = tex2Dlod(colorsTex, float4(IN.texCoord, 0, 0)).w;
 
-        OUT.illum_col = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0)).y;
+        OUT.illum_col = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
         // just take unfiltered convergence in current pixel
         const float convergence = OUT.illum_col.y;
@@ -104 +104 @@
 
         // filter up to a certain convergance value and leave out background (sky) by checking depth
-        if (1)//(convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < 1e10f))
+        if ((convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < 1e10f))
         {
                 // the filtered ssao value

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

@@ -246 +246 @@
                 //-- (affects performance for some reason!)
 
-                if (convergence < 700)
+                if (convergence < SSAO_CONVERGENCE_THRESHOLD)
                 {
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;