Changeset 2124 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

02/19/07 02:51:22 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (4 diffs)

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

@@ -383 +383 @@
         }
 
-        // hack: should be different parameter name
+        // hack
         if (mUseMultiLevelConstruction)
         {
                 cout << "starting optimizing multilevel ... " << endl;
-                // try to optimize on the above hierarchy
+                // try to optimize the hierarchy from above
                 OptimizeMultiLevel(sampleRays, objects, forcedViewSpace);
                 
@@ -398 +398 @@
         }
 
-        if (0) CreateTraversalTree();
+        // create a traversal tree which is optimized for view cell casting 
+        if (1) 
+        {
+                CreateTraversalTree();
+        }
 }
 
@@ -2488 +2492 @@
 
         ViewCellContainer viewCells;
-
-        // add mesh instances of the scene graph to the root of the tree
-        TraversalLeaf *root = (TraversalLeaf *)mTraversalTree->GetRoot();
-
-        //mVspTree->CollectViewCells(root->mViewCells, false);
-        
-        const long startTime = GetTime();
+        mVspTree->CollectViewCells(viewCells, false);
+
+        const long startTime = GetTime();
+        
         cout << "building traversal tree ... " << endl;
 
-        mTraversalTree->Construct();
-
-        cout << "finished kd tree construction in " << TimeDiff(startTime, GetTime()) * 1e-3 
+        mTraversalTree->Construct(viewCells);
+
+        cout << "finished traversal tree construction in " << TimeDiff(startTime, GetTime()) * 1e-3 
                  << " secs " << endl;
+
+        Debug << "*** TraversalTree Stats ***" << endl;
+        Debug << mTraversalTree->GetStatistics() << endl;
+
+        if (1) 
+        {
+                Exporter *exporter = Exporter::GetExporter("traversal.wrl");
+                exporter->ExportTraversalTree(*mTraversalTree, true);
+                delete exporter;
+        }
 }
 
@@ -2510 +2521 @@
 {
         if (!mTraversalTree)
+        {
                 return mVspTree->CastLineSegment(origin,termination, viewcells, useMailboxing);
+        }
         else
+        {
                 return mTraversalTree->CastLineSegment(origin,termination, viewcells, useMailboxing);
-}
-
-
-}
+        }
+}
+
+
+}