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

Timestamp:

06/20/08 02:26:30 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -366 +366 @@
 
 
-void Bvh::RenderBoundingBox(BvhNode *node, RenderState *state)
-{
-        //RenderBoundingBoxImmediate(node->GetBox());
-        static BvhNodeContainer dummy(1);
-        dummy[0] = node;
-        RenderBoundingBoxes(dummy, state);
-}
-
-
-
-int Bvh::RenderBoundingBoxes(const BvhNodeContainer &nodes, RenderState *state)
-{
-        int renderedBoxes = PrepareBoundingBoxesWithDrawArrays(nodes);
-        RenderBoundingBoxesWithDrawArrays(renderedBoxes, state);
+void Bvh::RenderBounds(BvhNode *node, RenderState *state, bool useTightBounds)
+{
+        // if not using tight bounds, rendering boxes in immediate mode
+        // is preferable to vertex arrays (less setup time)
+        if (!useTightBounds)
+        {
+                RenderBoundingBoxImmediate(node->GetBox());
+        }
+        else
+        {
+                static BvhNodeContainer dummy(1);
+                dummy[0] = node;
+                RenderBounds(dummy, state, useTightBounds);
+        }
+}
+
+
+int Bvh::RenderBounds(const BvhNodeContainer &nodes, 
+                                          RenderState *state, 
+                                          bool useTightBounds)
+{
+        // if not using tight bounds, rendering boxes in immediate mode
+        // is preferable to vertex arrays (less setup time)
+
+        int renderedBoxes;
+
+        if (!useTightBounds)
+        {
+                BvhNodeContainer::const_iterator nit, nit_end = nodes.end();
+                        
+                for (nit = nodes.begin(); nit != nit_end; ++ nit)
+                {
+                        RenderBoundingBoxImmediate((*nit)->GetBox());
+                }
+
+                renderedBoxes = (int)nodes.size();
+        }
+        else
+        {
+                renderedBoxes = PrepareBoundsWithDrawArrays(nodes);
+                RenderBoundsWithDrawArrays(renderedBoxes, state);
+        }
 
         return renderedBoxes;
@@ -385 +413 @@
 
 
-int Bvh::PrepareBoundingBoxesWithDrawArrays(const BvhNodeContainer &nodes)
+int Bvh::PrepareBoundsWithDrawArrays(const BvhNodeContainer &nodes)
 {
         //////
@@ -428 +456 @@
 
 
-void Bvh::RenderBoundingBoxesWithDrawArrays(int numNodes, RenderState *state)
+void Bvh::RenderBoundsWithDrawArrays(int numNodes, RenderState *state)
 {
         //////
@@ -706 +734 @@
         nodeStack.push(mRoot);
 
+        int numVirtualLeaves = 0;
+
         while (!nodeStack.empty()) 
         {
@@ -713 +743 @@
                 if (node->IsVirtualLeaf()) 
                 {
+                        ++ numVirtualLeaves;
+
                         BvhLeaf *leaf = static_cast<BvhLeaf *>(node);
 
@@ -731 +763 @@
         }
 
-        mBvhStats.mGeometryRatio = mGeometrySize / (float)GetNumLeaves();
-        mBvhStats.mTriangleRatio = mBvhStats.mTriangles / (float)GetNumLeaves();
+        mBvhStats.mGeometryRatio = mGeometrySize / (float)numVirtualLeaves;
+        mBvhStats.mTriangleRatio = mBvhStats.mTriangles / (float)numVirtualLeaves;
 }