Changeset 2671 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

Timestamp:

04/30/08 18:53:06 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp (modified) (9 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

@@ -466 +466 @@
 
 
-
-void
-GlRenderer::_RenderScene()
-{
-  
-  ObjectContainer::const_iterator oi = mObjects.begin();
-  for (; oi != mObjects.end(); oi++)
-        RenderIntersectable(*oi);
-}
+void GlRenderer::_RenderScene()
+{
+        ObjectContainer::const_iterator oi = mObjects.begin();
+
+        for (; oi != mObjects.end(); oi++)
+                RenderIntersectable(*oi);
+}
+
 
 void GlRenderer::_RenderSceneTrianglesWithDrawArrays()
@@ -483 +482 @@
                 glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
 
-        int offset = (int)mObjects.size() * 3;
+        const int offset = (int)mObjects.size() * 3;
         char *arrayPtr = mUseVbos ? NULL : (char *)mData;
         
@@ -489 +488 @@
         glNormalPointer(GL_FLOAT, 0, (char *)arrayPtr + offset * sizeof(Vector3));
         
-        glDrawArrays(GL_TRIANGLES, 0, (int)mObjects.size() * 3);
-        //DisableDrawArrays();
+        glDrawArrays(GL_TRIANGLES, 0, offset);
 }
 
@@ -556 +554 @@
 
 
-bool
-GlRenderer::RenderScene()
-{
-  mCurrentFrame++;
-  
-  Intersectable::NewMail();
+bool GlRenderer::RenderScene()
+{
+        ++ mCurrentFrame;
+
+        Intersectable::NewMail();
+
 #if DYNAMIC_OBJECTS_HACK
         Preprocessor *p = mViewCellsManager->GetPreprocessor();
@@ -570 +568 @@
         {
 #if USE_TRANSFORMED_MESH_INSTANCE_HACK
-        RenderIntersectable(*dit);
+                RenderIntersectable(*dit);
 #else
                 _RenderDynamicObject(*dit);
@@ -576 +574 @@
         }
 #endif
+
 #if 1
         _RenderSceneTrianglesWithDrawArrays();
@@ -603 +602 @@
         // read back the texture
         glReadPixels(0, 0,
-                                GetWidth(), GetHeight(),
-                                GL_RGBA,
-                                GL_UNSIGNED_BYTE,
-                                mPixelBuffer);
-                
-                        
+                GetWidth(), GetHeight(),
+                GL_RGBA,
+                GL_UNSIGNED_BYTE,
+                mPixelBuffer);
+
+
         unsigned int *p = mPixelBuffer;
-                        
+
         for (int y = 0; y < GetHeight(); y++)
         {
@@ -1837 +1836 @@
 {
         int indexBufferSize = 0;
-        
+        mRenderedNodes = 0;
+
         KdNode::NewMail2();
                 
@@ -1898 +1898 @@
                 }
 
+                ++ mRenderedNodes;
+
                 leaf->mIndexBufferSize = indexBufferSize - leaf->mIndexBufferStart;
         }
 }
+
 
 void GlRenderer::CreateVertexArrays(SceneGraphLeaf *leaf)