Changeset 944 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

05/10/06 18:33:35 (19 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/generate_viewcells (modified) (1 diff)
• scripts/generate_viewcells.env (modified) (1 diff)
• src/Preprocessor.cpp (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (6 diffs)
• src/ViewCellsManager.h (modified) (1 diff)
• src/ViewCellsParser.cpp (modified) (14 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells

@@ -42 +42 @@
 -view_cells_evaluation_samples_per_pass=1000000 \
 -vsp_bsp_node_queue_type=2 \
--view_cells_filename=$LOG_PREFIX/vienna-visibility.xml
+-view_cells_filename=$LOG_PREFIX-visibility.xml
 
 mv debug.log $LOG_PREFIX-$METHOD-debug.log

GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env

@@ -259 +259 @@
 #       filename ../data/vienna/viewcells-large-sel.x3d
 #       filename ../scripts/viewcells_vienna.xml
-        filename D:/svn/gametools/GTP/trunk/Lib/Vis/Preprocessing/scripts/vienna_visibility.xml
+        filename D:/svn/gametools/GTP/trunk/Lib/Vis/Preprocessing/scripts/vienna-visibility.xml
 }
 

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

@@ -356 +356 @@
         {
                 environment->GetStringValue("ViewCells.filename", buf);
-                mViewCellsManager = ViewCellsManager::LoadViewCells(buf, &mObjects, environment);
+                mViewCellsManager = ViewCellsManager::LoadViewCells(buf, &mObjects, environment, true);
         }
         else

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

@@ -1861 +1861 @@
 
 
-bool ViewCellsManager::ExportViewCells(const string filename, const bool exportPvs, const ObjectContainer &objects)
+bool ViewCellsManager::ExportViewCells(const string filename, 
+                                                                           const bool exportPvs, 
+                                                                           const ObjectContainer &objects)
 {
         return false;
@@ -1880 +1882 @@
         // active view cells
         ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+
         for (it = mViewCells.begin(); it != it_end; ++ it)
         {
@@ -4727 +4730 @@
                                                                                                   ObjectContainer *objects,
                                                                                                   Environment *env,
+                                                                                                  const bool finalizeViewCells,
                                                                                                   BoundingBoxConverter *bconverter)
+                                                                                                 
 {
         ViewCellsParser parser;
@@ -4733 +4738 @@
         ViewCellsManager *vm = NULL;
 
-        Debug << "here23 filename: " << filename << endl;
-        //BoundingBoxConverter bconverter;
-
         if (parser.ParseFile(filename, &vm, objects, bconverter, env))
-        {Debug << "here25 filename: " << filename << endl;
+        {
+                long startTime = GetTime();
+
                 //vm->PrepareLoadedViewCells();
                 vm->ResetViewCells();
@@ -4745 +4749 @@
 
                 // create the meshes and compute volumes
-                vm->FinalizeViewCells(true);
-
-                vm->mViewCellsTree->AssignRandomColors();
-                Debug << (int)vm->mViewCells.size() << " view cells loaded" << endl;
+                if (finalizeViewCells)
+                {
+                        vm->FinalizeViewCells(true);
+                        vm->mViewCellsTree->AssignRandomColors();
+                }
+
+                Debug << (int)vm->mViewCells.size() << " view cells loaded in "
+                          << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
         }
         else
@@ -4785 +4793 @@
 
         //-- export the view cells and the pvs
-        stream << "<ViewCells>" << endl;
+        const int numViewCells = mCurrentViewCellsStats.viewCells;
+
+        stream << "<ViewCells number=\"" << numViewCells << "\" />" << endl;
         
         mViewCellsTree->Export(stream, exportPvs);

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

@@ -432 +432 @@
                                                                                    ObjectContainer *objects, 
                                                                                    Environment *env,
+                                                                                   const bool finalizeViewCells,
                                                                                    BoundingBoxConverter *bconverter = NULL);
 

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

@@ -126 +126 @@
         // go one up in the tree
         if (mCurrentBspNode->GetParent())
-        {       Debug << "]";
+        {       cout << "]";
                 mCurrentBspNode = mCurrentBspNode->GetParent();
         }
@@ -136 +136 @@
         // go one up in the tree
         if (mCurrentViewCell->GetParent())
-        {       Debug << "]";
+        {       cout << "]";
                 mCurrentViewCell = mCurrentViewCell->GetParent();
         }
@@ -159 +159 @@
         // all bounding boxes gathered in this step => 
         // associate object ids with bounding boxes
+        long startTime = GetTime();
+        
         if (mBoundingBoxConverter)
                 mBoundingBoxConverter->IdentifyObjects(mIBoundingBoxes, *mObjects);
+
+        Debug << "\nconverted bounding boxes to objects in"
+                  << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 }
 
@@ -190 +195 @@
         if (element == "Interior") 
         {
-                Debug << "[";
+                cout << "[";
                 StartBspInterior(attributes);
         }
@@ -196 +201 @@
         if (element == "Leaf") 
         {
-                Debug << "l";
-                Debug << "leaf" << endl;
+                cout << "l";
                 StartBspLeaf(attributes);
         }
@@ -212 +216 @@
         if (element == "ViewCells")
         {
-                Debug << "parsing view cells" << endl;
+                cout << "parsing view cells" << endl;
                 mParseViewCells = true;
         }
@@ -218 +222 @@
         if (element == "Hierarchy")
         {
-                Debug << "parsing spatial hierarchy" << endl;
+                cout << "parsing spatial hierarchy" << endl;
                 mParseViewCells = false;
                 StartHierarchy(attributes);
@@ -226 +230 @@
         if (element == "ViewSpaceBox")
         {
-                Debug << "v";
+                cout << "v";
                 StartViewSpaceBox(attributes);
         }
@@ -233 +237 @@
         if (element == "BoundingBox")
         {
-                Debug << "b";
+                cout << "b";
                 StartBoundingBox(attributes);
         }
@@ -259 +263 @@
                 if (element == "Interior") 
                 {
-                        Debug << "[";
+                        cout << "[";
                         StartViewCellInterior(attributes);
                 }
@@ -265 +269 @@
                 if (element == "Leaf") 
                 {
-                        Debug << "l";
+                        cout << "l";
                         StartViewCellLeaf(attributes);
                 }
@@ -399 +403 @@
         mViewSpaceBox = AxisAlignedBox3(bmin, bmax);
 
-        Debug << "view space box: " << mViewSpaceBox << endl;
+        Debug << "\nview space box: " << mViewSpaceBox << endl;
 }
 
@@ -437 +441 @@
         mIBoundingBoxes.push_back(IndexedBoundingBox(id, box));
 
-        Debug << "view space box: " << mViewSpaceBox << endl;
+        //Debug << "bbox: " << box << endl;
 }
 
@@ -624 +628 @@
 
                 mVspBspTree->mBox = mViewSpaceBox;
-                Debug << "creating vsp bsp view cells manager" << endl;
         }
         else if (strcmp(name, "vspKdTree") == 0)
         {
                 // TODO
+                Debug << "view cell type: VspKd" << endl;
                 mVspKdTree = new VspKdTree();   
                 mViewCellsManager = new VspKdViewCellsManager(mVspKdTree, mEnvironment);