Changeset 1233 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

08/20/06 22:48:01 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -8 +8 @@
 #include "ViewCellBsp.h"
 #include "KdTree.h"
-#include "VspOspTree.h"
+#include "HierarchyManager.h"
 #include "Exporter.h"
 #include "VspBspTree.h"
@@ -19 +19 @@
 #include "ResourceManager.h"
 #include "KdIntersectable.h"
+#include "VspTree.h"
+#include "OspTree.h"
+
 
 // should not count origin object for sampling because it disturbs heuristics
@@ -3472 +3475 @@
                         exporter->SetWireframe();
 
-                        KdPvsMap::iterator i = object->mKdPvs.mEntries.begin();
+                        KdPvsMap::iterator kit = object->mKdPvs.mEntries.begin();
                         Intersectable::NewMail();
 
@@ -3479 +3482 @@
                         ObjectContainer visibleObjects;
 
-                        for (; i != object->mKdPvs.mEntries.end(); i++)
+                        for (; kit != object->mKdPvs.mEntries.end(); i++)
                         {
-                                KdNode *node = (*i).first;
+                                KdNode *node = (*kit).first;
                                 exporter->ExportBox(mKdTree->GetBox(node));
 
@@ -5410 +5413 @@
                                         // export bounding box of node
                                         KdIntersectable *kdObj  = dynamic_cast<KdIntersectable *>(obj);
-                                        AxisAlignedBox3 box = mOspTree->GetBoundingBox(kdObj->GetNode());
+                                        AxisAlignedBox3 box = mOspTree->GetBoundingBox(kdObj->GetItem());
                                         
                                         exporter->SetWireframe();
@@ -5509 +5512 @@
         
         // the type of the view space partition
-        stream << "<ViewSpacePartition>" << endl;
+        stream << "<ViewSpaceHierarchy>" << endl;
         mVspTree->Export(stream);
         stream << endl << "</ViewSpacePartitioin>" << endl;
@@ -5517 +5520 @@
         
         // the type of the view cells hierarchy
-        stream << "<ObjectSpacePartition>" << endl;
+        stream << "<ObjectSpaceHierarchy>" << endl;
         mOspTree->Export(stream);
-        stream << endl << "</ObjectSpacePartition>" << endl;
+        stream << endl << "</ObjectSpaceHierarchy>" << endl;