Changeset 3122

Timestamp:

11/12/08 13:05:11 (16 years ago)

Author:

mattausch

Message:

still problems with noise

Location:

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

Files:

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

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

@@ -535 +535 @@
         sCgSsaoProgram->SetValue1f(i ++, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
         
-        if (//mUseTemporalCoherence || 
-                mRegenerateSamples)
+        if (mUseTemporalCoherence || mRegenerateSamples)
         {
                 mRegenerateSamples = false;

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

@@ -6 +6 @@
 //-- ssao + gi parameters
 
-#define NUM_SAMPLES 8
-//#define NUM_SAMPLES 16
+//#define NUM_SAMPLES 8
+#define NUM_SAMPLES 16
 
 // for quadratic falloff
 //#define SAMPLE_INTENSITY 0.1f
-#define SAMPLE_INTENSITY 0.07f
-//#define SAMPLE_INTENSITY 0.03f
+//#define SAMPLE_INTENSITY 0.07f
+#define SAMPLE_INTENSITY 0.03f
 
 #define SAMPLE_RADIUS 8e-1f

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

@@ -86 +86 @@
                 //sampleNorm = tex2Dlod(normalsTex, offs).xyz;
 
-                w = filterWeights[i] * max(dot(sampleNorm, norm), .0f) * depthFactor;
+                w = filterWeights[i] * max(dot(sampleNorm, norm), 1e-3f) * depthFactor;
 
                 average += aoSample.x * w;
@@ -113 +113 @@
         if ((ao.y < 60.0f) && (col.w < 1e10f))
         {
-                const static float scaleFactor = 10.0f;
+                const static float scaleFactor = 20.0f;
 
                 //ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);

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

@@ -185 +185 @@
         //float overallDepth = 0;
         const float squaredLen = diffVec.x * diffVec.x + diffVec.y * diffVec.y + diffVec.z * diffVec.z;
+
 #if 1
         if (squaredLen < 1e-8f) // object not dynamic
@@ -208 +209 @@
 #endif
 
-        //const float oldWeight = clamp(oldPixel.y, .0f, temporalCoherence);
-        float oldWeight = oldPixel.y;
+        //const float clampedOldWeight = clamp(oldPixel.y, .0f, temporalCoherence);
+        const float oldWeight = oldPixel.y;
 
         float newWeight;
@@ -219 +220 @@
                 // if visibility changed in the surrounding area we have to recompute
                 //&& (oldNumSamples > 0.8f * newNumSamples)
-                //&& (notValid < 1.0f)
+                && (notValid < 1.0f)
                 )
         {
                 // increase the weight for convergence
                 newWeight = oldWeight + 1.0f;
-                if (notValid > 1.0f) newWeight = 2.0f;
+                //if (notValid > 1.0f) newWeight = 2.0f;
         }
         else
@@ -231 +232 @@
         }
 
-        if (oldPixel.y >= temporalCoherence)
-                newWeight = min(temporalCoherence+1, max(oldPixel.y - 70, 50));
+        //if (oldPixel.y >= 2000)
+        //      newWeight = min(temporalCoherence + 1, max(oldPixel.y - 70, 50));
+        if (newWeight >= 2000) newWeight = 1000;
 
         return float3(oldPixel.x, newWeight, eyeSpaceDepth);
@@ -379 +381 @@
         const float newWeight = temporalVals.y;
 
-        float2 noiseOffs = float2(newWeight / 256.0f, (newWeight - 256.0f) / 192.0f);
+        //float2 noiseOffs = float2(newWeight / 139.0f, newWeight / 141.0f);
+        float2 noiseOffs = float2(.0f);
 
         float2 ao;
+
         // note: this should be done with the stencil buffer
         if (eyeSpaceDepth < 1e10f)
@@ -393 +397 @@
         }
 
-
-        OUT.illum_col.x = (ao.x + oldSsao * (newWeight - 1.0f)) / newWeight;
+        const float clampedWeight = clamp(newWeight, 1, temporalCoherence);
+
+        OUT.illum_col.x = (ao.x + oldSsao * (clampedWeight - 1.0f)) / clampedWeight;
         OUT.illum_col.y = newWeight;
         OUT.illum_col.z = invw;