Changeset 3208

Timestamp:

12/03/08 12:25:46 (16 years ago)

Author:

mattausch

Message:

working quite well with adaptive sampling

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• shaderenv.h (modified) (1 diff)
• shaders/ssao.cg (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -8 +8 @@
 //#define NUM_SAMPLES 8
 //#define NUM_SAMPLES 16
-#define NUM_SAMPLES 24
-//#define NUM_SAMPLES 96
+//#define NUM_SAMPLES 24
+#define NUM_SAMPLES 96
 
 #define SAMPLE_INTENSITY 0.2f

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

@@ -269 +269 @@
                         float3 tr, 
                         float3 viewDir,
-                        float newWeight
+                        float newWeight,
+                        bool isMovingObject
                         )
 {
@@ -337 +338 @@
 
                 //if ((validSamples < 1.0f) && (newWeight > 200) && (numSamples >= 8)) break;
-                //if ((validSamples < 1.0f) && (numSamples >= 8)) break;
+                if ((validSamples < 1.0f) && (numSamples >= 8) && !isMovingObject 
+                        || (newWeight > NUM_SAMPLES * 5) && (numSamples >= 8) && isMovingObject
+                        )
+                {
+                        break;
+                }
         }
 
@@ -391 +397 @@
         float scaleFactor = SAMPLE_RADIUS * invw;
 
+        const float sqrMoveSpeed = SqrLen(diffVec);
+        const bool isMovingObject = (sqrMoveSpeed > DYNAMIC_OBJECTS_THRESHOLD);
+
         
         /////////////////
@@ -412 +421 @@
         if (eyeSpaceDepth < 1e10f)
         {
-                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight);
+                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, isMovingObject);
                 //ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), normals);
         }
@@ -420 +429 @@
         }
 
-        const float squaredLen = SqrLen(diffVec);
+        // equals the number of sampled shot in this pass
+        const float newWeight = ao.z;
 
         // check if we have to reset pixel because one of the sample points was invalid
-        if (squaredLen < DYNAMIC_OBJECTS_THRESHOLD)
+        if (!isMovingObject)
+    //if (sqrMoveSpeed <= DYNAMIC_OBJECTS_THRESHOLD)
         {
                 if (ao.y > 4.0f) 
                         oldWeight = 0; 
                 else if (ao.y > 1.0f)
-                        oldWeight = min(oldWeight, 4.0f * NUM_SAMPLES);
-        }
-
-        const float newWeight = ao.z;
+                        oldWeight = min(oldWeight, 4.0f * newWeight);
+        }
+
         const float combinedWeight = clamp(newWeight + oldWeight, .0f, temporalCoherence);