Changeset 2620 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.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/GlRenderer.cpp (modified) (9 diffs)

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

@@ -26 +26 @@
 
 // if 1 = SAFE RENDERING OF PVS primitives without VBOs for Pvs error estimation
-#define EVAL_ERROR 1
+#define EVAL_ERROR 0
 
 namespace GtpVisibilityPreprocessor {
@@ -449 +449 @@
 }
 
+
+
 void
 GlRenderer::_RenderScene()
@@ -516 +518 @@
         for (; oi != mObjects.end(); oi++) {
 
-                if ((*oi)->Type() == Intersectable::TRIANGLE_INTERSECTABLE) {
+          if ((*oi)->Type() == Intersectable::TRIANGLE_INTERSECTABLE) {
                         TriangleIntersectable *object = (TriangleIntersectable *)*oi;
                         Triangle3 *t = &(object->GetItem());
@@ -525 +527 @@
                         glVertex3f(t->mVertices[1].x, t->mVertices[1].y, t->mVertices[1].z);
                         glVertex3f(t->mVertices[2].x, t->mVertices[2].y, t->mVertices[2].z);
-
-                }
+          }
         }
 
@@ -834 +835 @@
 GlRenderer::RenderKdNode(KdNode *node)
 {
-        if (node->IsLeaf()) 
+  if (node->IsLeaf()) 
         {
 #if !EVAL_ERROR
@@ -843 +844 @@
                   {
                         RenderIntersectable(leaf->mObjects[i]);
+                        
                   }
 #endif
@@ -1577 +1579 @@
                   // compute the pixel error
                   float error = GetPixelError(pvsSize);
-
+                  
                   mPvsErrorBuffer[i].mError = error;
                   mPvsErrorBuffer[i].mPvsSize = pvsSize;
@@ -1685 +1687 @@
 void GlRenderer::EnableDrawArrays()
 {
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glEnableClientState(GL_NORMAL_ARRAY);
+  glEnableClientState(GL_VERTEX_ARRAY);
+  glEnableClientState(GL_NORMAL_ARRAY);
 }
 
@@ -1771 +1773 @@
 #endif
 
+
+
+void GlRenderer::PreparePvs(const ObjectPvs &pvs)
+{
+        int indexBufferSize = 0;
+        
+        KdNode::NewMail();
+        //Intersectable::NewMail();
+
+        
+        ObjectPvsIterator it = pvs.GetIterator();
+
+        while (it.HasMoreEntries()) 
+        {
+                Intersectable *obj = it.Next();
+                switch (obj->Type())
+                {
+                case Intersectable::KD_INTERSECTABLE:
+                        {
+                                KdNode *node = static_cast<KdIntersectable *>(obj)->GetItem();
+                                _UpdatePvsIndices(node, indexBufferSize);
+                        }
+                        break;
+                        
+                }
+        }
+
+        mIndexBufferSize = indexBufferSize;
+}
+
+void GlRenderer::_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;
+}
 
 void GlRenderer::CreateVertexArrays(SceneGraphLeaf *leaf)