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

Timestamp:

11/25/08 00:56:01 (16 years ago)

Author:

mattausch

Message:

working quite well, put filter size adaptation factor from 10 to 5, still
small popping artifact when switching from no filter to filter for convergence 100.
problems with balconies, transition between low convergence regions and high convergence

File:

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

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

@@ -89 +89 @@
                           uniform sampler2D ssaoTex,
                           uniform sampler2D normalsTex,
-                          uniform sampler2D offsetTex,
                           uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
-                          uniform float filterWeights[NUM_SSAO_FILTERSAMPLES]
+                          uniform float filterWeights[NUM_SSAO_FILTERSAMPLES],
+                          uniform float4x4 modelViewProj
                           )
 {
@@ -99 +99 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        if ((ao.y < 70.0f) && (col.w < 1e10f))
+        // reconstruct position from the eye space depth
+        const float eyeSpaceDepth = col.w;
+        const float4 worldPos = float4(-IN.view * eyeSpaceDepth, 1.0f);
+        // compute w factor from projection in order to control filter size
+        const float4 projPos = mul(modelViewProj, worldPos);
+        const float distanceScale = 1.0f / projPos.w;
+
+        const float convergence = ao.y;
+
+        if ((ao.y < 100.0f) && (col.w < 1e10f))
         //if (col.w < 1e10f)
         {
                 const float scaleFactor = 1.0f;
-                const float adaptFactor = 10.0f;
-                const float scale =     adaptFactor * scaleFactor * ao.z  / (adaptFactor + ao.y);
+                const float adaptFactor = 5.0f;
+                const float scale =     adaptFactor * scaleFactor * distanceScale / (adaptFactor + convergence);
 
-                //ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, scale);
+                ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, scale);
         }