Changeset 3202 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Bvh.cpp

Timestamp:

12/01/08 16:50:13 (16 years ago)

Author:

mattausch

Message:

finally found bvh tighter bounds bug

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Bvh.cpp (modified) (10 diffs)

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

@@ -61 +61 @@
 
 
-const static int sNumIndicesPerBox = 20;
+const static int NUM_INDICES_PER_BOX = 20;
 
 /*      Order of vertices
@@ -548 +548 @@
         else
         {
+                BvhNodeContainer::const_iterator nit, nit_end = nodes.end();
+
+                /*for (nit = nodes.begin(); nit != nit_end; ++ nit)
+                {
+                        BvhNode *node = *nit;
+
+                        for (int i = 0; i < node->mNumTestNodes; ++ i)
+                        {
+                                RenderBoundingBoxImmediate(mTestNodes[node->mTestNodesIdx + i]->GetBox());
+                        }
+                }*/
+
                 renderedBoxes = PrepareBoundsWithDrawArrays(nodes);
                 RenderBoundsWithDrawArrays(renderedBoxes, state);
@@ -582 +594 @@
         {
                 BvhNode *node = *nit;
-        const int numIndices = node->mNumTestNodes * sNumIndicesPerBox;
+        const int numIndices = node->mNumTestNodes * NUM_INDICES_PER_BOX;
                 
                 // copy indices
-                memcpy(mIndices + numNodes * sNumIndicesPerBox, 
+                memcpy(mIndices + numNodes * NUM_INDICES_PER_BOX, 
                            mTestIndices + node->mIndicesPtr, 
                            numIndices * sizeof(unsigned int));
@@ -610 +622 @@
         }
 
-        // we do use the last or the first index (they are generate and only used to connect strips)
-        int numElements = numNodes * sNumIndicesPerBox - 1;
+        // we don't use the last or the first index (they are generate and only used to connect strips)
+        int numElements = numNodes * NUM_INDICES_PER_BOX - 1;
         // don't render first degenerate index
         glDrawElements(GL_TRIANGLE_STRIP, numElements, GL_UNSIGNED_INT, mIndices + 1); 
@@ -621 +633 @@
         // collect bvh nodes
         BvhNodeContainer nodes;
-        CollectNodes(mRoot, nodes);
+        // first collect dynamic nodes so we make sure that they are in the beginning
+        CollectNodes(mDynamicRoot, nodes);
+        // then collect static nodes
+        CollectNodes(mStaticRoot, nodes);
+        //CollectNodes(mRoot, nodes);
 
         cout << "creating new indices" << endl;
@@ -631 +647 @@
         for (lit = nodes.begin(); lit != lit_end; ++ lit)
         {
-                int offset = (*lit)->mNumTestNodes * sNumIndicesPerBox;
+                int offset = (*lit)->mNumTestNodes * NUM_INDICES_PER_BOX;
 #ifdef ALIGN_INDICES
                 // align with 32 in order to speed up memcopy
@@ -641 +657 @@
         cout << "creating global indices buffer" << endl;
 
-        if (mIndices) delete [] mIndices;
+        if (mIndices)     delete [] mIndices;
         if (mTestIndices) delete [] mTestIndices;
 
         // global buffer: create it once so we don't have
-        // to allocate memory from the chunks of the node
+        // to allocate memory for each individual chunk of the node
         mIndices = new unsigned int[numMaxIndices];
         // create new index buffer for the individual nodes
@@ -662 +678 @@
                 // the bounding boxes of the test nodes are rendered instead of the node itself
                 // => store their indices
-                for (int i = 0; i < node->mNumTestNodes; ++ i, numIndices += sNumIndicesPerBox)
+                for (int i = 0; i < node->mNumTestNodes; ++ i, numIndices += NUM_INDICES_PER_BOX)
                 {
                         BvhNode *testNode = mTestNodes[node->mTestNodesIdx + i];
 
-                        // add indices to root node
-                        for (int j = 0; j < sNumIndicesPerBox; ++ j)
+                        // add vertex indices of boxes to root node
+                        for (int j = 0; j < NUM_INDICES_PER_BOX; ++ j)
                         {
                                 mTestIndices[mCurrentIndicesPtr + numIndices + j] = sIndices[j] + testNode->GetId() * 8;
@@ -732 +748 @@
                 BvhNode *node = *lit;
 
+                Vector3 v;
+
                 for (int j = 0; j < 8; ++ j)
-                        (static_cast<Vector3 *>(mVertices))[node->GetId() * 8 + j] = node->GetBox().GetVertex(j);
+                {
+                        node->GetBox().GetVertex2(j, v);
+                        (static_cast<Vector3 *>(mVertices))[node->GetId() * 8 + j] = v;
+                }
         }
 
@@ -1294 +1315 @@
         else
         {
-                for (int i = 0; i < node->mNumTestNodes; ++ i)
+                glPolygonMode(GL_FRONT, GL_LINE);
+                BvhNodeContainer nodes;
+                nodes.push_back(node);
+                int renderedBoxes = PrepareBoundsWithDrawArrays(nodes);
+                RenderBoundsWithDrawArrays(renderedBoxes, state);
+                glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+
+                /*for (int i = 0; i < node->mNumTestNodes; ++ i)
                 {
                         RenderBoxForViz(mTestNodes[node->mTestNodesIdx + i]->GetBox());
-                }
+                }*/
         }