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

Timestamp:

02/18/06 18:02:12 (18 years ago)

Author:

mattausch

Message:

exporting / loading full merge hierarchy

File:

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

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

@@ -1262 +1262 @@
 
         int totalPvs;
-        float totalRenderCost, float avgRenderCost, float expectedCost;
+        float totalRenderCost, avgRenderCost, expectedCost;
 
         float deviation = 0;
@@ -1270 +1270 @@
         ofstream stats;
         stats.open("mergeStats.log");
-
-        Debug << "here343" << endl;
 
         stats 
@@ -1347 +1345 @@
 
 
-/*float ViewCellsTree::ComputeVolume(ViewCell *vc)
+#if 0
+float ViewCellsTree::ComputeVolume(ViewCell *vc)
 {
         if (vc->IsLeaf())
@@ -1369 +1368 @@
                 return volume;
         }
-}*/
-
+}
+#endif
 
 void ViewCellsTree::SetRoot(ViewCell *root)
@@ -1621 +1620 @@
 
 
-void ViewCellsTree::PropagateUpPvs(ViewCell *vc)
+void ViewCellsTree::PropagatePvs(ViewCell *vc)
 {
         while (vc->GetParent())
@@ -1627 +1626 @@
                 vc->GetParent()->GetPvs().Merge(vc->GetPvs());
                 vc = vc->GetParent();
+        }
+
+        if (vc->IsLeaf())
+                return;
+
+        stack<ViewCell *> tstack;
+
+        tstack.push(vc);
+
+        while (!tstack.empty())
+        {
+                ViewCell *viewCell = tstack.top();
+                tstack.pop();
+
+                if (viewCell != vc)
+                {
+                        viewCell->GetPvs().Merge(vc->GetPvs());
+                }
+
+                if (!viewCell->IsLeaf())
+                {
+                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(viewCell);
+                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+
+                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        {
+                                tstack.push(*it);
+                        }
+                }
         }
 }
@@ -1727 +1755 @@
 
 
+void ViewCellsTree::CreateUniqueViewCellsIds()
+{
+        stack<ViewCell *> tstack;
+
+        int currentId = 0;
+
+        tstack.push(mRoot);
+
+        while (!tstack.empty())
+        {
+                ViewCell *vc = tstack.top();
+                tstack.pop();
+
+                vc->SetId(currentId ++);
+
+                if (!vc->IsLeaf())
+                {
+                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        {
+                                tstack.push(*it);
+                        }
+                }
+        }
+}
+
+
 void ViewCellsTree::ExportViewCell(ViewCell *viewCell, ofstream &stream)
 {
         ObjectPvsMap::iterator it, it_end = viewCell->GetPvs().mEntries.end();
-
-        if (0) // test with empty pvs
-        for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
-        {
-                stream << (*it).first->GetId() << " ";
-        }
-
-        stream << "\" />" << endl;
 
         if (viewCell->IsLeaf())
@@ -1746 +1794 @@
                 stream << "mergecost=\"" << viewCell->GetMergeCost() << "\" ";
                 stream << "pvs=\"";
-                stream << "</Leaf>" << endl;
+                if (0)// test with empty pvs
+                        for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
+                        {
+                                stream << (*it).first->GetId() << " ";
+                        }
+
+        
+                stream << "\" />" << endl;
+                //stream << " </Leaf>" << endl;
         }
         else
@@ -1757 +1813 @@
                 stream << "mergecost=\"" << viewCell->GetMergeCost() << "\" ";
                 stream << "pvs=\"";
+
+                if (0)// test with empty pvs
+                        for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
+                        {
+                                stream << (*it).first->GetId() << " ";
+                        }
+
+                stream << "\" >" << endl;
 
                 ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();