Changeset 1143 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

07/19/06 18:31:33 (18 years ago)

Author:

mattausch

Message:

worked on vsp osp tree

File:

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

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

@@ -2217 +2217 @@
 
 
-
-
 void
 ViewCellsManager::ApplyFilter(ViewCell *viewCell,
@@ -4257 +4255 @@
                         }
 
-                        const int maxDepth = mVspBspTree->mBspStats.maxDepth;
+                        const int maxDepth = mVspBspTree->GetStatistics().maxDepth;
 
                         ViewCellContainer::const_iterator vit, vit_end = mViewCells.end();
@@ -4904 +4902 @@
         long startTime;
 
-        //mHierarchyManager->Construct(constructionRays, objects, &mViewSpaceBox);
-        //mHierarchyManager->Construct2(constructionRays, objects, &mViewSpaceBox);
-        mHierarchyManager->Construct3(constructionRays, objects, &mViewSpaceBox);
-
-        //-- stats
+        if (!mOspTree->GetRoot())
+        {
+                cout << "constructing vsp and osp tree" << endl;
+                //mHierarchyManager->Construct(constructionRays, objects, &mViewSpaceBox);
+                mHierarchyManager->Construct2(constructionRays, objects, &mViewSpaceBox);
+        }
+        else // just build view space partition tree
+        {
+                cout << "constructing only vsp tree" << endl;
+                mHierarchyManager->Construct3(constructionRays, objects, &mViewSpaceBox);
+        }
+
+        // print subdivision statistics
         Debug << mVspTree->GetStatistics() << endl;
 
+        // print view cell statistics
         ResetViewCells();
         Debug << "\nView cells after construction:\n" << mCurrentViewCellsStats << endl;