Changeset 3100

Timestamp:

11/05/08 14:25:24 (16 years ago)

Author:

mattausch

Message:

added per sample test

Location:

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

Files:

• shaderenv.h (modified) (1 diff)
• shaders/ssao.cg (modified) (7 diffs)

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

@@ -42 +42 @@
 #define MAX_LOD_LEVEL 10
 
-#define MIN_DEPTH_DIFF 1e-3f
+#define MIN_DEPTH_DIFF 1e-2f
 //#define MIN_DEPTH_DIFF 5e-1f
 #define PRECISION_SCALE 1e-1f

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

@@ -79 +79 @@
                                                            uniform float3 oldtl,
                                                            uniform float3 oldtr,
-                                                           float3 worldPos
+                                                           float eyeSpaceDepth
                                                            )
 {
@@ -87 +87 @@
         float2 texCoord = texcoord0 + offsetTransformed * scaleFactor;
         
-        const float3 samplePos = ReconstructSamplePos(colors, texCoord, bl, br, tl, tr);
-
+        const float sampleEyeSpaceDepth = tex2Dlod(colors, float4(texCoord, 0, 0)).w;
+        //float3 viewVec = normalize(Interpol(texcoord, bl, br, tl, tr));
+        const float3 viewVec = Interpol(texCoord, bl, br, tl, tr);
+        const float3 samplePos = -viewVec * sampleEyeSpaceDepth;
+
+        const float3 translatedPos = samplePos - oldEyePos;
         // reproject into old frame and calculate projected depth
-        float4 projPos = mul(oldModelViewProj, float4(samplePos, 1.0f));
+        float4 projPos = mul(oldModelViewProj, float4(translatedPos, 1.0f));
         projPos /= projPos.w;
 
@@ -99 +103 @@
 
         const float oldEyeSpaceDepth = oldPixel.w;
-        const float3 viewVec = Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr);
-
-        const float3 oldSamplePos = oldEyePos - viewVec * oldEyeSpaceDepth;
+        const float3 oldViewVec = Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr);
+
+        const float invlen = 1.0f / length(oldViewVec);
+        const float projectedEyeSpaceDepth = length(translatedPos) * invlen;
         
-        float dDiff = length(oldSamplePos - samplePos.xyz);
-        if (length(worldPos.xyz - samplePos.xyz) > 5.0f) dDiff = .0f;
-
-        return dDiff;
+        float depthDif = (abs(eyeSpaceDepth - sampleEyeSpaceDepth) > 5.0f) ? 0 : abs(oldEyeSpaceDepth - projectedEyeSpaceDepth);
+
+        return depthDif;
 }
 
@@ -180 +184 @@
         float notValid = 0.5f;
 
-        /*for (int i = 0; i < NUM_SAMPLES; ++ i) 
+        for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
                 float sampleDif = ComputeDifference(samples[i],
@@ -192 +196 @@
                                                           oldEyePos,
                                                           oldbl, oldbr, oldtl, oldtr,
-                                                          eyePos.xyz);
-
-                if (sampleDif >= 1e-1f) ++ notValid;
-        }*/
+                                                          eyeSpaceDepth);
+
+                if (sampleDif >= 5e-2f) ++ notValid;
+        }
 
         // the number of valid samples in this frame
@@ -210 +214 @@
                 // if visibility changed in the surrounding area we have to recompute
                 //&& (oldNumSamples > 0.8f * newNumSamples)
-                //&& (notValid < 1.0f)
+                && (notValid < 1.0f)
                 )
         {
@@ -393 +397 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        //if (ao.y < 10.0f) ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
+        if (ao.y < 10.0f) ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
 
         OUT.illum_col = col * ao.x;