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

Timestamp:

11/16/08 23:57:33 (16 years ago)

Author:

mattausch

Message:

tried different techniques for smoothing the flickering for moving objects
fixed kernel + rotation + jittering not working yet
smoothssao function working better now (also test different filter sizes!)

Location:

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

Files:

• combineSsao.cg (modified) (3 diffs)
• ssao.cg (modified) (9 diffs)

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

@@ -167 +167 @@
 
                 //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;
+                depthFactor = max(step(5e-1f, 1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w)), 1e-3f);
+                normalFactor = max(step(0.3f, dot(sampleNorm, norm)), 1e-3f);
+
+                //w = filterWeights[i] * normalFactor * depthFactor;
+                w = normalFactor * depthFactor;
 
                 average += aoSample.y * w;
@@ -177 +177 @@
         }
 
-        average *= 1.0f / max(total_w, 1e-6f);
+        average *= 1.0f / max(total_w, 1e-3f);
 
         return average;
@@ -193 +193 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        //const static float scaleFactor = 10.0f;
+        //const static float scaleFactor = 20.0f;
         const static float scaleFactor = 10.0f;
-
         ao.y = DiscontinuityFilter2(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, scaleFactor * ao.z, 1);
         

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

@@ -209 +209 @@
 #endif
 
-        const float oldWeight = 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;
@@ -220 +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 = 10.0f;
+                if (notValid > 1.0f) newWeight = 10.0f;
                 //if (notValid > 1.0f) newWeight = max(15.0f - notValid * 2.0f, 1.0f);
         }
@@ -236 +236 @@
         //      newWeight = min(temporalCoherence + 1, max(oldPixel.y - 70, 50));
         //if (newWeight >= 2000) newWeight = 1000;
-        //newWeight -= step(2000.0f, newWeight) * 1000.0f;
+        newWeight -= step(512.0f, newWeight) * 256.0f;
 
         return float3(oldPixel.x, newWeight, eyeSpaceDepth);
@@ -257 +257 @@
                         float3 viewDir
                         , float2 noiseOffs
+                        , sampler2D noiseTex1D
                         )
 {
@@ -266 +267 @@
         float numSamples = .0f;
 
+
+        //float2 jitter = tex2Dlod(noiseTex1D, float4(IN.texCoord.x * 4.0f + noiseOffs.x, 0.5f, 0, 0)).xy;
+        //float2 jitter = tex2Dlod(noiseTex1D, float4(noiseOffs.x, 0.5f, 0, 0)).xy;
 
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
@@ -282 +286 @@
 #endif
                 // weight with projected coordinate to reach similar kernel size for near and far
+                //const float2 texcoord = IN.texCoord.xy + offsetTransformed * scaleFactor + jitter;
                 const float2 texcoord = IN.texCoord.xy + offsetTransformed * scaleFactor;
 
                 //if ((texcoord.x <= 1.0f) && (texcoord.x >= 0.0f) && (texcoord.y <= 1.0f) && (texcoord.y >= 0.0f)) ++ numSamples;
-
                 const float3 samplePos = ReconstructSamplePos(colors, texcoord, bl, br, tl, tr);
 
@@ -340 +344 @@
                    uniform float3 oldtl,
                    uniform float3 oldtr,
-                   uniform sampler2D attribsTex
+                   uniform sampler2D attribsTex,
+                   uniform sampler2D noiseTex1D
                    )
 {
@@ -378 +383 @@
                                                                                         scaleFactor, 
                                                                                         oldbl, oldbr, oldtl, oldtr,
-                                                                                        diffVec);
+                                                                                        diffVec
+                                                                                        );
 
         const float oldSsao = temporalVals.x;
-        const float newWeight = clamp(temporalVals.y, .0f, temporalCoherence);
-
-        //float2 noiseOffs = float2(temporalVals.y / 139.0f, temporalVals.y / 141.0f);
-        float2 noiseOffs = float2(.0f);
+        const float newWeight = clamp(temporalVals.y, 1.0f, temporalCoherence);
+        float2 noiseOffs = float2((temporalVals.y - 1)/ 139.0f, .0f);
+        //float2 noiseOffs = float2(.0f);
 
         float2 ao;
@@ -392 +397 @@
         {
                 ao = ssao(IN, colors, noiseTex, samples, normal, 
-                          eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), noiseOffs);
+                          eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), noiseOffs, noiseTex1D);
         }
         else