Changeset 3162

Timestamp:

11/25/08 12:02:58 (16 years ago)

Author:

mattausch

Message:

playing around with filter: returning to world space depth difference for filter kernel??

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• SampleGenerator.cpp (modified) (1 diff)
• shaderenv.h (modified) (2 diffs)
• shaders/combineSsao.cg (modified) (3 diffs)

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

@@ -521 +521 @@
 
         // antialiasing of the color buffer
-        //AntiAliasing(fbo, light);
+        AntiAliasing(fbo, light);
 
         switch (mShadingMethod)
@@ -670 +670 @@
         GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
 
-        FrameBufferObject::Release();
         // read the second buffer, write to the first buffer
         //FlipFbos(fbo);
+        // end of the pipeline => just draw image to screen
+        FrameBufferObject::Release();
 
         // the neighbouring texels

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

@@ -71 +71 @@
 
                         if ((rx * rx + ry * ry > mRadius * mRadius) 
-                                // also test if sample exactly in center => avoid that                          
+                                // also avoid case that sample exactly in center                        
                                 || (distanceSquared <= 1e-3f)
                                 )

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

@@ -7 +7 @@
 
 //#define NUM_SAMPLES 8
-#define NUM_SAMPLES 48
+#define NUM_SAMPLES 24
 
 // for quadratic falloff
 //#define SAMPLE_INTENSITY 0.2f
-#define SAMPLE_INTENSITY 0.07f
-//#define SAMPLE_INTENSITY 0.005f
+//#define SAMPLE_INTENSITY 0.07f
+#define SAMPLE_INTENSITY 0.01f
 
 //#define SAMPLE_INTENSITY 0.075f
@@ -61 +61 @@
 
 //#define NUM_SSAO_FILTERSAMPLES 25
-#define NUM_SSAO_FILTERSAMPLES 8
+#define NUM_SSAO_FILTERSAMPLES 25
 //#define NUM_SSAO_FILTERSAMPLES 80
 

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

@@ -63 +63 @@
                 //sampleDepth = aoSample.w;
                 
-                //depthFactor = max(step(1e-1f, 1.0f - abs(1.0f - eyeSpaceDepth / sampleDepth)), 1e-3f);
-                depthFactor = 1.0f / max(abs(eyeSpaceDepth - sampleDepth), 1e-3f);
-                //normalFactor = max(step(0.6f, dot(sampleNorm, centerNormal)), 1e-6f);
-                normalFactor = max(dot(sampleNorm, centerNormal), 1e-6f);
-                convergenceFactor = min(200.0f, aoSample.y) * 0.01f;
+                //depthFactor = 1.0f / max(abs(eyeSpaceDepth - sampleDepth), 1e-2f);
+                depthFactor = 1.0f - step(1e-2f, abs(1.0f - eyeSpaceDepth / sampleDepth));
+                //normalFactor = max(step(0.6f, dot(sampleNorm, centerNormal)), 1e-3f);
+                normalFactor = max(dot(sampleNorm, centerNormal), 1e-3f);
+                //convergenceFactor = min(100.0f, aoSample.y);
+                convergenceFactor = aoSample.y;
 
                 // combine the weights
-                w = depthFactor * normalFactor * convergenceFactor;
+                w = filterWeights[i] * convergenceFactor * depthFactor * normalFactor;
+                //w = normalFactor * convergenceFactor;
 
                 average += aoSample.x * w;
@@ -76 +78 @@
         }
 
-        average /= max(total_w, 1e-1f);
+        average /= max(total_w, 1e-6f);
 
         return saturate(average);
@@ -123 +125 @@
         }
 
-        OUT.illum_col.xyz = col.xyz * ao.x;
-        //OUT.illum_col.xyz = float3(0, ao.x, 0);
+        //OUT.illum_col.xyz = col.xyz * ao.x;
+        OUT.illum_col.xyz = float3(ao.x, ao.x, ao.x);
         //OUT.illum_col.xyz = float3(0, clamp(1.0f - ao.y * 1e-2f, 0, 1), 1);
         OUT.illum_col.w = col.w;