Changeset 3319 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/combineSsaoSep.cg

Timestamp:

02/18/09 18:34:49 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/combineSsaoSep.cg (modified) (10 diffs)

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

@@ -59 +59 @@
                                         float3 tl,
                                         float3 tr,
-                                        float maxConvergence)
+                                        float maxConvergence,
+                                        float spatialWeight)
 {
         float2 aoSample = tex2Dlod(ssaoTex, sampleTexCoord);
@@ -71 +72 @@
         //float len = min(SqrLen(centerPos - samplePos), 1e2f);
         float len = distance(centerPos, samplePos);
-        float spatialFactor = 1.0f / max(len, 1e-3f);
+        //float spatialFactor = 1.0f / max(len, 1e-3f);
+        float spatialFactor = 1.0f / max(spatialWeight + len, 1e-3f);
 
         float convergenceFactor = min(aoSample.y + 1.0f, maxConvergence);
-        convergenceFactor *= convergenceFactor;
+        //convergenceFactor *= convergenceFactor;
 
         // combine the weights
+        //float w = convergenceFactor * exp(1.0f + spatialFactor);
         float w = convergenceFactor * spatialFactor;
         //float w = spatialFactor;
@@ -98 +101 @@
                            float2 xyStep,
                            float convergence,
-                           float maxConvergence
+                           float maxConvergence,
+                           float spatialWeight
                            )
 {
@@ -105 +109 @@
         const float3 centerPos = ReconstructSamplePos(colorsTex, texCoord, bl, br, tl, tr);
 
-        const float scale = saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
+        const float scale = 1.0f;//saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
         //const int radius = SSAO_FILTER_RADIUS * saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
         
@@ -112 +116 @@
         {
                 float4 sampleTexCoord = float4(texCoord + i * xyStep * scale, .0f, .0f);
-                result += FilterSample(sampleTexCoord, ssaoTex, colorsTex, centerPos, bl, br, tl, tr, maxConvergence);
+                result += FilterSample(sampleTexCoord, ssaoTex, colorsTex, centerPos, bl, br, tl, tr, maxConvergence, spatialWeight);
         }
 
@@ -151 +155 @@
         {
                 // the filtered ssao value
-                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence);
+                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
         }
 
@@ -167 +171 @@
                                                 uniform float3 tr,
                                                 uniform float2 res,
-                                                uniform float maxConvergence
+                                                uniform float maxConvergence,
+                                                uniform float spatialWeight
                                                 )
 {
@@ -187 +192 @@
         {
                 // the filtered ssao value
-                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence);
+                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
         }
 
@@ -205 +210 @@
                                   uniform float3 tr,
                                   uniform float2 res,
-                                  uniform float maxConvergence
+                                  uniform float maxConvergence,
+                                  uniform float spatialWeight
                                   )
 {
@@ -226 +232 @@
         {
                 // the filtered ssao value
-                ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence);
-        }
+                ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+        }
+
+        //const float minAO = 2e-2f;
+        const float minAO = 1e-3f;
 
         // just apply ssao if we are not in the sky
         if (depth < DEPTH_THRESHOLD)
         {
-                //OUT.illum_col.xyz = col.xyz * max(1e-3f, 1.0f - ao.x);
-                OUT.illum_col.xyz = max(1e-3f, 1.0f - ao.x);
+                OUT.illum_col.xyz = col.xyz * max(minAO, 1.0f - ao.x);
+                //OUT.illum_col.xyz = max(minAO, 1.0f - ao.x);
         }
         else