Changeset 710 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

Timestamp:

03/20/06 00:11:27 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (7 diffs)

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

@@ -560 +560 @@
                 mMergeQueue.pop();
         
-                // both view cells equal
+                // both view cells equal because of previous merges
                 // NOTE: do I really still need this? probably cannot happen!!
                 if (mc.mLeftViewCell == mc.mRightViewCell)
@@ -579 +579 @@
                         totalRenderCost += renderCostIncr;
                         mDeviation += mc.GetDeviationIncr();
-                        
-                        
-                        // merge the view cells of leaf1 and leaf2
+
+                                                
+                        //-- merge the view cells of leaf1 and leaf2
                         int pvsDiff;
                         ViewCellInterior *mergedVc = 
                                 MergeViewCells(mc.mLeftViewCell, mc.mRightViewCell, pvsDiff);
-
+                        
 
                         // total render cost and deviation has changed
@@ -641 +641 @@
                 
                 ViewCellInterior *root = mViewCellsManager->MergeViewCells(activeViewCells);
+        
+                ViewCellContainer::const_iterator it, it_end = root->mChildren.end();
+
+                for (it = root->mChildren.begin(); it != it_end; ++ it)
+                        (*it)->SetParent(root);
+        
                 root->SetMergeCost(totalRenderCost);
                 // $$JB keep this 0 temporarilly
@@ -647 +653 @@
                 mRoot = root;
         }
-        else if ((int)activeViewCells.size() == 1)
+        // normal case
+        else if (!activeViewCells.empty())
         {
                 Debug << "setting root of the merge history" << endl;
                 mRoot = activeViewCells[0];
+                Debug << "rootvc volume: " << mRoot->GetVolume() << endl;
         }
         
@@ -742 +750 @@
 
                 // all merged view cells have been found
-                if (i >= viewCells.size()) 
+                if (i >= (int)viewCells.size()) 
                         break;
 
-                // already merged view cell, put it to end of vector
+                // already merged this view cell, put it to end of vector
                 if (viewCells[i]->GetParent())
                         swap(viewCells[i], viewCells.back());
                 
-                viewCells[i ++]->Mail();
+                // mail view cell as it has not been merged
+                viewCells[i]->Mail();
+
+                // increase loop counter
+                ++ i;
         }
 
@@ -847 +859 @@
         if (!vc) return NULL;
 
+        l->SetParent(vc);
+        r->SetParent(vc);
+
         // set new size of view cell
         if (mUseAreaForPvs)
+        {
                 vc->SetArea(l->GetArea() + l->GetArea());
+        }
         else
         {
                 vc->SetVolume(r->GetVolume() + l->GetVolume());
         }
+
+        
         // important so other merge candidates sharing this view cell
         // are notified that the merge cost must be updated!!
@@ -957 +976 @@
         return shuffledViewCells;
 }
-
-