Changeset 3164

Timestamp:

11/25/08 13:49:19 (16 years ago)

Author:

mattausch

Message:

good quality now for current settings

Location:

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

Files:

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

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

@@ -454 +454 @@
 
 
-        const float filterWidth = 100.0f;
+        //const float filterWidth = 100.0f;
         //const float filterWidth = 200.0f;
-        //const float filterWidth = 50.0f;
+        const float filterWidth = 15.0f;
 
         PoissonDiscSampleGenerator2 poisson(NUM_SSAO_FILTERSAMPLES, 1.0f);

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

@@ -97 +97 @@
                                                    uniform sampler2D colorsTex,
                                                    uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
-                                                   uniform float filterWeights[NUM_SSAO_FILTERSAMPLES],
                                                    float scale,
                                                    float3 bl,
@@ -137 +136 @@
                 //normalFactor = max(step(0.6f, dot(sampleNorm, centerNormal)), 1e-3f);
                 normalFactor = max(dot(sampleNorm, samplePos), 1e-3f);
-                convergenceFactor = min(100.0f, aoSample.y);
-                //convergenceFactor = aoSample.y;
+                //convergenceFactor = min(100.0f, aoSample.y);
+                convergenceFactor = aoSample.y;
 
                 // combine the weights
@@ -181 +180 @@
 */
 
-        const float eyeSpaceDepth = col.w;
-
-        const float scaleFactor = 2.0f;
-        const float distanceScale = scaleFactor / (eyeSpaceDepth + scaleFactor);
-
-        const float convergence = ao.y;
-
-        const float adaptFactor = 5.0f;
-        const float convergenceScale = adaptFactor / (convergence + adaptFactor);
-
-
         if ((ao.y < 100.0f) && (col.w < 1e10f))
         //if (col.w < 1e10f)
         {
-                ao.x = DiscontinuityFilter2(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, convergenceScale * distanceScale, bl, br, tl, tr);
+                const float eyeSpaceDepth = col.w;
+                const float distanceScaleWeight = 2.0f;
+                //const float distanceScale = distanceScaleWeight / (eyeSpaceDepth + distanceScaleWeight);
+                const float distanceScale = 1.0f;
+
+                const float convergence = ao.y;
+                const float adaptWeight = 5.0f;
+                const float convergenceScale = adaptWeight / (convergence + adaptWeight);
+
+                const float scale = convergenceScale * distanceScale;
+
+
+                ao.x = DiscontinuityFilter2(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, scale, bl, br, tl, tr);
         }
 
-        //OUT.illum_col.xyz = col.xyz * ao.x;
-        OUT.illum_col.xyz = float3(ao.x, ao.x, ao.x);
+        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;

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

@@ -291 +291 @@
 
         if ((((squaredLen <= DYNAMIC_OBJECTS_THRESHOLD) && (oldPixel.z <= DYNAMIC_OBJECTS_THRESHOLD)) || 
-                (depthDif <= 1e-2))
+                (depthDif <= MIN_DEPTH_DIFF))
                 && (oldTexCoords.x >= 0.0f) && (oldTexCoords.x < 1.0f)
                 && (oldTexCoords.y >= 0.0f) && (oldTexCoords.y < 1.0f)