Changeset 3004 for GTP/trunk

Timestamp:

10/03/08 20:30:08 (16 years ago)

Author:

mattausch

Message:

komisch

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• shaders/ssao.cg (modified) (3 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

@@ -683 +683 @@
                                                                    )
 {
-#ifdef USE_3D_SSAO
+//#ifdef USE_3D_SSAO
         // bias from [-1, 1] to [0, 1]
         static Matrix4x4 biasMatrix(0.5f, 0.0f, 0.0f, 0.5f,
@@ -693 +693 @@
 
         cgGLSetMatrixParameterfc(sModelViewProjMatrixParam, (const float *)m.x);
-#endif
+//#endif
 
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixParam, (const float *)oldProjViewMatrix.x);

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

@@ -149 +149 @@
                    uniform sampler2D oldTex,
                    const uniform float4x4 oldModelViewProj,
+                   const uniform float4x4 modelViewProj,
                    uniform float maxDepth,
                    uniform float temporalCoherence,
@@ -188 +189 @@
 #endif
 
-        // the current depth
-        const float currentDepth = centerPosition.w;
+        // get the current depth
+        //const float currentDepth = centerPosition.w;
+        
+        // apply modelview matrix
+        float4 currentPos = mul(modelViewProj, realPos);
+        currentPos /= currentPos.w;
+        const float currentDepth = currentPos.z;
         
 
@@ -200 +206 @@
 
         ///////////
-        //-- reprojection from new frame into old one 
-        
-        // note: could be done using eye space depth values 
-        float4 oldPos = mul(oldModelViewProj, realPos);
-
-        const float4 projPos = oldPos / oldPos.w;
+        //-- reprojection new frame into old one 
+        
+        // calculate projected depth
+        float4 projPos = mul(oldModelViewProj, realPos);
+        projPos /= oldPos.w;
 
         // the current depth projected into the old frame