Changeset 3362 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/ssao.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/ssao.cg (modified) (6 diffs)

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

@@ -205 +205 @@
                 //-- (affects performance for some reason!)
 
-                if (convergence < SSAO_CONVERGENCE_THRESHOLD)
+                if (!USE_OPTIMIZATION ||
+                        (convergence < SSAO_CONVERGENCE_THRESHOLD))
                 {
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
@@ -355 +356 @@
                 //-- (affects performance for some reason!)
 
-                if (convergence < SSAO_CONVERGENCE_THRESHOLD)
+                if (!USE_OPTIMIZATION ||
+                        (convergence < SSAO_CONVERGENCE_THRESHOLD))
                 {
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
@@ -493 +495 @@
                 //-- (affects performance for some reason!)
 
-                if (convergence < SSAO_CONVERGENCE_THRESHOLD)
+                if (!USE_OPTIMIZATION ||
+                        (convergence < SSAO_CONVERGENCE_THRESHOLD))
                 {
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
@@ -539 +542 @@
 
 
-#ifdef PERFORMANCE_TEST
+//#ifdef PERFORMANCE_TEST
+#if 1
                 // check if the samples have been valid in the last frame
                 // only mark sample as invalid if in the last / current frame
                 // they possibly have any influence on the ao
 
-                //const float pixelValid = sampleColor.x;
-                //const float pixelValid = length(sampleDiffVec - diffVec) < 1e-3f ? .0f : 10.0f;
-                //float pixelValid = max(sampleColor.x, length(sampleDiffVec - diffVec) < 1e-3f ? .0f : 10.0f);
-                float pixelValid = sampleColor.x;
-
-                if (pixelValid < 1)
-                {
-                        const float3 sampleDiffVec = tex2Dlod(attribsTex, float4(texcoord, .0f, .0f)).xyz;
-                        pixelValid = length(sampleDiffVec - diffVec) < 1e-3f ? .0f : 10.0f;
-                }
-
-                // hack:
-                // we check if the sample could have been near enough to the current pixel 
-                // or if the angle is small enough
-                // to have any influence in the current or last frame
-
-#if 1
-                const float changeFactor = sampleColor.y;
-                const float partlyResetThres = 1.0f;
-
-                if (0)//pixelValid <= partlyResetThres)
-                {
-                        const float tooFarAway = step(0.5f, lengthToSample - changeFactor);
-                        validSamples = max(validSamples, pixelValid * (1.0f - tooFarAway) * step(-0.1f, cosAngle));
-                }
-                else
-                {
-                        validSamples = max(validSamples, pixelValid);
-                }
-#endif
-
+                if (cosAngle > 0)
+                {
+                        float pixelValid = sampleColor.x;
+
+                        if (1)//pixelValid < 0.5f)
+                        {
+                                const float3 sampleDiffVec = tex2Dlod(attribsTex, float4(texcoord, .0f, .0f)).xyz;
+                                pixelValid = max(pixelValid, length(sampleDiffVec - diffVec) < 5e-3f ? .0f : 10.0f);
+                                //pixelValid = length(sampleDiffVec - diffVec) < 1e-3f ? .0f : 10.0f;
+                        }
+
+                        // hack:
+                        // we check if the sample could have been near enough to the current pixel 
+                        // or if the angle is small enough
+                        // to have any influence in the current or last frame
+
+                        const float changeFactor = sampleColor.y;
+                        const float partlyResetThres = 1.0f;
+
+                        if (0)//pixelValid <= partlyResetThres)
+                        {
+                                const float tooFarAway = step(0.5f, lengthToSample - changeFactor);
+                                validSamples = max(validSamples, pixelValid * (1.0f - tooFarAway) * step(-0.1f, cosAngle));
+                        }
+                        else
+                        {
+                                validSamples = max(validSamples, pixelValid);
+                        }
+                }
 #ifdef USE_GTX
                 // we can bail out early and use a minimal #samples)
@@ -657 +659 @@
         
 #ifdef PERFORMANCE_TEST 
+
         float3 diffVec = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
 
@@ -750 +753 @@
                 {
                         const float factor = 4.0f;
+                        //if (oldIdx >= factor * newWeight) oldIdx = 0;
                         oldWeight = min(oldWeight, factor * newWeight);
-                        //oldWeight = .0f; 
-                        //oldIdx    = .0f;
+                        oldWeight = oldIdx = .0f; 
                 }
         }