Changeset 3307 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

02/12/09 18:45:14 (16 years ago)

Author:

mattausch

Message:

working on sampling

File:

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

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

@@ -250 +250 @@
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
                         //offset = myreflect(samples[i], mynoise);
-                        offset = myrotate(samples[i], mynoise.x);
+                        offset = myrotate(samples[i + (int)convergence], mynoise.x);
                 }
                 else
@@ -294 +294 @@
                 // we check if the sample could have been near enough to the current pixel 
                 // to have any influence in the current or last frame
-                const float tooFarAway = step(0.5f, lengthToSample - changeFactor);
+                //const float tooFarAway = step(0.5f, lengthToSample - changeFactor);
                 //validSamples = max(validSamples, (1.0f - tooFarAway) * pixelValid * step(-0.1f, cosAngle));
                 validSamples = max(validSamples, pixelValid);
@@ -303 +303 @@
                 if (numSamples >= MIN_SAMPLES)
                 {
-                        //break;
                         // if the pixel belongs to a static object and all the samples stay valid in the current frame
                         if (!isMovingObject && (validSamples < 1.0f)) break;
@@ -393 +392 @@
         const float oldSsao = temporalVals.x;
         float oldWeight = temporalVals.y;
-        
+
+        float usedWeight = min(temporalCoherence, abs(oldWeight));
+
         float3 ao;
 
@@ -399 +400 @@
         if (eyeSpaceDepth < DEPTH_THRESHOLD)
         {
-                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), usedWeight, sampleIntensity, isMovingObject);
                 //ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), normals, sampleIntensity);
         }
@@ -420 +421 @@
         const float partlyResetThres = 1.0f;
         
-        if (1)//!isMovingObject)
+        // hack: just update static geometry
+        if (!isMovingObject)
         {
                 if (ao.y > completelyResetThres) 
@@ -436 +438 @@
         //-- blend ao between old and new samples (and avoid division by zero)
 
-        OUT.illum_col.x = (ao.x * newWeight + oldSsao * oldWeight);// / (newWeight + oldWeight);//max(1e-6f, newWeight + oldWeight);
-
-        OUT.illum_col.x /= (newWeight + oldWeight);
+        OUT.illum_col.x = ao.x * newWeight + oldSsao * usedWeight;
+        OUT.illum_col.x /= (newWeight + usedWeight);
 
         // the new weight for the next frame
-        const float combinedWeight = clamp(newWeight + oldWeight, .0f, temporalCoherence);
+        //const float combinedWeight = clamp(newWeight + oldWeight, .0f, temporalCoherence);
+        const float combinedWeight = newWeight + oldWeight;
 
         OUT.illum_col.y = combinedWeight;