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

Timestamp:

10/18/06 01:49:50 (18 years ago)

Author:

mattausch

Message:

multiple path support for kd

File:

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

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

@@ -822 +822 @@
 {
         // always try to load the kd tree
-        bool loadKdTree = true;
-        //Environment::GetSingleton()->GetBoolValue("Preprocessor.loadKdTree", loadKdTree);
-                
-        if (!loadKdTree)
-        {       
+        cout << "loading kd tree file " << internKdTree << " ... ";
+
+        if (!LoadKdTree(internKdTree))
+        {
+                cout << "error loading kd tree with filename " << internKdTree << ", rebuilding it instead ... " << endl;
                 // build new kd tree from scene geometry
                 BuildKdTree();
-        }
-        else
-        {
-                cout << "loading kd tree file " << internKdTree << " ... ";
-
-                if (!LoadKdTree(internKdTree))
-                {
-                        cout << "error loading kd tree with filename " << internKdTree << ", rebuilding it instead ... " << endl;
-                        BuildKdTree();
-                }
 
                 // export kd tree?
@@ -866 +856 @@
                         delete exporter;
                 }
-
-                /*ofstream objstr("objects.txt");
-
-                vector<KdLeaf *> leaves;
-                mKdTree->CollectLeaves(leaves);
-
-                vector<KdLeaf *>::const_iterator lit, lit_end = leaves.end();
-                for (lit = leaves.begin(); lit != lit_end; ++ lit)
-                {
-                        objstr << "objects: " << (*lit)->mObjects.size() << " bb " << mKdTree->GetBox(*lit) << endl;
-                }*/
-        }
-
+        }
 
         int rayCastMethod;