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

Timestamp:

08/22/07 14:27:41 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -1021 +1021 @@
         if (!Debug.is_open()) Debug.open("debug.log");
 
-        // give just an empty container as parameter:
-        // this loading function is used in the engine, thus it
-        // does not need to load the entities the preprocessor works on
-        ObjectContainer preprocessorObjects;
-
-        return LoadViewCells(filename, 
-                                                 pvsObjects,
-                                                 preprocessorObjects,
-                                                 finalizeViewCells,
-                                                 bconverter);
-}
-
+
+        if (strstr(filename.c_str(), ".bn"))
+        {
+                Debug << "binary view cells format detected" << endl;
+
+                return LoadViewCellsBinary(filename, 
+                                               pvsObjects,
+                                                                   finalizeViewCells,
+                                                                   bconverter);
+        }
+        else
+        {
+                Debug << "xml view cells format detected" << endl;
+
+                // give just an empty container as parameter:
+                // this loading function is used in the engine, thus it
+                // does not need to load the entities the preprocessor works on
+                ObjectContainer preprocessorObjects;
+
+                return LoadViewCells(filename, 
+                                         pvsObjects,
+                                                         preprocessorObjects,
+                                                         finalizeViewCells,
+                                                         bconverter);
+        }
+}
 
 void ViewCellsManager::LoadIndexedBoundingBoxesBinary(IN_STREAM &stream, IndexedBoundingBoxContainer &iboxes)
@@ -7110 +7124 @@
 
 
-
-ViewCellsManager *LoadViewCellsBinary(const string &filename, 
-                                                                          ObjectContainer &pvsObjects,
-                                                                          bool finalizeViewCells,
-                                                                          BoundingBoxConverter *bconverter)                                                                                              
-{
-        if (!Debug.is_open()) Debug.open("debug.log");
-
+ViewCellsManager *ViewCellsManager::LoadViewCellsBinary(const string &filename, 
+                                                                                                                ObjectContainer &pvsObjects,
+                                                                                                                bool finalizeViewCells,
+                                                                                                                BoundingBoxConverter *bconverter)                                                                                                
+{
         IN_STREAM stream(filename.c_str());
 
@@ -7142 +7153 @@
         }
 
-        // sort objects by id
-        //sort(pvsObjects.begin(), pvsObjects.end(), ilt);
-
 
         ObjectContainer pvsLookup;
@@ -7188 +7196 @@
 
         Debug << "loading the view space partition tree" << endl;
-        VspTree *vspTree = new VspTree();
-
-        vspTree->mBoundingBox = viewSpaceBox;
+        VspTree *vspTree = new VspTree(viewSpaceBox);
 
         if (!vspTree->ImportBinary(stream))