Changeset 2857 for GTP/trunk

Timestamp:

08/20/08 16:30:28 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (4 diffs)
• src/FrameBufferObject.cpp (modified) (4 diffs)
• src/FrameBufferObject.h (modified) (2 diffs)
• src/chcdemo.cpp (modified) (12 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.vcproj

@@ -216 +216 @@
                         </File>
                         <File
+                                RelativePath=".\src\DeferredShader.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\src\DeferredShader.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\src\Environment.cpp"
                                 >
@@ -221 +229 @@
                         <File
                                 RelativePath=".\src\Environment.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\src\FrameBufferObject.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\src\FrameBufferObject.h"
                                 >
                         </File>
@@ -515 +531 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\FrameBufferObject.h"
-                                        >
-                                </File>
-                                <File
                                         RelativePath=".\src\Geometry.h"
                                         >
@@ -618 +630 @@
                                 <File
                                         RelativePath=".\src\chcdemo.cpp"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath=".\src\FrameBufferObject.cpp"
                                         >
                                 </File>

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

@@ -66 +66 @@
         switch (filterType)
         {
-        case WRAP_NEAREST:
+        case FILTER_NEAREST:
                 filterParam = GL_NEAREST; break;
-        case WRAP_LINEAR:
+        case FILTER_LINEAR:
                 filterParam = GL_LINEAR; break;
-        case WRAP_MIPMAP_LINEAR: 
+        case FILTER_MIPMAP_LINEAR: 
                 filterParam = GL_LINEAR_MIPMAP_LINEAR; break;
         }
@@ -79 +79 @@
         switch (wrapType)
         {
-        case GL_REPEAT:
-                wrapParam = GL_NEAREST; break;
-        case GL_CLAMP_TO_EDGE:
-                wrapParam = GL_LINEAR; break;
+        case WRAP_REPEAT:
+                wrapParam = GL_REPEAT; break;
+        case WRAP_CLAMP_TO_EDGE:
+                wrapParam = GL_CLAMP_TO_EDGE; break;
         }
 
@@ -91 +91 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapParam);
 
+        // print status
         PrintFBOStatus(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT));
 }
@@ -124 +125 @@
                 glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, depthFormat, mWidth, mHeight);
                 glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, mDepthId);
+        }
 
-                PrintFBOStatus(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT));
-        }
+        // print status
+        PrintFBOStatus(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT));
 }
 
 
+ColorBufferObject *FrameBufferObject::AddColorBuffer(ColorBufferObject::FORMAT col, 
+                                                                                                         ColorBufferObject::WRAP_TYPE wrapType, 
+                                                                                                         ColorBufferObject::FILTER_TYPE filterType, 
+                                                                                                         bool useMipMap, 
+                                                                                                         bool useMultiSampling)
+{
+        ColorBufferObject *colorBuf = 
+                new ColorBufferObject(mWidth, mHeight, col, wrapType, filterType, useMipMap, useMultiSampling);
+        mColorBuffers.push_back(colorBuf);
+
+        return colorBuf;
+}
+
 } // namespace

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/FrameBufferObject.h

@@ -17 +17 @@
 
         enum FORMAT { BUFFER_UBYTE, BUFFER_FLOAT_16, BUFFER_FLOAT_32 };
-        enum FILTER_TYPE { GL_REPEAT, GL_CLAMP_TO_EDGE };
-        enum WRAP_TYPE { WRAP_NEAREST, WRAP_LINEAR, WRAP_MIPMAP_LINEAR };
+        enum WRAP_TYPE{ WRAP_REPEAT, WRAP_CLAMP_TO_EDGE };
+        enum FILTER_TYPE { FILTER_NEAREST, FILTER_LINEAR, FILTER_MIPMAP_LINEAR };
 
         ColorBufferObject(int w, int h, 
@@ -48 +48 @@
         */
         ColorBufferObject *AddColorBuffer(ColorBufferObject::FORMAT col, 
-                                              int wrapType, 
-                                                                          int filterType, 
+                                              ColorBufferObject::WRAP_TYPE wrapType, 
+                                                                          ColorBufferObject::FILTER_TYPE filterType, 
                                                                           bool useMipMap, 
                                                                           bool useMultiSampling);

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

@@ -32 +32 @@
 #include "Transform3.h"
 #include "SampleGenerator.h"
+#include "FrameBufferObject.h"
 
 
@@ -201 +202 @@
 static Matrix4x4 matProjectionView = IdentityMatrix();
 
+FrameBufferObject *myfbo = NULL;
+
 
 // function forward declarations
@@ -466 +469 @@
         CreateNoiseTex2D();
 
-        // init render traverser
+        // initialize the render traverser
         ResetTraverser();
 
@@ -476 +479 @@
         frameTimer.Start();
 
-
+        // the rendering loop
         glutMainLoop();
 
@@ -663 +666 @@
 void InitFBO()
 {
+        // this fbo basicly stores the scene information we get from standard rendering of a frame
+        // we store colors, normals, positions (for the ssao)
+        myfbo = new FrameBufferObject(texWidth, texHeight, true, FrameBufferObject::DEPTH_24);
+
+
+        ColorBufferObject *diffuseBuffer = 
+                myfbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, 
+                                      ColorBufferObject::WRAP_CLAMP_TO_EDGE, 
+                                                          ColorBufferObject::FILTER_LINEAR, 
+                                                          false, false);
+
+        ColorBufferObject *mypositionBuffer = 
+                myfbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, 
+                                      ColorBufferObject::WRAP_CLAMP_TO_EDGE, 
+                                                          ColorBufferObject::FILTER_NEAREST, 
+                                                          false, false);
+
+
+        ColorBufferObject *mynormalsBuffer = 
+                myfbo->AddColorBuffer(ColorBufferObject::BUFFER_UBYTE, 
+                                      ColorBufferObject::WRAP_CLAMP_TO_EDGE, 
+                                                          ColorBufferObject::FILTER_NEAREST, 
+                                                          false, false);
+
+        
+
+
+        ////////////////////////
+
         glGenFramebuffersEXT(1, &fbo);
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
@@ -673 +705 @@
         glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, colorsBuffer);
         
+#if 1
         glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA32F_ARB, texWidth, texHeight);
-
+#else
         int samples = 8;
-        //glEnable(GL_MULTISAMPLE_ARB);
-        //glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER_EXT, samples, GL_RGBA8, texWidth, texHeight);
+        glEnable(GL_MULTISAMPLE_ARB);
+        glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER_EXT, samples, GL_RGBA8, texWidth, texHeight);
+#endif
+
         glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, colorsBuffer);
         
@@ -1111 +1146 @@
 
 
+// the main rendering loop
 void Display() 
 {       
@@ -1166 +1202 @@
                 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
 
-                state.SetRenderType(RenderState::DEPTH_PASS);
-                glDisable(GL_LIGHTING);
-
                 cgGLDisableProfile(RenderState::sCgFragmentProfile);
                 cgGLDisableProfile(RenderState::sCgVertexProfile);
+
+                state.SetRenderType(RenderState::DEPTH_PASS);
+
+                // the scene is rendered withouth any shading   
+                glDisable(GL_LIGHTING);
         
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -1219 +1257 @@
         SetupEyeView();
 
-
-        /*state.Reset();
-        state.SetState(RenderState::RENDER);
-        
+        // actually render the scene geometry using one of the specified algorithms
+        traverser->RenderScene();
+
+
+
+        /////////
+        //-- do the rest of the rendering
+
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
 
-        for (int i = 0; i < loader->mSceneEntities.size(); ++ i)
-        {
-                SceneEntity *ent = loader->mSceneEntities[i];
-
-                ent->UpdateLODs(camera);
-                ent->Render(&state);
-        }*/
-
-        // actually render the scene geometry using one of the specified algorithms
-        traverser->RenderScene();
-
-
-
-        /////////
-        //-- do the rest of the rendering
-
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glEnableClientState(GL_NORMAL_ARRAY);
-
 
         // reset depth pass and render visible objects
@@ -1264 +1287 @@
         glDisableClientState(GL_NORMAL_ARRAY);
 
+
         if (renderType == RenderState::DEFERRED) 
         {
-                glPopAttrib();
+                //glPopAttrib();
                 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
 
@@ -1296 +1320 @@
         }
 
-        glFlush();
+        //glFlush();
 
         const bool restart = true;
@@ -1303 +1327 @@
         DisplayStats();
 
+        // flip textures for temporal smoothing
         isFirstTexture = !isFirstTexture;