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

Timestamp:

11/18/08 11:28:38 (16 years ago)

Author:

mattausch

Message:

filtering working more nicely now

Location:

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

Files:

• combineSsao.cg (modified) (7 diffs)
• deferred.cg (modified) (1 diff)

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

@@ -16 +16 @@
 
 
-float Filter(float2 texCoord, 
-                         uniform sampler2D ssaoTex,
-                         uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
-                         uniform float filterWeights[NUM_SSAO_FILTERSAMPLES])
-{
-        float average = .0f;
-        float w = .0f;
-
-        for (int i = 0; i < NUM_SSAO_FILTERSAMPLES; ++ i)
-        {
-                average += filterWeights[i] * tex2Dlod(ssaoTex, float4(texCoord + filterOffs[i], 0, 0)).x;
-                w += filterWeights[i];
-        }
-
-        average *= 1.0f / (float)w;
-
-        return average;
+
+
+inline float3 Interpol(float2 w, float3 bl, float3 br, float3 tl, float3 tr)
+{
+        float3 x1 = lerp(bl, tl, w.y);
+        float3 x2 = lerp(br, tr, w.y); 
+        float3 v = lerp(x1, x2, w.x); 
+
+        return v;
+}
+
+
+// reconstruct world space position
+inline float3 ReconstructSamplePos(uniform sampler2D tex,
+                                                                   float2 texcoord, 
+                                                                   float3 bl, float3 br, float3 tl, float3 tr)
+{
+        const float eyeSpaceDepth = tex2Dlod(tex, float4(texcoord, 0, 0)).w;
+        
+        float3 viewVec = Interpol(texcoord, bl, br, tl, tr);
+        float3 samplePos = -viewVec * eyeSpaceDepth;
+
+        return samplePos;
 }
 
@@ -56 +62 @@
 }
 
+#define USE_POSITION
 
 float DiscontinuityFilter(float2 texCoord,
@@ -64 +71 @@
                                                   uniform float filterWeights[NUM_SSAO_FILTERSAMPLES],
                                                   float scale,
-                                                  int index)
+                                                  float3 bl,
+                                                  float3 br,
+                                                  float3 tl,
+                                                  float3 tr)
 {
         float average = .0f;
         float total_w = .0f;
 
+#ifdef USE_POSITION
+        const float3 centerPos = ReconstructSamplePos(ssaoTex, texCoord, bl, br, tl, tr);
+#else
         const float eyeSpaceDepth = ao.w;
+#endif
+
         const float3 norm = normalize(tex2Dlod(normalsTex, float4(texCoord, 0, 0)).xyz);
 
         float4 aoSample;
         float3 sampleNorm;
+        float3 samplePos;
         float w;
-        float4 offs;
+        float4 sampleTexCoord;
         float depthFactor;
         float normalFactor;
-        float converganceFactor;
+        float convergenceFactor;
 
         for (int i = 0; i < NUM_SSAO_FILTERSAMPLES; ++ i)
         {
-                offs = float4(texCoord + filterOffs[i] * scale, 0, 0);
-                aoSample = tex2Dlod(ssaoTex, offs);
-                
-                sampleNorm = normalize(tex2Dlod(normalsTex, offs).xyz);
-
-                //depthFactor = clamp(1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w), 1e-3f, 1.0f);
+                sampleTexCoord = float4(texCoord + filterOffs[i] * scale, 0, 0);
+                aoSample = tex2Dlod(ssaoTex, sampleTexCoord);
+                sampleNorm = normalize(tex2Dlod(normalsTex, sampleTexCoord).xyz);
+
+#ifdef USE_POSITION
+                samplePos = ReconstructSamplePos(ssaoTex, sampleTexCoord.xy, bl, br, tl, tr);
+                depthFactor = max(step(1.0f - 5e-1f, 1.0f - length(samplePos - centerPos)), 1e-3f);
+#else // use depth
                 depthFactor = max(step(5e-1f, 1.0f - abs(1.0f - eyeSpaceDepth / aoSample.w)), 1e-3f);
+#endif
                 normalFactor = max(step(0.6f, dot(sampleNorm, norm)), 1e-3f);
-                converganceFactor = max(step(8.5f, aoSample.y), 1e-3f);
-
-                //w = filterWeights[i] * normalFactor * depthFactor * converganceFactor;
-                w = filterWeights[i];// * normalFactor * converganceFactor;
-                //w = filterWeights[i] * depthFactor;
-
-                average += aoSample[index] * w;
+                convergenceFactor = min(60.0f, aoSample.y) * 0.01f;//max(step(18.5f, aoSample.y), 1e-3f);
+
+                w = filterWeights[i] * normalFactor * depthFactor * convergenceFactor;
+                //w = filterWeights[i] * normalFactor * converganceFactor;
+                //w = filterWeights[i] * normalFactor * depthFactor;
+
+                average += aoSample.x * w;
                 total_w += w;
         }
@@ -112 +131 @@
                           uniform sampler2D offsetTex,
                           uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
-                          uniform float filterWeights[NUM_SSAO_FILTERSAMPLES]
-                          )
+                          uniform float filterWeights[NUM_SSAO_FILTERSAMPLES],
+                          uniform float3 bl,
+                          uniform float3 br,
+                          uniform  float3 tl,
+                          uniform float3 tr)
 {
         pixel OUT;
@@ -132 +154 @@
 
                 float border = step(0.001f,  b2
-
                 //float3 id = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
 */
@@ -155 +176 @@
                 //ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, adaptFactor * scaleFactor  / (adaptFactor + ao.y), 0);
 
-                if (ao.y < 10.5f) ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, 1, 0);
+                if (ao.y < 60.5f) ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, scaleFactor, bl, br, tl, tr);
                 //ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, 1, 0);
         }
@@ -163 +184 @@
         OUT.illum_col.xyz = col.xyz * ao.x;
 
-//      if (ao.y < 1.5f) OUT.illum_col.xyz = float3(10000, 10000, 0);
-//      else if (ao.y < 3.5f) OUT.illum_col.xyz = float3(10000, 0, 10000);
-//      else
+        //      if (ao.y < 1.5f) OUT.illum_col.xyz = float3(10000, 10000, 0);
+        //      else if (ao.y < 3.5f) OUT.illum_col.xyz = float3(10000, 0, 10000);
+        //      else
         //      if (ao.y < 10.5f) OUT.illum_col.xyz = float3(0, 10000, 0);
         //OUT.illum_col = float4(dummy3, dummy3, dummy3, col.w);

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

@@ -291 +291 @@
 
 #endif
+
+
+float4 Output(fragment IN, uniform sampler2D colors): COLOR
+{    
+        // let bilinear filtering do its work
+        return tex2Dlod(colors, float4(IN.texCoord, 0, 0));
+}