Changeset 3195 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/combineSsao.cg

Timestamp:

11/29/08 18:24:53 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -68 +68 @@
                 normalFactor = max(dot(sampleNorm, centerNormal), 1e-3f);
                 //convergenceFactor = min(100.0f, aoSample.y);
-                convergenceFactor = aoSample.y;
+                convergenceFactor = aoSample.y + 1.0f;
 
                 // combine the weights
@@ -133 +133 @@
                 //samplePos = ReconstructSamplePos(ssaoTex, sampleTexCoord.xy, bl, br, tl, tr);
 
-                len = min(SqrLen(centerPos - samplePos), 1e3f);
+                len = min(SqrLen(centerPos - samplePos), 1e2f);
 
                 spatialFactor = 1.0f / max(len, 1e-3f);
 
-                normalFactor = max(step(.01f, dot(sampleNorm, centerNormal)), 1e-3f);
+                //normalFactor = max(step(.0f, dot(sampleNorm, centerNormal)), 1e-2f);
                 //normalFactor = max(dot(sampleNorm, samplePos), 1e-3f);
-                convergenceFactor = min(convergenceThresh, aoSample.y + 1);
+                convergenceFactor = aoSample.y + 1.0f;
+                //convergenceFactor = max(step(0.5f + NUM_SAMPLES, aoSample.y), 1e-2f);
                 //convergenceFactor = aoSample.y;
 
                 // combine the weights
-                w = convergenceFactor * spatialFactor * normalFactor;
+                w = convergenceFactor * convergenceFactor * spatialFactor;// * normalFactor;
                 //w = spatialFactor * normalFactor;
 
@@ -177 +178 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
+        float4 dummy;
+        const float xoffs = .5f / 1024.0f;
+        const float yoffs = .5f / 768.0f;
+
+        dummy.x = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(xoffs, 0), 0, 0)).y;
+        dummy.y = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(0, yoffs), 0, 0)).y;
+        dummy.z = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(-xoffs, 0), 0, 0)).y;
+        dummy.w = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(0, -yoffs), 0, 0)).y;
+
+        const float convergence = min(min(dummy.x, dummy.y), min(dummy.z, dummy.w));
+        //const float convergence = max(max(dummy.x, dummy.y), max(dummy.z, dummy.w));
+        //const float convergence = ao.y;
+
+        // filter reaches size 1 after thres samples
+        const float thres = 500.0f; 
+
         // filter up to a certain convergance value and leave out background (sky) by checking depth
-        if ((ao.y < 500.0f) && (col.w < 1e10f))
+        if ((convergence < thres) && (col.w < 1e10f))
         //if (col.w < 1e10f)
         {
@@ -185 +202 @@
                 const float distanceScale = 1.0f;
 
-                const float convergence = ao.y + 1;
-                const float convergenceScale = SSAO_CONVERGENCE_WEIGHT / (convergence + SSAO_CONVERGENCE_WEIGHT);
-
-                const float scale = NUM_SSAO_FILTER_WIDTH * convergenceScale * distanceScale;
+                const float convergenceWeight = thres / (SSAO_FILTER_WIDTH - 1.0f);
+                const float convergenceScale = convergenceWeight / (convergence + convergenceWeight);
+
+                const float scale = SSAO_FILTER_WIDTH * convergenceScale * distanceScale;
 
                 // the filtered ssao value
@@ -199 +216 @@
                 OUT.illum_col.xyz = col.xyz;
 
-        //OUT.illum_col.xyz = float3(ao.x, ao.x, ao.x);
-        //OUT.illum_col.xyz = float3(0, clamp(1.0f - ao.y * 1e-2f, 0, 1), 1);
+        OUT.illum_col.xyz = float3(ao.x, ao.x, ao.x);
+        //OUT.illum_col.xyz = float3(0, clamp(1.0f - ao.y * 1e-3f, 0, 1), 1);
+        //OUT.illum_col.xyz = float3(0, 1.0f - step(0.5f + NUM_SAMPLES, convergence), 1);
         OUT.illum_col.w = col.w;