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

Timestamp:

09/01/08 18:33:14 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -94 +94 @@
 static int winWidth = 1024;
 static int winHeight = 768;
+
+//static int winWidth = 512;
+//static int winHeight = 512;
+
+
 static float winAspectRatio = 1.0f;
 
@@ -107 +112 @@
 static int texHeight = 768;
 
-//static int texWidth = 512;
-//static int texHeight = 384;
-
-//static int texWidth = 2048;
-//static int texHeight = 2048;
 
 int renderedObjects = 0;
@@ -175 +175 @@
 
 static Matrix4x4 matProjectionView = IdentityMatrix();
+static Matrix4x4 matViewing = IdentityMatrix();
 
 ShadowMapping *shadowMapping = NULL;
@@ -434 +435 @@
         ShadowMapping::Init(sCgContext);
 
-        //deferredShader = new DeferredShader(texWidth, texHeight);
-        //ssaoShader = new SsaoShader(texWidth, texHeight, camera, myfar / 10.0f);
-
 
         // initialize the render traverser
@@ -448 +446 @@
 
         shadowMapping = new ShadowMapping(bvh->GetBox(), 512);
-        shadowMapping->ComputeShadowMap(light, traverser);
-
+        
         // frame time is restarted every frame
         frameTimer.Start();
@@ -795 +792 @@
         camera->SetupCameraView();
 
-        // set lights
-        GLfloat position[] = {0.8f, -1.0f, 0.7f, 0.0f};
-        glLightfv(GL_LIGHT0, GL_POSITION, position);
-
-        GLfloat position1[] = {-0.5f, 0.5f, 0.4f, 0.0f};
-        glLightfv(GL_LIGHT1, GL_POSITION, position1);
-
-        
+                
         /////////////////
 
-        Matrix4x4 matViewing, matProjection;
+        Matrix4x4 matProjection;
 
         camera->GetModelViewMatrix(matViewing);
@@ -876 +866 @@
         }
         
-        
-        //shadowMapping->ComputeShadowMap(light, traverser);
-
-
-
         // render without shading
         switch (renderType)
@@ -918 +903 @@
         case RenderState::DEFERRED:
 
+                shadowMapping->ComputeShadowMap(light, traverser);
+
                 if (!fbo) InitFBO();
 
@@ -958 +945 @@
         SetupEyeView();
 
-        // actually render the scene geometry using one of the specified algorithms
+        // set up lights
+        GLfloat position[] = {0.8f, -1.0f, 0.7f, 0.0f};
+        glLightfv(GL_LIGHT0, GL_POSITION, position);
+
+        GLfloat position1[] = {-0.5f, 0.5f, 0.4f, 0.0f};
+        glLightfv(GL_LIGHT1, GL_POSITION, position1);
+
+        // actually render the scene geometry using the specified algorithm
         traverser->RenderScene();
-
 
 
@@ -999 +992 @@
                 {
                         if (!ssaoShader) ssaoShader = new SsaoShader(texWidth, texHeight, camera, myfar / 10.0f);
-                        //DEL_PTR(deferredShader);
                         ssaoShader->Render(fbo, oldViewProjMatrix, ssaoExpFactor);
 
@@ -1006 +998 @@
                 {
                         if (!deferredShader) deferredShader = new DeferredShader(texWidth, texHeight);
-                        //DEL_PTR(ssaoShader);
-                        deferredShader->Render(fbo);
+                        
+                        //deferredShader->Render(fbo);
+                        deferredShader->Render(fbo, matViewing, shadowMapping);
                 }
         }
-        else
-        {
-                /*DEL_PTR(fbo);
-                DEL_PTR(ssaoShader);
-                DEL_PTR(deferredShader);
-                */
-        }
+        
         
         ///////////
@@ -1498 +1485 @@
         const float offs = box.Size().x * 0.3f;
         
-        //Vector3 vizpos = Vector3(box.Min().x, box.Min().y + box.Size().y * 0.5f, box.Min().z + box.Size().z * 50);
         Vector3 vizpos = Vector3(box.Min().x, box.Min().y  - box.Size().y * 0.35f, box.Min().z + box.Size().z * 50);
         
         visCamera->SetPosition(vizpos);
         visCamera->ResetPitchAndYaw();
-        //visCamera->Pitch(M_PI);
-
+        
         glPushAttrib(GL_VIEWPORT_BIT);
         glViewport(winWidth - winWidth / 3, winHeight - winHeight / 3, winWidth / 3, winHeight / 3);