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

Timestamp:

11/28/08 03:26:36 (16 years ago)

Author:

mattausch

Message:

prepared meeting

File:

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

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

@@ -153 +153 @@
         sample normal as weight.
 */
-float2 ssao2(fragment IN,
+float3 ssao2(fragment IN,
                          sampler2D colors,
                          sampler2D noiseTex,
@@ -230 +230 @@
                 // check if the samples have been valid in the last frame
                 //numSamples += (1.0f - step(1.0f, lengthToSample)) * sampleColor.x;
-                numSamples += 1.0f - sampleColor.x;
-        }
-
-        return float2(max(0.0f, 1.0f - total_ao), numSamples);
+                ++ numSamples;
+        }
+
+        total_ao /= numSamples;
+
+        return float3(max(0.0f, 1.0f - total_ao), .0f, numSamples);
 }
 
@@ -316 +318 @@
 
                 ++ numSamples;
-                if ((validSamples < 1.0f) && (newWeight > 20) && (numSamples >= 8)) break;
+                //if ((validSamples < 1.0f) && (newWeight > 20) && (numSamples >= 8)) break;
         }
 
@@ -391 +393 @@
         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