Changeset 590 for trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

Timestamp:

02/04/06 21:36:40 (18 years ago)

Author:

mattausch

Message:

implemented some code for merge history loading

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (15 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -17 +17 @@
 #include "ViewCellsManager.h"
 #include "Beam.h"
+
 
 //-- static members
@@ -1741 +1742 @@
 void VspBspTree::CollapseViewCells()
 {
+// TODO
+#if VC_HISTORY
         stack<BspNode *> nodeStack;
 
@@ -1762 +1765 @@
         
                                 ViewCellContainer leaves;
-                                mViewCellsManager->GetViewCellsTree()->CollectLeaves(viewCell, leaves);
+                                mViewCellsTree->CollectLeaves(viewCell, leaves);
 
                                 ViewCellContainer::const_iterator it, it_end = leaves.end();
@@ -1788 +1791 @@
 
         Debug << "invalid leaves: " << mBspStats.invalidLeaves << endl;
+#endif
 }
 
@@ -1855 +1859 @@
                         if (!onlyValid || node->TreeValid())
                         {
-                                ViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
-                        
+                                ViewCell *viewCell = 
+                                        mViewCellsTree->GetActiveViewCell(dynamic_cast<BspLeaf *>(node)->GetViewCell());
+                                                
                                 if (!onlyUnmailed || !viewCell->Mailed()) 
                                 {
@@ -1872 +1877 @@
                 }
         }
+
 }
 
@@ -2058 +2064 @@
 {
         ViewCellContainer leaves;
-        mViewCellsManager->GetViewCellsTree()->CollectLeaves(vc, leaves);
+        
+        mViewCellsTree->CollectLeaves(vc, leaves);
 
         ViewCellContainer::const_iterator it, it_end = leaves.end();
@@ -2065 +2072 @@
         {
                 BspLeaf *l = dynamic_cast<BspViewCell *>(*it)->mLeaf;
+                
                 ConstructGeometry(l, vcGeom);
         }
@@ -2433 +2441 @@
                         BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
 
-                        if (!leaf->GetViewCell()->Mailed())
-                        {
-                                viewcells.push_back(leaf->GetViewCell());
-                                leaf->GetViewCell()->Mail();
+                        ViewCell *viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
+                        if (!viewCell->Mailed())
+                        {
+                                viewcells.push_back(viewCell);
+                                viewCell->Mail();
                                 ++ hits;
                         }
@@ -2497 +2506 @@
 BspNode *VspBspTree::CollapseTree(BspNode *node, int &collapsed)
 {
+// TODO
+#if VC_HISTORY
         if (node->IsLeaf())
                 return node;
@@ -2530 +2541 @@
                 }
         }
-
+#endif
         return node;
 }
@@ -2551 +2562 @@
 void VspBspTree::RepairViewCellsLeafLists()
 {
+// TODO
+#if VC_HISTORY
         // list not valid anymore => clear
         stack<BspNode *> nodeStack;
@@ -2567 +2580 @@
 
                         BspViewCell *viewCell = leaf->GetViewCell();
-        // TODO
-#if VC_HISTORY
+
                         if (!viewCell->Mailed())
                         {
@@ -2576 +2588 @@
         
                         viewCell->mLeaves.push_back(leaf);
+
+                }
+                else
+                {
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+
+                        nodeStack.push(interior->GetFront());
+                        nodeStack.push(interior->GetBack());
+                }
+        }
 // TODO
 #endif
-                }
-                else
-                {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
-
-                        nodeStack.push(interior->GetFront());
-                        nodeStack.push(interior->GetBack());
-                }
-        }
 }
 
@@ -2929 +2942 @@
         {
                 BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
-                        
+                ViewCell *viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
+
                 int id = -1;
-                if (leaf->GetViewCell() != mOutOfBoundsCell)
-                        id = leaf->GetViewCell()->GetId();
+                if (viewCell != mOutOfBoundsCell)
+                        id = viewCell->GetId();
 
                 stream << "<Leaf viewCellId=\"" << id << "\" />" << endl;