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

Timestamp:

12/20/08 09:00:10 (16 years ago)

Author:

mattausch

Message:

worked on submission

File:

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

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

@@ -225 +225 @@
         total_ao /= numSamples;
 
-#if 1
+#if 0
         // if surface normal perpenticular to view dir, approx. half of the samples will not count
         // => compensate for this (on the other hand, projected sampling area could be larger!)
         const float viewCorrection = 1.0f + VIEW_CORRECTION_SCALE * max(dot(viewDir, normal), 0.0f);
-        total_ao += cosAngle * aoContrib * viewCorrection;
+        total_ao *= viewCorrection;
 
 #endif
 
-        return float3(max(0.0f, 1.0f - total_ao), validSamples, numSamples);
+        //return float3(max(0.0f, 1.0f - total_ao), validSamples, numSamples);
+        return float3(total_ao, validSamples, numSamples);
 }
 
@@ -260 +261 @@
                         float newWeight,
                         float sampleIntensity,
-                        bool isMovingObject
+                        bool isMovingObject,
+                        sampler2D normalTex
                         )
 {
@@ -288 +290 @@
                 
 
+                // the normal of the current sample
+                //const float3 sampleNormal = tex2Dlod(normalTex, float4(texcoord, 0, 0)).xyz;
+                // angle between current normal and direction to sample controls AO intensity.
+                //float cosAngle2 = .5f + dot(sampleNormal, -normal) * 0.5f;
+
                 ////////////////
                 //-- compute contribution of sample using the direction and angle
@@ -303 +310 @@
                 //const float aoContrib = (1.0f > lengthToSample) ? occlusionPower(9e-2f, DISTANCE_SCALE + lengthToSample): .0f;
 
+                //total_ao += cosAngle2 * cosAngle * aoContrib;
                 total_ao += cosAngle * aoContrib;
 
@@ -318 +326 @@
                 validSamples = max(validSamples, (1.0f - tooFarAway) * pixelValid);
 
-#ifdef USE_GTX
+#if 1//#ifdef U//USE_GTX
                 // we can bail out early and use a minimal #samples)
                 // if some conditions are met as long as the hardware supports it
@@ -343 +351 @@
 
         return float3(total_ao, validSamples, numSamples);
+        //return float3(max(0.0f, 1.0f - total_ao), validSamples, numSamples);
 }
 
@@ -417 +426 @@
         if (eyeSpaceDepth < 1e10f)
         {
-                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, isMovingObject);
+                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, isMovingObject, normals);
                 //ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), normals, sampleIntensity);
         }
@@ -446 +455 @@
                 else if (ao.y > partlyResetThres)
                 {
-                        //oldWeight = min(oldWeight, 4.0f * newWeight);
-                        oldWeight = .0f; 
+                        oldWeight = min(oldWeight, 4.0f * newWeight);
+                        //oldWeight = .0f; 
                 }
         }
@@ -458 +467 @@
         //-- blend ao between old and new samples (and avoid division by zero)
 
-        OUT.illum_col.x = (ao.x * newWeight + oldSsao * oldWeight) / max(1e-6f, newWeight + oldWeight);
+        //OUT.illum_col.x = (ao.x * newWeight + oldSsao * oldWeight) / max(1e-6f, newWeight + oldWeight);
+        OUT.illum_col.x = (ao.x * newWeight + oldSsao * oldWeight) / (newWeight + oldWeight);
 
         OUT.illum_col.y = combinedWeight;