Changeset 3123 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Timestamp:

11/12/08 17:56:47 (16 years ago)

Author:

mattausch

Message:

working on ssao for dynamic objects, found error with tight bounds

Location:

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

Files:

• combineSsao.cg (modified) (4 diffs)
• ssao.cg (modified) (7 diffs)

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

@@ -57 +57 @@
 
 
-float BilateralFilter(float2 texCoord,
-                                          float4 ao,
-                                          uniform sampler2D ssaoTex,
-                                          uniform sampler2D normalsTex,
-                                          uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
-                                          uniform float filterWeights[NUM_SSAO_FILTERSAMPLES],
-                                          float scale)
+float DiscontinuityFilter(float2 texCoord,
+                                                  float4 ao,
+                                                  uniform sampler2D ssaoTex,
+                                                  uniform sampler2D normalsTex,
+                                                  uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
+                                                  uniform float filterWeights[NUM_SSAO_FILTERSAMPLES],
+                                                  float scale)
 {
         float average = .0f;
@@ -76 +76 @@
         float4 offs;
         float depthFactor;
+        float normalFactor;
 
         for (int i = 0; i < NUM_SSAO_FILTERSAMPLES; ++ i)
@@ -83 +84 @@
                 
                 sampleNorm = normalize(tex2Dlod(normalsTex, offs).xyz);
-                depthFactor = clamp(1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w), 1e-3f, 1.0f);
-                //sampleNorm = tex2Dlod(normalsTex, offs).xyz;
 
-                w = filterWeights[i] * max(dot(sampleNorm, norm), 1e-3f) * depthFactor;
+                //depthFactor = clamp(1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w), 1e-3f, 1.0f);
+                
+                depthFactor = max(step(5e-2f, 1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w)), 1e-3f);
+                normalFactor = max(step(0.5f, dot(sampleNorm, norm)), 1e-3f);
+
+                w = filterWeights[i] * normalFactor * depthFactor;
+                //w = filterWeights[i] * depthFactor;
 
                 average += aoSample.x * w;
@@ -111 +116 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        if ((ao.y < 60.0f) && (col.w < 1e10f))
+        //if ((ao.y < 60.0f) && (col.w < 1e10f))
+        if (col.w < 1e10f)
         {
-                const static float scaleFactor = 20.0f;
+                //const static float scaleFactor = 10.0f;
+                const static float scaleFactor = 50.0f;
 
                 //ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
                 //ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights, 1.0f / (1.0f + ao.y));
-                ao.x = BilateralFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, scaleFactor / (scaleFactor + ao.y));
+                ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, scaleFactor / (scaleFactor + ao.y));
                 //ao.x = BilateralFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, 1.0f);
         }

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

@@ -6 +6 @@
 
 #define USE_EYESPACE_DEPTH 1
-//#extension GL_EXT_gpu_shader4 : enable
-
 
 
@@ -110 +108 @@
         const float projectedEyeSpaceDepth = invlen * length(translatedPos);
 
-        float depthDif = (abs(eyeSpaceDepth - sampleEyeSpaceDepth) > 3.0f) ? 
+        float depthDif = (abs(eyeSpaceDepth - sampleEyeSpaceDepth) > 1.0f) ? 
                 0 : abs(1.0f - oldEyeSpaceDepth / projectedEyeSpaceDepth);
 
@@ -183 +181 @@
 
         float notValid = 0.5f;
-        //float overallDepth = 0;
+        float overallDepth = 0;
+
         const float squaredLen = diffVec.x * diffVec.x + diffVec.y * diffVec.y + diffVec.z * diffVec.z;
 
@@ -209 +208 @@
 #endif
 
-        //const float clampedOldWeight = clamp(oldPixel.y, .0f, temporalCoherence);
-        const float oldWeight = oldPixel.y;
+        const float oldWeight = clamp(oldPixel.y, .0f, temporalCoherence);
+        //const float oldWeight = oldPixel.y;
 
         float newWeight;
@@ -225 +224 @@
                 // increase the weight for convergence
                 newWeight = oldWeight + 1.0f;
-                //if (notValid > 1.0f) newWeight = 2.0f;
+                //if (notValid > 1.0f) newWeight = 10.0f;
+                //if (notValid > 1.0f) newWeight = max(15.0f - notValid * 2.0f, 1.0f);
         }
         else
@@ -234 +234 @@
         //if (oldPixel.y >= 2000)
         //      newWeight = min(temporalCoherence + 1, max(oldPixel.y - 70, 50));
-        if (newWeight >= 2000) newWeight = 1000;
+        //if (newWeight >= 2000) newWeight = 1000;
 
         return float3(oldPixel.x, newWeight, eyeSpaceDepth);
@@ -397 +397 @@
         }
 
-        const float clampedWeight = clamp(newWeight, 1, temporalCoherence);
-
-        OUT.illum_col.x = (ao.x + oldSsao * (clampedWeight - 1.0f)) / clampedWeight;
+        OUT.illum_col.x = (ao.x + oldSsao * (newWeight - 1.0f)) / newWeight;
         OUT.illum_col.y = newWeight;
         OUT.illum_col.z = invw;