Changeset 3367

Timestamp:

04/30/09 16:22:48 (16 years ago)

Author:

mattausch

Message:

working nicely but still artifacts where high convergence regions come on low convergence ones

Location:

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

Files:

• DeferredRenderer.cpp (modified) (3 diffs)
• chcdemo.cpp (modified) (1 diff)
• shaderenv.h (modified) (2 diffs)
• shaders/ssao.cg (modified) (4 diffs)

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

@@ -518 +518 @@
                  "samples", "bl", "br", "tl", "tr", 
                  "modelViewProj", "oldModelViewProj", "oldEyePos", "oldbl", "oldbr", 
-                 "oldtl", "oldtr", "attribsTex", "kernelRadius", "sampleIntensity"};
-        
-        sCgSsaoProgram->AddParameters(ssaoParams, 0, 20);
+                 "oldtl", "oldtr", "attribsTex", "kernelRadius", "sampleIntensity",
+             "dummyIdx"};
+        
+        sCgSsaoProgram->AddParameters(ssaoParams, 0, 21);
         
         string giParams[] = 
@@ -830 +831 @@
         // read the second buffer, write to the first buffer
         mIllumFbo->Bind();
-        glDrawBuffers(2, mrt + mIllumFboIndex);
+        glDrawBuffers(1, mrt + mIllumFboIndex);
 
         int i = 0;
@@ -892 +893 @@
         sCgSsaoProgram->SetValue1f(i ++, mKernelRadius);
         sCgSsaoProgram->SetValue1f(i ++, mSampleIntensity * mKernelRadius);
+
+        static int dummyIdx = 0;
+        sCgSsaoProgram->SetValue1f(i ++, dummyIdx);
+        dummyIdx += NUM_SAMPLES;
 
         DrawQuad(sCgSsaoProgram);

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

@@ -828 +828 @@
         //fbo->AddColorBuffer(ColorBufferObject::RGB_UBYTE, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
         // buffer holding the difference vector to the old frame
-        fbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+        fbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
         //fbo->AddColorBuffer(ColorBufferObject::RGB_UBYTE, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
         // another color buffer

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

@@ -16 +16 @@
 #define NUM_SAMPLES 48
 
-#define MIN_SAMPLES 8
-//#define MIN_SAMPLES 48
+//#define MIN_SAMPLES 8
+#define MIN_SAMPLES 48
 
 #define DISTANCE_SCALE 1e-2f
@@ -74 +74 @@
 #define PERFORMANCE_TEST 1
 
-#define USE_OPTIMIZATION 0
+#define USE_OPTIMIZATION 1
 
 

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

@@ -20 +20 @@
 {
         float4 illum_col: COLOR0;
-        float4 col: COLOR1;
 };
 
@@ -549 +548 @@
                 // they possibly have any influence on the ao
 
-                if (cosAngle >= 0)
+                const float3 oldVector = oldSamplePos - oldPos;
+                const float oldDistance = length(oldVector);
+                const float cosAngle2 = dot(oldVector, normal);
+
+                if ((cosAngle >= 0) || (cosAngle2 >= 0))
                 {
                         const float oldDistance = length(oldSamplePos - oldPos);
@@ -615 +618 @@
                         uniform float kernelRadius,
                         uniform float sampleIntensity
+                        ,uniform float dummyIdx
                         )
 {
@@ -757 +761 @@
         OUT.illum_col.w = eyeSpaceDepth;
 
-        // this value can be used to check if this pixel belongs to a moving object
-        OUT.col.x = SqrLen(diffVec);
-        //OUT.illum_col.z = SqrLen(diffVec);
-
 #else