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

Timestamp:

05/12/06 18:36:52 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -18 +18 @@
 
 
+
+
 namespace GtpVisibilityPreprocessor {
 
@@ -508 +510 @@
         PostProcess(preprocessor->mObjects, postProcessSamples);
 
-        cout << "time needed for  post processing (merge) step: "
+        cout << "time needed for post processing (merge) step: "
                  << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
 
-        Debug << "time needed for  post processing (merge) step: "
+        Debug << "time needed for post processing (merge) step: "
                  << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
 
@@ -2037 +2039 @@
 
 
-bool ViewCellsManager::ExportBoundingBoxes(ofstream &xmlstream, 
-                                                                                   const ObjectContainer &objects) const
-{
-        //-- export the view cells and the pvs
-        xmlstream << "<BoundingBoxes>" << endl;
-
-        ObjectContainer::const_iterator oit, oit_end = objects.end();
-
-        for (oit = objects.begin(); oit != oit_end; ++ oit)
-        {
-                        MeshInstance *mi = dynamic_cast<MeshInstance *>(*oit);
-                        const AxisAlignedBox3 box = mi->GetBox();
-
-                        //-- the bounding boxes
-                        xmlstream << "<BoundingBox" << " id=\"" << mi->GetId() << "\""
-                                      << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
-                                          << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
-        }
-
-        xmlstream << "</BoundingBoxes>" << endl;
-
-        return true;
-}
-
-
 /**********************************************************************/
 /*                 BspViewCellsManager implementation                 */
@@ -2772 +2749 @@
 bool BspViewCellsManager::ExportViewCells(const string filename, const bool exportPvs, const ObjectContainer &objects)
 {
+#if STILL_HAS_TODO
         cout << "exporting view cells to xml ... ";
         std::ofstream stream;
@@ -2809 +2787 @@
 
         cout << "finished" << endl;
-
+#endif
         return true;
 }
@@ -4773 +4751 @@
 {
         cout << "exporting view cells to xml ... ";
-        std::ofstream stream;
+        
+        //ogzstream stream(filename.c_str());
+        std::ofstream stream(filename.c_str());
 
         // for output we need unique ids for each view cell
         CreateUniqueViewCellIds();
 
-        stream.open(filename.c_str());
         stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"<<endl;
         stream << "<Visibility_Solution>" << endl;
@@ -4787 +4766 @@
                    << " max=\"" << mViewSpaceBox.Max().x << " " << mViewSpaceBox.Max().y << " " << mViewSpaceBox.Max().z << "\" />" << endl;
 
-        ExportBoundingBoxes(stream, objects);
-
-        //-- the type of the view cells hierarchy
-        stream << "<Hierarchy name=\"vspBspTree\" />" << endl;
+        
+        //-- export bounding boxes
+        stream << "<BoundingBoxes>" << endl;
+
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                        MeshInstance *mi = dynamic_cast<MeshInstance *>(*oit);
+                        const AxisAlignedBox3 box = mi->GetBox();
+
+                        //-- the bounding boxes
+                        stream << "<BoundingBox" << " id=\"" << mi->GetId() << "\""
+                                   << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                   << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+        }
+
+        stream << "</BoundingBoxes>" << endl;
+
 
         //-- export the view cells and the pvs
         const int numViewCells = mCurrentViewCellsStats.viewCells;
 
-        stream << "<ViewCells number=\"" << numViewCells << "\" />" << endl;
+        stream << "<ViewCells number=\"" << numViewCells << "\" >" << endl;
         
         mViewCellsTree->Export(stream, exportPvs);
@@ -4803 +4797 @@
 
         //-- export the spatial hierarchy
-        stream << "<Hierarchy>" << endl;
+        
+        // the type of the view cells hierarchy
+        stream << "<Hierarchy name=\"vspBspTree\" />" << endl;
         mVspBspTree->Export(stream);
         stream << endl << "</Hierarchy>" << endl;
@@ -4810 +4806 @@
 
         stream << "</Visibility_Solution>" << endl;
+
+
         stream.close();
-
         cout << "finished" << endl;