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

Timestamp:

12/01/08 18:38:36 (16 years ago)

Author:

mattausch

Message:

only adapting filter size left ...

File:

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

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

@@ -174 +174 @@
         float total_ao = .0f;
         float numSamples = .0f;
+        float validSamples = .0f;
 
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
@@ -233 +234 @@
 #endif
                 // check if the samples have been valid in the last frame
-                //numSamples += (1.0f - step(1.0f, lengthToSample)) * sampleColor.x;
+                validSamples += (1.0f - step(1.0f, lengthToSample)) * sampleColor.x;
+
                 ++ numSamples;
         }
@@ -239 +241 @@
         total_ao /= numSamples;
 
-        return float3(max(0.0f, 1.0f - total_ao), .0f, numSamples);
+        return float3(max(0.0f, 1.0f - total_ao), validSamples, numSamples);
 }
 
@@ -287 +289 @@
                 const float2 texcoord = IN.texCoord.xy + offsetTransformed * scaleFactor;
 
-                const float4 sampleColor = tex2Dlod(colors, float4(texcoord, 0, 0));
+                const float4 sampleColor = tex2Dlod(colors, float4(texcoord, .0f, .0f));
                 const float3 samplePos = ReconstructSamplePos(sampleColor.w, texcoord, bl, br, tl, tr);
                 
@@ -303 +305 @@
                 // angle between current normal and direction to sample controls AO intensity.
                 const float cosAngle = max(dot(dirSample, normal), .0f);
-        
-                // the distance_scale offset is used to avoid singularity that occurs at global illumination when 
-                // the distance to a sample approaches zero
-                //const float aoContrib = SAMPLE_INTENSITY / (DISTANCE_SCALE + lengthToSample * lengthToSample);
                 const float aoContrib = SAMPLE_INTENSITY / sqrLen;
                 //const float aoContrib = (1.0f > lengthToSample) ? occlusionPower(9e-2f, DISTANCE_SCALE + lengthToSample): .0f;
@@ -321 +319 @@
 
                 // check if the samples have been valid in the last frame
-                validSamples += (1.0f - step(1.0f, lengthToSample)) * sampleColor.x;
+                // hack: the distance measure can fail in some cases => choose something different
+                const float tooFarAway = step(1.0f, lengthToSample);
+                validSamples += (1.0f - tooFarAway) * sampleColor.x;
                 //validSamples += sampleColor.x;
 
                 ++ numSamples;
-                //if ((validSamples < 1.0f) && (newWeight > 20) && (numSamples >= 8)) break;
+
+                //if ((validSamples < 1.0f) && (newWeight > 200) && (numSamples >= 8)) break;
+                if ((validSamples < 1.0f) && (numSamples >= 8)) break;
         }
 
@@ -401 +403 @@
         if (eyeSpaceDepth < 1e10f)
         {
-                //ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight);
-                ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), normals);
+                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight);
+                //ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), normals);
         }
         else