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

Timestamp:

09/19/06 22:33:29 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -788 +788 @@
 
 
-bool Preprocessor::InitRayCast(const string externKdTree)
-{
-        bool loadKdTree, exportKdTree;
-
+bool Preprocessor::InitRayCast(const string externKdTree, const string internkdtree)
+{
+        bool loadKdTree;
         Environment::GetSingleton()->GetBoolValue("Preprocessor.loadKdTree", loadKdTree);
-        Environment::GetSingleton()->GetBoolValue("Preprocessor.exportKdTree", exportKdTree);
-
-        char kdtreename[100];
-        Environment::GetSingleton()->GetStringValue("Preprocessor.kdTreeFilename", kdtreename);
-
         
         if (!loadKdTree)
-        {       //////
+        {       
                 //-- build new kd tree from scene geometry
                 BuildKdTree();
@@ -808 +802 @@
         {
                 const long startTime = GetTime();
-                cout << "loading kd tree file " << kdtreename << " ... ";
-
-                if (!LoadKdTree(kdtreename))
+                cout << "loading kd tree file " << internkdtree << " ... ";
+
+                if (!LoadKdTree(internkdtree))
                 {
-                        cout << "error loading kd tree with filename " << kdtreename << endl;
-                        return false;
+                        cout << "error loading kd tree with filename " << internkdtree << ", rebuilding it instead ..." << endl;
+
+                        BuildKdTree();
+                        KdTreeStatistics(cout);
                 }
 
@@ -827 +823 @@
                                 delete exporter;
                         }
-                }
-        }
-
-        if (exportKdTree)
-        {
-                const long startTime = GetTime();
-                cout << "exporting kd tree ... ";
-                if (!ExportKdTree(kdtreename))
-                {
-                        cout << " error exporting kd tree with filename " << kdtreename << endl;
-                }
-                else
-                {
-                        cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
                 }
         }