Changeset 2997 for GTP/trunk

Timestamp:

10/03/08 10:09:24 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (1 diff)
• shaders/ssao.cg (modified) (3 diffs)

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

@@ -657 +657 @@
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixParam, (const float *)oldProjViewMatrix.x);
 
-        cgGLSetMatrixParameterfc(sModelViewProjMatrixParam, (const float *)projViewMatrix.x);
-
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();

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

@@ -1194 +1194 @@
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
-                //ssaoShader->Render(fbo, oldViewProjMatrix, matProjectionView, ssaoTempCohFactor, light, useHDR, sm);
-                ssaoShader->Render(fbo, oldViewProjMatrix, oldMatViewing, ssaoTempCohFactor, light, useHDR, sm);
+                ssaoShader->Render(fbo, oldViewProjMatrix, matProjectionView, ssaoTempCohFactor, light, useHDR, sm);
         }
 

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

@@ -149 +149 @@
                    uniform float3 br,
                    uniform float3 tl,
-                   uniform float3 tr,
-                   const uniform float4x4 oldModelView
+                   uniform float3 tr
                    )
 {
@@ -163 +162 @@
         float w = norm.w;
 
-#if 1   
         // the current world position
         const float4 centerPosition = tex2D(positions, IN.texCoord.xy);
+
+#if 1   
         const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
 
 #else
         /// reconstruct position from the eye space depth
-        float3 viewDir = normalize(IN.view);
+/*      float3 viewDir = normalize(IN.view);
         const float eyeDepth = tex2D(colors, IN.texCoord.xy).w;
         float4 centerPosition;
+
         centerPosition.xyz = eyePos - viewDir * eyeDepth;
-
+*/
         const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
 
@@ -194 +195 @@
         
         // note: could be done using eye space depth values 
-        // by storing the position from last frame and the old model view matrix
-
-        //float4 oldPos = mul(oldModelViewProj, realPos);
         float4 oldPos = mul(oldModelViewProj, realPos);
 
-        //const float projEyeDepth =
         // the current depth projected into the old frame
         const float projDepth = oldPos.z / oldPos.w;