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

Timestamp:

01/11/09 01:18:50 (15 years ago)

Author:

mattausch

Message:

working on pompeii loading. fixed bug in obj conversion

File:

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

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

@@ -146 +146 @@
 }
 
+BvhInterior::BvhInterior(BvhNode *parent):
+mBack(NULL), mFront(NULL), BvhNode(parent)
+{}
+
+
+bool BvhInterior::IsLeaf() const
+{
+        return false; 
+}
+
+
+
+BvhLeaf::BvhLeaf(BvhNode *parent): BvhNode(parent)
+{}
+
+
+bool BvhLeaf::IsLeaf() const
+{
+        return true; 
+}
+
+
 
 /**********************************************************/
 /*                class Bvh implementation                */
 /**********************************************************/
-
-
-
-inline AxisAlignedBox3 ComputeBoundingBox(SceneEntity **entities, int numEntities)
-{
-        AxisAlignedBox3 box;
-        
-        if (!numEntities)
-        {       // no box=> just initialize
-                box.Initialize();
-        }
-        else
-        {
-                box = entities[0]->GetWorldBoundingBox();
-
-                for (int i = 1; i < numEntities; ++ i)
-                {
-                        box.Include(entities[i]->GetWorldBoundingBox());
-                }
-        }
-
-        return box;
-}
 
 
@@ -1440 +1439 @@
         leaf->mParent = parent;
         
-        front->mBox = ComputeBoundingBox(mGeometry + front->mFirst, front->CountPrimitives());
-        leaf->mBox = ComputeBoundingBox(mGeometry + leaf->mFirst, leaf->CountPrimitives());
+        front->mBox = SceneEntity::ComputeBoundingBox(mGeometry + front->mFirst, front->CountPrimitives());
+        leaf->mBox = SceneEntity::ComputeBoundingBox(mGeometry + leaf->mFirst, leaf->CountPrimitives());
 
         // recursively continue subdivision
@@ -1468 +1467 @@
                 SceneEntity **entities = GetGeometry(node, numEntities);
 
-                node->mBox = ComputeBoundingBox(entities, numEntities);
+                node->mBox = SceneEntity::ComputeBoundingBox(entities, numEntities);
                 //cout << "box: " << node->mBox << endl;
         }
@@ -1488 +1487 @@
 {
         // the bvh has two main branches
-        // a static branch (the old root), and adynamic branch 
+        // a static branch (the old root), and a dynamic branch 
         // we create a 'dynamic' leaf which basically is a container
         // for all dynamic objects underneath
@@ -1501 +1500 @@
         mDynamicRoot = l;
 
-        l->mBox = ComputeBoundingBox(mGeometry + mStaticGeometrySize, (int)mDynamicGeometrySize);
+        l->mBox = SceneEntity::ComputeBoundingBox(mGeometry + mStaticGeometrySize, 
+                                                      (int)mDynamicGeometrySize);
 
         l->mFirst = (int)mStaticGeometrySize;
@@ -1510 +1510 @@
 
         if (mDynamicGeometrySize)
+        {
                 mDynamicRoot = SubdivideLeaf(l, 0);
+        }
 }