Changeset 2995 for GTP/trunk

Timestamp:

10/03/08 02:46:30 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (4 diffs)
• shaders/ssao.cg (modified) (5 diffs)

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

@@ -350 +350 @@
                 
                 sOldModelViewProjMatrixParam = cgGetNamedParameter(sCgSsaoProgram, "oldModelViewProj");
-                sModelViewProjMatrixParam = cgGetNamedParameter(sCgSsaoProgram, "mymodelViewProj");
+                sModelViewProjMatrixParam = cgGetNamedParameter(sCgSsaoProgram, "oldModelView");
                 sMaxDepthParam = cgGetNamedParameter(sCgSsaoProgram, "maxDepth");
                 sTemporalCoherenceParam = cgGetNamedParameter(sCgSsaoProgram, "temporalCoherence");
@@ -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

@@ -278 +278 @@
 
 static Matrix4x4 oldViewProjMatrix;
+static Matrix4x4 oldMatViewing;
+
 
 
@@ -881 +883 @@
         // store matrix of last frame
         oldViewProjMatrix = matProjectionView;
+        camera->GetModelViewMatrix(oldMatViewing);
 
         glMatrixMode(GL_PROJECTION);
@@ -1191 +1194 @@
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
-                ssaoShader->Render(fbo, oldViewProjMatrix, matProjectionView, ssaoTempCohFactor, light, useHDR, sm);
+                //ssaoShader->Render(fbo, oldViewProjMatrix, matProjectionView, ssaoTempCohFactor, light, useHDR, sm);
+                ssaoShader->Render(fbo, oldViewProjMatrix, oldMatViewing, ssaoTempCohFactor, light, useHDR, sm);
         }
 
@@ -1724 +1728 @@
         AxisAlignedBox3 box = bvh->GetBox();
 
-        // hack: set far plane for viz
-        //camera->SetFar(0.35f * Magnitude(box.Diagonal()));
-
         const float offs = box.Size().x * 0.3f;
-        //const float offs = box.Size().x * 0.6f;
         
         Vector3 vizpos = Vector3(box.Min().x, box.Min().y  - box.Size().y * 0.35f, box.Min().z + box.Size().z * 50);

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

@@ -149 +149 @@
                    uniform float3 br,
                    uniform float3 tl,
-                   uniform float3 tr
+                   uniform float3 tr,
+                   const uniform float4x4 oldModelView
                    )
 {
@@ -197 +198 @@
         float4 oldPos = mul(oldModelViewProj, realPos);
 
+        // the depth projected into the old frame
         const float newDepth = oldPos.z / oldPos.w;
 
+        // fit from unit cube into 0 .. 1
         float2 tex = (oldPos.xy / oldPos.w) * 0.5f + 0.5f;
+
+        // optain the sample frpm last frame
         float4 oldCol = tex2D(oldTex, tex);
 
@@ -212 +217 @@
         // the number of valid samples in this frame
         const float newNumSamples = ao.y;
+
 
         if (//(temporalCoherence > 0) &&
@@ -219 +225 @@
                 // if visibility changed in the surrounding area we have to recompute
                 && (oldNumSamples > 0.8f * newNumSamples)
-                //&& (oldAvgDepth / newAvgDepth > 0.99)
                 )
         {
@@ -225 +230 @@
                 newWeight = oldWeight + 1.0f;
                 OUT.illum_col.xy = (ao.xy + oldCol.xy * oldWeight) / newWeight;
-
                 //if (!(oldNumSamples > ao.y - 1.5f)) newWeight = 0;
         }