Changeset 3099

Timestamp:

11/05/08 13:41:42 (16 years ago)

Author:

mattausch

Message:

comparing eye linear depth

Location:

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

Files:

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

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

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

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

@@ -71 +71 @@
         float4 col = shade(IN, color, normal, lightDir);
         
-        //OUT.color = col;
-        OUT.color.xyz = normal * 0.5f + 0.5f;
-
+        OUT.color = col;
+        //OUT.color.xyz = normal * 0.5f + 0.5f;
         // store scaled view vector so wie don't have to normalize for e.g., ssao
         OUT.color.w = color.w / length(IN.view);
@@ -197 +196 @@
         // compute shading
         OUT.color = useShading ? (ambient + diffuse) * color : color;
-
         // store scaled view vector from now on so wie don't have to normalize later (e.g., for ssao)
         OUT.color.w = color.w / lenView;

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

@@ -147 +147 @@
         //else trafo = inverseModelTrafo * oldModelViewProj;
 
-        float4 dummyPt = worldPos - float4(oldEyePos, 0);
+        float3 dummyPt = worldPos.xyz - oldEyePos;
 
         // reproject into old frame and calculate texture position of sample in old frame
-        float4 backProjPos = mul(oldModelViewProj, dummyPt);
+        float4 backProjPos = mul(oldModelViewProj, float4(dummyPt, 1.0f));
         backProjPos /= backProjPos.w;
         // fit from unit cube into 0 .. 1
@@ -164 +164 @@
         //const float3 viewVec = normalize(Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr));
         const float3 viewVec = Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr);
-        const float3 oldWorldPos = oldEyePos - oldEyeSpaceDepth * viewVec;
+        //const float3 oldWorldPos = oldEyePos - oldEyeSpaceDepth * viewVec;
         //const float3 oldWorldPos = - viewVec * eyeSpaceDepth;
         //const float3 dummy14 = Interpol(texcoord0, bl, br, tl, tr);
 
         // the euclidian world space distance
-        const float depthDif = length(oldWorldPos - worldPos.xyz);
+        //const float depthDif = length(oldWorldPos - worldPos.xyz);
         //const float depthDif = length(dummy14 - viewVec);
-        //const float depthDif = length(oldEyeSpaceDepth - eyeSpaceDepth);
+        //const float projectedEyeSpaceDepth = length(worldPos + oldEyePos);
+        const float invlen = 1.0f / length(viewVec);
+        const float projectedEyeSpaceDepth = length(dummyPt) * invlen;
+        
+        const float depthDif = abs(oldEyeSpaceDepth - projectedEyeSpaceDepth);
         //const float depthDif = length(oldEyePos);