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

Timestamp:

08/28/08 21:17:15 (16 years ago)

Author:

mattausch

Message:

improved performance

File:

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

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

@@ -47 +47 @@
 //-- fbos
 
-FrameBufferObject *fbo;
+FrameBufferObject *fbo = NULL;
 
 bool isFirstTexture = true;
@@ -376 +376 @@
         glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);
 
-        InitFBO();
-        
         LeftMotion(0, 0);
         MiddleMotion(0, 0);
@@ -432 +430 @@
         SsaoShader::Init(sCgContext);
 
-        deferredShader = new DeferredShader(texWidth, texHeight);
-        ssaoShader = new SsaoShader(texWidth, texHeight, camera, myfar / 10.0f);
+        //deferredShader = new DeferredShader(texWidth, texHeight);
+        //ssaoShader = new SsaoShader(texWidth, texHeight, camera, myfar / 10.0f);
 
         // initialize the render traverser
@@ -539 +537 @@
         // this fbo basicly stores the scene information we get from standard rendering of a frame
         // we store colors, normals, positions (for the ssao)
-        fbo = new FrameBufferObject(texWidth, texHeight, FrameBufferObject::DEPTH_24);
+        fbo = new FrameBufferObject(texWidth, texHeight, FrameBufferObject::DEPTH_32);
 
         // the diffuse color buffer
@@ -551 +549 @@
         // the normals buffer
         //fbo->AddColorBuffer(ColorBufferObject::BUFFER_UBYTE, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, false);
+        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, false);
+
+        // another color buffer
         fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, false);
 
@@ -574 +575 @@
 void InitGLstate() 
 {
-        glClearColor(0.5f, 0.5f, 0.8f, 0.0f);
+        glClearColor(0.0f, 0.0, 0.2f, 0.0f);
         
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@ -871 +872 @@
         
                 glEnable(GL_MULTISAMPLE_ARB);
-                fbo->Release();
-
+                
                 state.SetRenderType(RenderState::FIXED);
                 glEnable(GL_LIGHTING);
@@ -888 +888 @@
 
                 glEnable(GL_MULTISAMPLE_ARB);
-                fbo->Release();
-
+                
                 cgGLDisableProfile(RenderState::sCgFragmentProfile);
                 cgGLDisableProfile(RenderState::sCgVertexProfile);
@@ -907 +906 @@
         
         case RenderState::DEFERRED:
+
+                if (!fbo) InitFBO();
 
                 // multisampling does not work with deferred shading
@@ -987 +988 @@
 
                 if (useSsao)
+                {
+                        if (!ssaoShader) ssaoShader = new SsaoShader(texWidth, texHeight, camera, myfar / 10.0f);
+                        //DEL_PTR(deferredShader);
+                        
                         ssaoShader->Render(fbo, oldViewProjMatrix, ssaoExpFactor);
+
+                }
                 else
+                {
+                        if (!deferredShader) deferredShader = new DeferredShader(texWidth, texHeight);
+                        //DEL_PTR(ssaoShader);
+
                         deferredShader->Render(fbo);
+                }
+        }
+        else
+        {
+                /*DEL_PTR(fbo);
+                DEL_PTR(ssaoShader);
+                DEL_PTR(deferredShader);
+                */
         }
         
@@ -1174 +1193 @@
         switch (c) 
         {
+
         case 'A':
         case 'a':
@@ -1531 +1551 @@
         DEL_PTR(renderQueue);
         DEL_PTR(perfGraph);
+
+        DEL_PTR(fbo);
+        DEL_PTR(ssaoShader);
+        DEL_PTR(deferredShader);
 
         if (sCgMrtVertexProgram)