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

Timestamp:

02/12/07 19:00:37 (17 years ago)

Author:

mattausch

Message:

changed pvs loading: loading objects in a first pass

File:

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

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

@@ -27 +27 @@
 #include "PerfTimer.h"
 
-//#include "HashPvs.h"
-
-
 
 #define USE_RAY_LENGTH_AS_CONTRIBUTION 0
@@ -173 +170 @@
         }
                 
-    Debug << "casting strategies: ";
+    Debug << "casting initial strategies: ";
+
         for (int i = 0; i < (int)mStrategies.size(); ++ i)
                 Debug << mStrategies[i] << " ";
@@ -1020 +1018 @@
 
 
+ViewCellsManager *ViewCellsManager::LoadViewCells(const string &filename, 
+                                                                                                  ObjectContainer &pvsObjects,
+                                                                                                  bool finalizeViewCells,
+                                                                                                  BoundingBoxConverter *bconverter)
+                                                                                                 
+{
+        ObjectContainer dummys;
+
+        return LoadViewCells(filename, 
+                                                 pvsObjects,
+                                                 dummys,
+                                                 finalizeViewCells,
+                                                 bconverter);
+}
 
 
@@ -1047 +1059 @@
         }
         
-        //cout << "viewcells parsed " <<endl;
-
         if (0)
         {
@@ -1117 +1127 @@
                 if (mUseKdPvs)
                 {
-                        vector<KdIntersectable *>::iterator kit, kit_end = GetPreprocessor()->mKdTree->mKdIntersectables.end();
+                        vector<KdIntersectable *>::iterator kit, kit_end = 
+                                GetPreprocessor()->mKdTree->mKdIntersectables.end();
 
                         int id = 0;
@@ -1127 +1138 @@
                                 obj->SetId(id);
         
-                                stream << "<BoundingBox" << " id=\"" << id << "\""
-                                           << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
-                                           << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+                                stream << "<BoundingBox" << " id=\""    << id  << "\""
+                                           << " min=\""      << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                           << " max=\""      << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
                         }
                 }
@@ -1143 +1154 @@
                                 //-- the bounding boxes
 
-                                stream << "<BoundingBox" << " id=\"" << (*oit)->GetId() << "\""
-                                           << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
-                                           << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+                                stream << "<BoundingBox" << " id=\""    << (*oit)->GetId()    << "\""
+                                           << " min=\""      << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                           << " max=\""      << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
                         }
                 }