Changeset 3304

Timestamp:

02/12/09 10:39:53 (16 years ago)

Author:

mattausch

Message:

tried out scaling vs reduction of samples

Location:

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

Files:

• shaderenv.h (modified) (1 diff)
• shaders/combineSsao.cg (modified) (4 diffs)
• shaders/combineSsaoSep.cg (modified) (4 diffs)
• shaders/deferred.cg (modified) (1 diff)
• shaders/ssao.cg (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -68 +68 @@
 #define SSAO_FILTER_RADIUS 3
 
+#define DEPTH_THRESHOLD 1e10f
+
+
 #endif // __SHADERENV_H

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

@@ -145 +145 @@
         // filter up to a certain convergance value and leave out background (sky) by checking depth
         if (//(convergence < SSAO_CONVERGENCE_THRESHOLD) &&
-                (col.w < 1e10f))
+                (col.w < DEPTH_THRESHOLD))
         {
                 const float distanceScale = 1.0f;
@@ -159 +159 @@
 
         // just apply ssao if we are not in the sky
-        if (col.w < 1e10f)
+        if (col.w < DEPTH_THRESHOLD)
+        {
                 OUT.illum_col.xyz = col.xyz * max(2e-2f, 1.0f - ao.x);
                 //OUT.illum_col.xyz = col.xyz * ao.x;
+        }
         else
+        {
                 OUT.illum_col.xyz = col.xyz;
-
+        }
 
         //OUT.illum_col.xyz = float3(abs(ao.y * 1e2f), abs(ao.z * 1e2f), abs(ao.w * 1e2f));
@@ -214 +217 @@
         // filter up to a certain convergance value and leave out background (sky) by checking depth
         if ((convergence < SSAO_CONVERGENCE_THRESHOLD) && 
-                (col.w < 1e10f))
+                (col.w < DEPTH_THRESHOLD))
         {
                 const float distanceScale = 1.0f;
@@ -229 +232 @@
 
         // just apply ssao if we are not in the sky
-        if (col.w < 1e10f)
+        if (col.w < DEPTH_THRESHOLD)
         {
                 OUT.illum_col.xyz = col.xyz * max(2e-2f, 1.0f - ao.x);

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

@@ -63 +63 @@
                            float3 tl,
                            float3 tr,
-                           float2 xyStep)
+                           float2 xyStep,
+                           float convergence)
 {
         float2 result = float2(0.0f, 0.0f);
@@ -69 +70 @@
         const float3 centerPos = ReconstructSamplePos(colorsTex, texCoord, bl, br, tl, tr);
 
-        for (int i = -SSAO_FILTER_RADIUS; i < SSAO_FILTER_RADIUS; ++ i)
+        const float scale = saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
+        //const int radius = SSAO_FILTER_RADIUS * saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
+        
+        //for (int i = -radius; i <= radius; ++ i)
+        for (int i = -SSAO_FILTER_RADIUS; i <= SSAO_FILTER_RADIUS; ++ i)
         {
-                float4 sampleTexCoord = float4(texCoord + i * xyStep, .0f, .0f);
+                float4 sampleTexCoord = float4(texCoord + i * xyStep * scale, .0f, .0f);
                 result += FilterSample(sampleTexCoord, ssaoTex, colorsTex, centerPos, bl, br, tl, tr);
         }
@@ -104 +109 @@
 
         // filter up to a certain convergance value and leave out background (sky) by checking depth
-        if ((convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < 1e10f))
+        if ((convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < DEPTH_THRESHOLD))
         {
                 // the filtered ssao value
-                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep);
+                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence);
         }
 
@@ -140 +145 @@
 
         // filter up to a certain convergance value and leave out background (sky) by checking depth
-        if ((convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < 1e10f))
+        if ((convergence < SSAO_CONVERGENCE_THRESHOLD) && (depth < DEPTH_THRESHOLD))
         {
                 // the filtered ssao value
-                ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep);
+                ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence);
         }
 
         // just apply ssao if we are not in the sky
-        if (depth < 1e10f)
+        if (depth < DEPTH_THRESHOLD)
         {
                 OUT.illum_col.xyz = col.xyz * max(2e-2f, 1.0f - ao.x);

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

@@ -277 +277 @@
                 pixelValid = pixelNotValid;
         }
-        else if (//!((oldEyeSpaceDepth > 1e10f) || (projectedEyeSpaceDepth > 1e10f)) &&
+        else if (//!((oldEyeSpaceDepth > DEPTH_THRESHOLD) || (projectedEyeSpaceDepth > DEPTH_THRESHOLD)) &&
                 // check if changed from dynamic to not dynamic object
                 ((oldDynamic && !newDynamic) || (!oldDynamic && newDynamic) ||

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

@@ -396 +396 @@
 
         // cull background note: this should be done with the stencil buffer
-        if (eyeSpaceDepth < 1e10f)
+        if (eyeSpaceDepth < DEPTH_THRESHOLD)
         {
                 ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, isMovingObject);