Changeset 2878

Timestamp:

08/28/08 09:12:34 (16 years ago)

Author:

mattausch

Message:

for some reasons very slow even in small streets on my home computer!!

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Readme.txt (modified) (1 diff)
• src/CHCPlusPlusTraverser.cpp (modified) (1 diff)
• src/FrameBufferObject.cpp (modified) (2 diffs)
• src/FrameBufferObject.h (modified) (2 diffs)
• src/SceneQuery.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (4 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/Readme.txt

@@ -85 +85 @@
 DevIL for texture loading / unloading
 glfont2 (http://students.cs.byu.edu/~bfish/glfont2.php) for the antialiased fonts of the HUD. Thanks to the author Brad Fish. 
-The RenderTexture library. Thanks to the author Mark J. Harris.
 
 Thanks also to Alexander Kusternig for providing me his code for the SSAO shader.

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

@@ -104 +104 @@
                         }
                         
-                        if (!resultAvailable)
-                                ++ waitedForQueries;
-                        ++ returnedQueries;
-
+                        //++ returnedQueries; if (!resultAvailable) ++ waitedForQueries;
+                        
                         OcclusionQuery *query = mQueryQueue.front();
                         mQueryQueue.pop();

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

@@ -127 +127 @@
 
 
+ColorBufferObject::~ColorBufferObject()
+{
+        glDeleteRenderbuffersEXT(1, &mId);
+        glDeleteTextures(1, &mTexId);
+}
+
+
 FrameBufferObject::FrameBufferObject(int w, int h, DEPTH_FORMAT d, bool useDepthTex)
 : mWidth(w), mHeight(h), mDepthTexId(0)
@@ -187 +194 @@
 
 
+FrameBufferObject::~FrameBufferObject()
+{
+        glDeleteFramebuffersEXT(1, &mId);
+        glDeleteRenderbuffersEXT(1, &mDepthId);
+
+        if (mDepthTexId) glDeleteTextures(1, &mDepthTexId);
+
+        CLEAR_CONTAINER(mColorBuffers);
+}
+
+
 int FrameBufferObject::AddColorBuffer(ColorBufferObject::FORMAT col, 
                                                                           ColorBufferObject::WRAP_TYPE wrapType, 

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

@@ -27 +27 @@
                                           int attachment_idx);
 
+        ~ColorBufferObject();
+
         unsigned int GetTexture() const {return mTexId;}
 
@@ -47 +49 @@
         */
         FrameBufferObject(int w, int h, DEPTH_FORMAT d, bool useDepthTex = false);
+        
+        ~FrameBufferObject();
         /** Creates and adds a color buffer to the current frame buffer object.
                 Returns the index that allows to retrieve the color buffer object.

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

@@ -189 +189 @@
         GrabDepthBuffer(mDepth, fbo->GetDepthTex());
         
-        ExportDepthBuffer(mDepth); 
-        PrintGLerror("grab");
+        //ExportDepthBuffer(mDepth); PrintGLerror("grab");
 
         DEL_PTR(fbo);

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

@@ -539 +539 @@
         // 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_32);
+        fbo = new FrameBufferObject(texWidth, texHeight, FrameBufferObject::DEPTH_24);
 
         // the diffuse color buffer
@@ -871 +871 @@
         
                 glEnable(GL_MULTISAMPLE_ARB);
-                //glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
-
                 fbo->Release();
 
@@ -890 +888 @@
 
                 glEnable(GL_MULTISAMPLE_ARB);
-                //glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
-
                 fbo->Release();
 
@@ -912 +908 @@
         case RenderState::DEFERRED:
 
-                // multisampling not working with deferred shading
-                //glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
+                // multisampling does not work with deferred shading
                 glDisable(GL_MULTISAMPLE_ARB);