Changeset 3190

Timestamp:

11/27/08 04:14:45 (15 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• shaders/combineSsao.cg (modified) (1 diff)
• shaders/deferred.cg (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

@@ -293 +293 @@
         //-- the flip-flop fbos
 
-        //const int dsw = w / 2; const int dsh = h / 2;
-        const int dsw = w; const int dsh = h;
+        const int dsw = w / 2; const int dsh = h / 2;
+        //const int dsw = w; const int dsh = h;
 
         mIllumFbo = new FrameBufferObject(dsw, dsh, FrameBufferObject::DEPTH_NONE);
@@ -317 +317 @@
         mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
         // downsample buffer for the offset texture
-        mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+        mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
 
         for (int i = 0; i < 3; ++ i)

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

@@ -132 +132 @@
                 normalFactor = max(step(.0f, dot(sampleNorm, centerNormal)), 1e-3f);
                 //normalFactor = max(dot(sampleNorm, samplePos), 1e-3f);
-                //convergenceFactor = min(100.0f, aoSample.y);
-                convergenceFactor = aoSample.y;
+                convergenceFactor = min(20.0f, aoSample.y);
+                //convergenceFactor = aoSample.y;
 
                 // combine the weights

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

@@ -284 +284 @@
         
         const float depthDif = abs(1.0f - oldEyeSpaceDepth / projectedEyeSpaceDepth);
-
         const float squaredLen = SqrLen(diffVec);
         
@@ -290 +289 @@
         float validPixel;
 
-        const bool oldDynamic = (squaredLen <= DYNAMIC_OBJECTS_THRESHOLD);
-        const bool newDynamic = (oldPixel.z <= DYNAMIC_OBJECTS_THRESHOLD);
-
-        if (!(oldDynamic && !newDynamic) && !(!oldDynamic && newDynamic) &&
-                !(oldDynamic && newDynamic && (depthDif > MIN_DEPTH_DIFF))
+        const bool oldDynamic = (squaredLen > DYNAMIC_OBJECTS_THRESHOLD);
+        const bool newDynamic = (oldPixel.z > DYNAMIC_OBJECTS_THRESHOLD);
+
+        if (!(oldDynamic && !newDynamic) && !(!oldDynamic && newDynamic) 
+                && !(oldDynamic && newDynamic && (depthDif <= MIN_DEPTH_DIFF))
                 && (oldTexCoords.x >= 0.0f) && (oldTexCoords.x < 1.0f)
                 && (oldTexCoords.y >= 0.0f) && (oldTexCoords.y < 1.0f)