Changeset 2620 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

Timestamp:

01/21/08 16:10:52 (16 years ago)

Author:

bittner

Message:

pixel error fix for renderer buffer

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp (modified) (6 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -21 +21 @@
 #define USE_CG 1
 
-#define TEST_PVS_RENDERING 1
+#define TEST_PVS_RENDERING 0
 
 #if USE_CG
@@ -91 +91 @@
   GlRendererBuffer(sceneGraph, viewcells, tree)
 {
+  mUseVbos = true;
   MakeCurrent();
   InitGL();
@@ -96 +97 @@
 }
 
+void
+QtGlRendererBuffer::RenderPvs(const ObjectPvs &pvs)
+{
+#if TEST_PVS_RENDERING 
+
+  // Render PVS
+  ObjectPvsIterator it = pvs.GetIterator();
+  
+  Intersectable::NewMail();
+  mCurrentFrame++;
+  while (it.HasMoreEntries()) 
+        {
+          RenderIntersectable(it.Next());
+        }
+
+#else
+  
+  PreparePvs(pvs);
+
+  int offset = (int)mObjects.size() * 3;
+  char *arrayPtr = mUseVbos ? NULL : (char *)mData;
+
+  glVertexPointer(3, GL_FLOAT, 0, (char *)arrayPtr);
+  glNormalPointer(GL_FLOAT, 0, (char *)arrayPtr + offset * sizeof(Vector3));
+  glDrawElements(GL_TRIANGLES, mIndexBufferSize, GL_UNSIGNED_INT, mIndices);
+  
+#endif
+}
 
 // reimplemented here so that we can snap the error windows
@@ -133 +162 @@
         glStencilOp(GL_KEEP, GL_KEEP, GL_INCR); 
 
-        
-        // Render PVS
-        ObjectPvsIterator it = pvs.GetIterator();
 
         pvsSize = pvs.GetSize();
         cout<<pvsSize<<endl;
-
-        Intersectable::NewMail();
-        mCurrentFrame++;
-        while (it.HasMoreEntries()) 
-          {
-                RenderIntersectable(it.Next());
-          }
-
+        
+        RenderPvs(pvs);
+        
         //glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_FALSE);
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@@ -212 +233 @@
           glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
           
-          // Render PVS
-          Intersectable::NewMail();
-          mCurrentFrame++;
-          
-          
-          ObjectPvsIterator it = pvs.GetIterator();
-          for (; it.HasMoreEntries(); ) 
-                {
-                  RenderIntersectable(it.Next());
-                }
+          RenderPvs(pvs);
 
           mUseForcedColors = false;
@@ -464 +476 @@
 
 
-void QtGlRendererWidget::_UpdatePvsIndices(KdNode *node, int &indexBufferSize)
-{
-        if (node->Mailed())
-                return;
-
-        node->Mail();
-
-        // if (mObjects.size() * 3 < indexBufferSize) cerr << "problem: " << mObjects.size() * 3 << " < " << indexBufferSize << endl;
-        if (!node->IsLeaf()) 
-        {
-                KdInterior *kdInterior = static_cast<KdInterior *>(node);
-
-                _UpdatePvsIndices(kdInterior->mBack, indexBufferSize);
-                _UpdatePvsIndices(kdInterior->mFront, indexBufferSize);
-        } 
-        else 
-        {
-                KdLeaf *leaf = static_cast<KdLeaf *>(node);
-
-                leaf->mIndexBufferStart = indexBufferSize;
-
-                for (size_t i = 0; i < leaf->mObjects.size(); ++ i)
-                {
-                        TriangleIntersectable *obj = 
-                                static_cast<TriangleIntersectable *>(leaf->mObjects[i]);
-
-                        if (obj->mRenderedFrame != mCurrentFrame)
-                        {
-                                obj->mRenderedFrame = mCurrentFrame;
-
-                                mIndices[indexBufferSize + 0] = (obj->GetId() - 1) * 3 + 0;
-                                mIndices[indexBufferSize + 1] = (obj->GetId() - 1) * 3 + 1;
-                                mIndices[indexBufferSize + 2] = (obj->GetId() - 1) * 3 + 2;
-
-                                indexBufferSize += 3;
-                        }
-                }
-
-                leaf->mIndexBufferSize = indexBufferSize - leaf->mIndexBufferStart;
-        }
-
-        //cout << "id: " << indexBufferSize << endl;
-}