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

Timestamp:

10/17/06 20:32:06 (18 years ago)

Author:

mattausch

Message:

worked on gradient method for vsposp

File:

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

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

@@ -617 +617 @@
 {
         mKdTree = new KdTree();
+
         return mKdTree->LoadBinTree(filename.c_str(), mObjects);
 }
@@ -820 +821 @@
 bool Preprocessor::InitRayCast(const string externKdTree, const string internKdTree)
 {
+        // always try to load the kd tree
         bool loadKdTree = true;
         //Environment::GetSingleton()->GetBoolValue("Preprocessor.loadKdTree", loadKdTree);
-        
-        
+                
         if (!loadKdTree)
-        {       /////////
-                //-- build new kd tree from scene geometry
-
+        {       
+                // build new kd tree from scene geometry
                 BuildKdTree();
-                KdTreeStatistics(cout);
         }
         else
         {
-                long startTime = GetTime();
                 cout << "loading kd tree file " << internKdTree << " ... ";
 
                 if (!LoadKdTree(internKdTree))
                 {
-                        cout << "error loading kd tree with filename " << internKdTree << ", rebuilding it instead ..." << endl;
-
+                        cout << "error loading kd tree with filename " << internKdTree << ", rebuilding it instead ... " << endl;
                         BuildKdTree();
-                        KdTreeStatistics(cout);
-                }
-
-                cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
-
-                if (0)
-                {
-                        Exporter *exporter = Exporter::GetExporter("dummykd.x3d");
+                }
+
+                // 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;
+
+        if (0)
+        {
+                Exporter *exporter = Exporter::GetExporter("dummykd.x3d");
                         
-                        if (exporter)
-                        {
-                                exporter->ExportKdTree(*mKdTree, true);
-                                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;
-                }
-        }
+                if (exporter)
+                {
+                        exporter->ExportKdTree(*mKdTree, true);
+                        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;