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

Timestamp:

03/22/06 14:15:07 (18 years ago)

Author:

bittner

Message:

visibility filter used in glrenderer

File:

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

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

@@ -615 +615 @@
                 neighborhood.pop_back();
         
-                //cout << "vc idx: " << bestViewCellIdx << endl;
+                //              cout << "vc idx: " << bestViewCellIdx << endl;
                 if (!bestViewCell || !root)
                         cout << "warning!!" << endl;
@@ -627 +627 @@
 
 
+struct SortableViewCellEntry {
+
+  SortableViewCellEntry() {}
+  SortableViewCellEntry(const float v, ViewCell *cell):mValue(v), mViewCell(cell) {}
+  
+  float mValue;
+  ViewCell *mViewCell;
+
+  friend bool operator<(const SortableViewCellEntry &a, const SortableViewCellEntry &b) {
+        return a.mValue < b.mValue;
+  }
+};
+
+ViewCell *
+ViewCellsManager::ConstructLocalMergeTree2(ViewCell *currentViewCell, 
+                                                                                   const ViewCellContainer &viewCells)
+{
+  
+  vector<SortableViewCellEntry> neighborhood(viewCells.size());
+  int i, j;
+  for (i = 0, j = 0; i < viewCells.size(); i++) {
+        if (viewCells[i] != currentViewCell) 
+          neighborhood[j++] = SortableViewCellEntry(
+                                                                                                EvalMergeCost(currentViewCell, viewCells[i]),
+                                                                                                viewCells[i]);
+  }
+  neighborhood.resize(j);
+  
+  sort(neighborhood.begin(), neighborhood.end());
+  
+  ViewCell *root = currentViewCell;
+  
+  vector<SortableViewCellEntry>::const_iterator it, it_end = neighborhood.end();
+  
+  const int n = min(mMaxFilterSize, (int)neighborhood.size());
+  //-- use priority queue to merge leaf pairs
+  
+  //cout << "neighborhood: " << neighborhood.size() << endl;
+  for (int nMergedViewCells = 0; nMergedViewCells < n; ++ nMergedViewCells)
+        {
+          ViewCell *bestViewCell = neighborhood[nMergedViewCells].mViewCell;
+          //cout <<nMergedViewCells<<":"<<"homogenity=" <<neighborhood[nMergedViewCells].mValue<<endl;
+          // create new root of the hierarchy
+          root = MergeViewCells(root, bestViewCell);
+          // set negative cost so that this view cell gets deleted
+          root->SetMergeCost(-1.0f);
+        }
+  
+  return root;  
+}
+
+void
+ViewCellsManager::DeleteLocalMergeTree(ViewCell *vc
+                                                                           ) const
+{
+  if (!vc->IsLeaf() && vc->GetMergeCost() < 0.0f) {
+        ViewCellInterior *vci = (ViewCellInterior *) vc;
+        ViewCellContainer::const_iterator it, it_end = vci->mChildren.end();
+        
+        for (it = vci->mChildren.begin(); it != it_end; ++ it)
+          DeleteLocalMergeTree(*it);
+        vci->mChildren.clear();
+        delete vci;
+  }
+}
+
 bool ViewCellsManager::CheckValidity(ViewCell *vc,
                                                                          int minPvsSize,
@@ -672 +738 @@
         ComputeBoxIntersections(box, viewCells);
 
-        ViewCell *root = ConstructLocalMergeTree(currentViewCell, viewCells);
+        ViewCell *root = ConstructLocalMergeTree2(currentViewCell, viewCells);
 
         prvs.mViewCell = root;