Changeset 844 for GTP/trunk/Lib

Timestamp:

04/27/06 14:59:18 (19 years ago)

Author:

mattausch

Message:

adding functionality for bounding box hacks

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• ViewCell.cpp (modified) (4 diffs)
• ViewCell.h (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (3 diffs)
• ViewCellsManager.h (modified) (1 diff)

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

@@ -1319 +1319 @@
                                         "false");
 
+        RegisterOption("ViewCells.exportPvs",
+                                        optBool,
+                                        "view_cells_export_pvs=",
+                                        "false");
+
         RegisterOption("ViewCells.exportBboxesForPvs",
                                         optBool,
-                                        "view_cells_export_bboxes=",
+                                        "view_cells_export_bounding_boxes=",
                                         "true");
 

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

@@ -1959 +1959 @@
 
 
-bool ViewCellsTree::Export(ofstream &stream)
+bool ViewCellsTree::Export(ofstream &stream, const bool exportPvs)
 {
         // export recursivly all view cells from the root
-        ExportViewCell(mRoot, stream);
+        ExportViewCell(mRoot, stream, exportPvs);
 
         return true;
@@ -2007 +2007 @@
 
 
-void ViewCellsTree::ExportViewCell(ViewCell *viewCell, ofstream &stream)
+void ViewCellsTree::ExportViewCell(ViewCell *viewCell, ofstream &stream, const bool exportPvs)
 {
         if (viewCell->IsLeaf())
@@ -2018 +2018 @@
                 
                 //-- export pvs
-                if (0)
+                if (exportPvs)
                         ExportPvs(viewCell, stream);
         
@@ -2048 +2048 @@
                 for (it = interior->mChildren.begin(); it != it_end; ++ it)
                 {
-                        ExportViewCell(*it, stream);
+                        ExportViewCell(*it, stream, exportPvs);
                 }
 

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.h

@@ -407 +407 @@
         /** Exports view cells to file.
         */
-    bool Export(ofstream &stream);
+    bool Export(ofstream &stream, const bool exportPvs = false);
 
         /** Export statistics of this view cell tree.
@@ -511 +511 @@
                 NOTE: should be in exporter!!
         */
-        void ExportViewCell(ViewCell *viewCell, ofstream &stream);
+        void ExportViewCell(ViewCell *viewCell, ofstream &stream, const bool exportPvs);
 
         /** Exports pvs of a view cell.

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

@@ -94 +94 @@
 
         environment->GetBoolValue("ViewCells.exportBboxesForPvs", mExportBboxesForPvs);
+        environment->GetBoolValue("ViewCells.exportPvs", mExportPvs);
 
         char buf[100];
@@ -2738 +2739 @@
         stream << "<ViewCells>" << endl;
 
-        mViewCellsTree->Export(stream);
+        mViewCellsTree->Export(stream, mExportPvs);
 
         stream << "</ViewCells>" << endl;
@@ -4710 +4711 @@
         stream << "<ViewCells>" << endl;
         
-        mViewCellsTree->Export(stream);
+        mViewCellsTree->Export(stream, mExportPvs);
 
         stream << "</ViewCells>" << endl;

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

@@ -585 +585 @@
 
         int mRenderCostEvaluationType;
+
+        /// if pvs should be exported with view cells
+        bool mExportPvs;
 };