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

Timestamp:

09/18/06 18:57:34 (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

@@ -154 +154 @@
         char buffer[256];
         Environment::GetSingleton()->GetStringValue("Preprocessor.visibilityFile",  buffer);
+    
         mVisibilityFileName = buffer;
         Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilityFilter", mApplyVisibilityFilter );
@@ -372 +373 @@
   mSceneGraph->CollectObjects(&root->mObjects);
   
-  long startTime = GetTime();
+  const long startTime = GetTime();
   cout << "building kd tree ... " << endl;
 
   mKdTree->Construct();
 
-  cout << "construction finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs " << endl;
+  cout << "finished kd tree construction in " << TimeDiff(startTime, GetTime()) * 1e-3 
+           << " secs " << endl;
 
   return true;
 }
+
 
 void
@@ -787 +790 @@
 bool Preprocessor::InitRayCast(const string externKdTree)
 {
+        bool loadKdTree, exportKdTree;
+
+        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();
+                KdTreeStatistics(cout);
+        }
+        else
+        {
+                const long startTime = GetTime();
+                cout << "loading kd tree file " << kdtreename << " ... ";
+
+                if (!LoadKdTree(kdtreename))
+                {
+                        cout << "error loading kd tree with filename " << kdtreename << endl;
+                        return false;
+                }
+                cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+
+                if (0)
+                {
+                        Exporter *exporter = Exporter::GetExporter("dummykd.x3d");
+                        
+                        if (exporter)
+                        {
+                                exporter->ExportKdTree(*mKdTree, true);
+                                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;
+                }
+        }
+
         switch (mRayCastMethod) // use intel ray tracing
         {