Changeset 3005 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

10/05/08 23:13:58 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (9 diffs)

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

@@ -203 +203 @@
 DeferredRenderer::SAMPLING_METHOD samplingMethod = DeferredRenderer::SAMPLING_QUADRATIC;
 
-
-static Matrix4x4 matProjectionView = IdentityMatrix();
-
-
 ShadowMap *shadowMap = NULL;
 DirectionalLight *light = NULL;
@@ -287 +283 @@
 static CGparameter sBLParamTex;
 
-static Matrix4x4 oldViewProjMatrix;
-static Matrix4x4 oldMatViewing;
+static Matrix4x4 viewProjMat = IdentityMatrix();
+static Matrix4x4 oldViewProjMat = IdentityMatrix();
 
 
@@ -668 +664 @@
         fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
         // the positions buffer
-        fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
-        //fbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
+        //fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
+        fbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
         // the normals buffer
         fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
@@ -905 +901 @@
 {
         // store matrix of last frame
-        oldViewProjMatrix = matProjectionView;
-        camera->GetModelViewMatrix(oldMatViewing);
+        oldViewProjMat = viewProjMat;
 
         glMatrixMode(GL_PROJECTION);
@@ -926 +921 @@
 
         // store matrix for later use
-        matProjectionView = matViewing * matProjection;
+        viewProjMat = matViewing * matProjection;
         
         if ((renderMethod == RENDER_DEFERRED) || (renderMethod == RENDER_DEPTH_PASS_DEFERRED))
@@ -1170 +1165 @@
                 // otherwise the temporal coherency is broken
                 BvhNode::SetCurrentState(1);
-                shadowMap->RenderShadowView(shadowTraverser, matProjectionView);
+                shadowMap->RenderShadowView(shadowTraverser, viewProjMat);
                 BvhNode::SetCurrentState(0);
         }
@@ -1177 +1172 @@
                 // actually render the scene geometry using the specified algorithm
                 traverser->RenderScene();
-/*
-#if 0
-                SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
-
-                for (sit = sceneEntities.begin(); sit != sit_end; ++ sit)
-                        renderQueue->Enqueue(*sit);
-#else
-
-                SceneEntityContainer::const_iterator sit, sit_end = sceneEntities2.end();
-
-                for (sit = sceneEntities2.begin(); sit != sit_end; ++ sit)
-                        renderQueue->Enqueue(*sit);
-#endif
-*/                      
-                renderQueue->Apply();
+                //renderQueue->Apply();
         }
 
@@ -1244 +1225 @@
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
-                ssaoShader->Render(fbo, oldViewProjMatrix, matProjectionView, ssaoTempCohFactor, light, useHDR, sm);
+                ssaoShader->Render(fbo, oldViewProjMat, viewProjMat, ssaoTempCohFactor, light, useHDR, sm);
         }
 
@@ -2173 +2154 @@
         
         // the scene is rendered withouth any shading   
-        shadowMap->ComputeShadowMap(shadowTraverser, matProjectionView);
+        shadowMap->ComputeShadowMap(shadowTraverser, viewProjMat);
 
         glEnable(GL_CULL_FACE);