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

Timestamp:

05/02/07 17:28:26 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -229 +229 @@
 
 
-bool Preprocessor::ExportBinaryObj(const string filename, SceneGraphNode *root)
+bool Preprocessor::ExportBinaryObj(const string &filename, SceneGraphNode *root)
 {
         ogzstream samplesOut(filename.c_str());
@@ -266 +266 @@
 
 
-bool Preprocessor::ExportObj(const string filename, const ObjectContainer &objects)
+bool Preprocessor::ExportObj(const string &filename, const ObjectContainer &objects)
 {
         ofstream samplesOut(filename.c_str());
@@ -320 +320 @@
 }
 
-static string ReplaceSuffix(string filename, string a, string b)
+static string ReplaceSuffix(const string &filename, string a, string b)
 {
         string result = filename;
@@ -381 +381 @@
 
 bool
-Preprocessor::LoadScene(const string filename)
+Preprocessor::LoadScene(const string &filename)
 {
     // use leaf nodes of the original spatial hierarchy as occludees
@@ -533 +533 @@
 
 bool
-Preprocessor::ExportPreprocessedData(const string filename)
+Preprocessor::ExportPreprocessedData(const string &filename)
 {
         mViewCellsManager->ExportViewCells(filename, true, mObjects);
@@ -605 +605 @@
 
 bool
-Preprocessor::Export( const string filename,
+Preprocessor::Export( const string &filename,
                                           const bool scene,
                                           const bool kdtree
@@ -813 +813 @@
 
 
-bool Preprocessor::LoadKdTree(const string filename)
+bool Preprocessor::LoadKdTree(const string &filename)
 {
         mKdTree = new KdTree();
@@ -821 +821 @@
 
 
-bool Preprocessor::ExportKdTree(const string filename)
+bool Preprocessor::ExportKdTree(const string &filename)
 {
         return mKdTree->ExportBinTree(filename.c_str());
@@ -1034 +1034 @@
 
 
-bool Preprocessor::LoadInternKdTree( const string internKdTree)
-{
-  bool mUseKdTree = true;
-  
-  if (!mUseKdTree) {
-        // create just a dummy KdTree
-        mKdTree = new KdTree;
+bool Preprocessor::LoadInternKdTree(const string &internKdTree)
+{
+        bool mUseKdTree = true;
+
+        if (!mUseKdTree) {
+                // create just a dummy KdTree
+                mKdTree = new KdTree;
+                return true;
+        }
+
+        // always try to load the kd tree
+        cout << "loading kd tree file " << internKdTree << " ... " << endl;
+
+        if (!LoadKdTree(internKdTree)) {
+                cout << "error loading kd tree with filename " 
+                        << internKdTree << ", rebuilding it instead ... " << endl;
+                // build new kd tree from scene geometry
+                BuildKdTree();
+
+                // export kd tree?
+                const long 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;
+                }
+        }
+
+        KdTreeStatistics(cout);
+        cout << mKdTree->GetBox() << endl;
+
         return true;
-  }
-  
-  // always try to load the kd tree
-  cout << "loading kd tree file " << internKdTree << " ... " << endl;
-  
-  if (!LoadKdTree(internKdTree)) {
-        cout << "error loading kd tree with filename " 
-                 << internKdTree << ", rebuilding it instead ... " << endl;
-        // build new kd tree from scene geometry
-        BuildKdTree();
-        
-        // export kd tree?
-        const long 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;
-          }
-  }
-  
-  KdTreeStatistics(cout);
-  cout << mKdTree->GetBox() << endl;
-  
-  return true;
-}
-
-
-bool Preprocessor::InitRayCast(const string externKdTree, 
-                                                           const string internKdTree)
+}
+
+
+bool Preprocessor::InitRayCast(const string &externKdTree, 
+                                                           const string &internKdTree)
 {
         // always try to load the kd tree