Changeset 1627 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

10/16/06 18:59:01 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (6 diffs)

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

@@ -470 +470 @@
                 Environment::GetSingleton()->GetStringValue("ViewCells.geometryFilename", vcGeomFilename);
                 
-                if (mViewCellsManager->GetType() == ViewCellsManager::BSP)
-                {
-                        if (!mViewCellsManager->LoadViewCellsGeometry(vcGeomFilename, extrudeBaseTriangles))
+                if (loadVcGeometry)
+                {
+                        if (mViewCellsManager->GetType() == ViewCellsManager::BSP)
                         {
-                                cerr << "loading view cells geometry failed" << endl;
+                                if (!mViewCellsManager->LoadViewCellsGeometry(vcGeomFilename, extrudeBaseTriangles))
+                                {
+                                        cerr << "loading view cells geometry failed" << endl;
+                                }
                         }
-                }
-                else
-                {
-                        cerr << "loading view cells geometry is not implemented for this manager" << endl;
+                        else
+                        {
+                                cerr << "loading view cells geometry is not implemented for this manager" << endl;
+                        }
                 }
         }
@@ -513 +516 @@
 bool Preprocessor::ConstructViewCells()
 {
-  // construct view cells using it's own set of samples
-  mViewCellsManager->Construct(this);
-  
-  // visualizations and statistics
-  Debug << "finished view cells:" << endl;
-  mViewCellsManager->PrintStatistics(Debug);
-  
-  return true;
+        // construct view cells using it's own set of samples
+        mViewCellsManager->Construct(this);
+
+        // visualizations and statistics
+        Debug << "finished view cells:" << endl;
+        mViewCellsManager->PrintStatistics(Debug);
+
+        return true;
 }
 
@@ -815 +818 @@
 
 
-bool Preprocessor::InitRayCast(const string externKdTree, const string internkdtree)
+bool Preprocessor::InitRayCast(const string externKdTree, const string internKdTree)
 {
         bool loadKdTree = true;
@@ -830 +833 @@
         else
         {
-                const long startTime = GetTime();
-                cout << "loading kd tree file " << internkdtree << " ... ";
-
-                if (!LoadKdTree(internkdtree))
-                {
-                        cout << "error loading kd tree with filename " << internkdtree << ", rebuilding it instead ..." << endl;
+                long startTime = GetTime();
+                cout << "loading kd tree file " << internKdTree << " ... ";
+
+                if (!LoadKdTree(internKdTree))
+                {
+                        cout << "error loading kd tree with filename " << internKdTree << ", rebuilding it instead ..." << endl;
 
                         BuildKdTree();
@@ -852 +855 @@
                                 delete exporter;
                         }
+                }
+
+                // export kd tree?
+                startTime = GetTime();
+                cout << "exporting kd tree ... ";
+
+                if (!ExportKdTree(internKdTree))
+                {
+                        cout << " error exporting kd tree with filename " << internKdTree << endl;
+                }
+                else
+                {
+                        cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
                 }
         }
@@ -909 +925 @@
                   }
                 if (i % 10000 == 0)
-                  cout<<"\r"<<i<<"/"<<rays.size()<<"\r";
+                  cout<<"\r"<<i<<"/"<<(int)rays.size()<<"\r";
         }
         cout<<endl;