Changeset 1416 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

09/19/06 09:41:23 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (7 diffs)

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

@@ -143 +143 @@
         if (mOspTree)
                 mOspTree->SetViewCellsManager(vcm);
-        if (mBvHierarchy)
+        else if (mBvHierarchy)
                 mBvHierarchy->SetViewCellsManager(vcm);
 }
@@ -163 +163 @@
 {
         return mVspTree->mBoundingBox;
+}
+
+
+AxisAlignedBox3 HierarchyManager::GetObjectSpaceBox() const
+{
+        switch (mObjectSpaceSubdivisionType)
+        {
+        case KD_BASED_OBJ_SUBDIV:
+                return mOspTree->mBoundingBox;
+        case BV_BASED_OBJ_SUBDIV:
+                return mBvHierarchy->mBoundingBox;
+        default:
+                // empty box
+                return AxisAlignedBox3();
+        }
 }
 
@@ -360 +375 @@
                 {
                         KdNode *n = mOspTree->Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
-
-                        if (n->IsLeaf()) // local or global termination criteria failed
+                        // local or global termination criteria failed
+                        if (n->IsLeaf()) 
                                 return false;
                 }
@@ -367 +382 @@
                 {
                         BvhNode *n = mBvHierarchy->Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
-
-                        if (n->IsLeaf()) // local or global termination criteria failed
+                        // local or global termination criteria failed
+                        if (n->IsLeaf())
                                 return false;
                 }
         }
 
-        return true;//!globalTerminationCriteriaMet;
+        return true;
 }
 
@@ -746 +761 @@
 
 void HierarchyManager::ExportObjectSpaceHierarchy(Exporter *exporter,
-                                                                                                  const ObjectContainer &objects) const
+                                                                                                  const ObjectContainer &objects,
+                                                                                                  const AxisAlignedBox3 *bbox) const
 {
         switch (mObjectSpaceSubdivisionType)
@@ -757 +773 @@
         case BV_BASED_OBJ_SUBDIV:
                 {
-                        AxisAlignedBox3 bbox = mBvHierarchy->GetBoundingBox();
-                        bbox.Scale(Vector3(0.5, 1, 0.5));
-                        
-                        ExportBvHierarchy(exporter, objects, &bbox);
+                        ExportBvHierarchy(exporter, objects, bbox);
                         break;
                 }
@@ -771 +784 @@
 void HierarchyManager::ExportBvHierarchy(Exporter *exporter, 
                                                                                  const ObjectContainer &objects,
-                                                                                 AxisAlignedBox3 *bbox) const
+                                                                                 const AxisAlignedBox3 *bbox) const
 {
         exporter->SetWireframe();