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

Timestamp:

02/17/09 19:21:52 (15 years ago)

Author:

mattausch

Message:

surpressed blur, worked on object placing in sibenik (why performance worse than vienna??)

File:

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

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

@@ -58 +58 @@
                                         float3 br,
                                         float3 tl,
-                                        float3 tr)
+                                        float3 tr,
+                                        float maxConvergence)
 {
         float2 aoSample = tex2Dlod(ssaoTex, sampleTexCoord);
@@ -72 +73 @@
         float spatialFactor = 1.0f / max(len, 1e-3f);
 
-        float convergenceFactor = aoSample.y + 1.0f;
+        float convergenceFactor = min(aoSample.y + 1.0f, maxConvergence);
+        convergenceFactor *= convergenceFactor;
 
         // combine the weights
-        //float w = convergenceFactor * convergenceFactor * spatialFactor;
         float w = convergenceFactor * spatialFactor;
         //float w = spatialFactor;
@@ -96 +97 @@
                            float3 tr,
                            float2 xyStep,
-                           float convergence)
+                           float convergence,
+                           float maxConvergence
+                           )
 {
         float2 result = float2(0.0f, 0.0f);
@@ -109 +112 @@
         {
                 float4 sampleTexCoord = float4(texCoord + i * xyStep * scale, .0f, .0f);
-                result += FilterSample(sampleTexCoord, ssaoTex, colorsTex, centerPos, bl, br, tl, tr);
+                result += FilterSample(sampleTexCoord, ssaoTex, colorsTex, centerPos, bl, br, tl, tr, maxConvergence);
         }
 
@@ -148 +151 @@
         {
                 // the filtered ssao value
-                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence);
+                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence);
         }
 
@@ -163 +166 @@
                                                 uniform float3 tl,
                                                 uniform float3 tr,
-                                                uniform float2 res
+                                                uniform float2 res,
+                                                uniform float maxConvergence
                                                 )
 {
@@ -183 +187 @@
         {
                 // the filtered ssao value
-                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence);
+                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence);
         }
 
@@ -200 +204 @@
                                   uniform float3 tl,
                                   uniform float3 tr,
-                                  uniform float2 res
+                                  uniform float2 res,
+                                  uniform float maxConvergence
                                   )
 {
@@ -221 +226 @@
         {
                 // the filtered ssao value
-                ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence);
+                ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence);
         }