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

Timestamp:

11/10/06 22:15:56 (18 years ago)

Author:

mattausch

Message:

exchanged pvs implementation: using vectors instead of maps

File:

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

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

@@ -64 +64 @@
         for (it = vc->GetPvs().mEntries.begin(); it != it_end; ++ it)
         {
-                if (!(*it).first->Mailed())
-                {
-                        (*it).first->Mail();
+                if (!(*it).mObject->Mailed())
+                {
+                        (*it).mObject->Mail();
                         ++ count;
                 }
@@ -88 +88 @@
         for (it = pvs1.mEntries.begin(); it != it_end; ++ it)
         {
-                (*it).first->Mail();
+                (*it).mObject->Mail();
         }
 
@@ -96 +96 @@
         for (it = pvs2.mEntries.begin(); it != it_end; ++ it)
         {
-                Intersectable *obj = (*it).first;
+                Intersectable *obj = (*it).mObject;
                 if (!obj->Mailed())
                         ++ pvs;
@@ -837 +837 @@
         for (it = pvs1.mEntries.begin(); it != it_end; ++ it)
         {
-                Intersectable *obj = (*it).first;
+                Intersectable *obj = (*it).mObject;
 
                 obj->Mail();
@@ -848 +848 @@
         for (it = pvs2.mEntries.begin(); it != it_end; ++ it)
         {
-                Intersectable *obj = (*it).first;
+                Intersectable *obj = (*it).mObject;
 
                 // test if object already considered    
@@ -1152 +1152 @@
 inline int AddedPvsSize(ObjectPvs pvs1, const ObjectPvs &pvs2)
 {
-        return pvs1.AddPvs(pvs2);
+        ObjectPvs interPvs;
+        ObjectPvs::Merge(interPvs, pvs1, pvs2);
+
+        return (int)interPvs.GetSize();
 }
 
@@ -1242 +1245 @@
         // TODO change
         vc1->GetPvs().SubtractPvs(leaf->GetPvs());
-        vc2->GetPvs().AddPvs(leaf->GetPvs());
-        
+        
+        ObjectPvs interPvs;
+        ObjectPvs::Merge(interPvs, vc2->GetPvs(), leaf->GetPvs());
+        vc2->SetPvs(interPvs);
+
         if (mUseAreaForPvs)
         {
@@ -1651 +1657 @@
                 for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
                 {
-                        Intersectable *obj = (*oit).first;
+                        Intersectable *obj = (*oit).mObject;
                         if ((cit == interior->mChildren.begin()) && !obj->Mailed())
                                 obj->Mail();
@@ -1673 +1679 @@
                 for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
                 {               
-                        if ((*oit).first->Mailed((int)interior->mChildren.size()))
+                        if ((*oit).mObject->Mailed((int)interior->mChildren.size()))
                         {       
-                                interior->GetPvs().AddSample((*oit).first, (*oit).second.mSumPdf);
+                                interior->GetPvs().AddSample((*oit).mObject, (*oit).mData.mSumPdf);
                         }
                 }
@@ -1688 +1694 @@
                 for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
                 {
-                        if (!(*cit)->GetPvs().RemoveSample((*oit).first, Limits::Infinity))
+                        if (!(*cit)->GetPvs().RemoveSample((*oit).mObject, Limits::Infinity))
                         {
                                 Debug << "should not come here!" << endl;
@@ -1717 +1723 @@
         {
                 root = root->GetParent();
-                pvs.AddPvs(root->GetPvs());
+                pvs.MergeInPlace(root->GetPvs());
         }
 
@@ -1730 +1736 @@
 
                 // add newly found pvs to merged pvs
-                pvs.AddPvs(vc->GetPvs());
+                ObjectPvs interPvs;
+                pvs.MergeInPlace(vc->GetPvs());
 
                 if (!vc->IsLeaf()) // interior cells: go down to leaf level
@@ -1779 +1786 @@
                 for (oit = (*it)->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
                 {
-                        Intersectable *intersect = (*oit).first;
+                        Intersectable *intersect = (*oit).mObject;
 
                         if (!intersect->Mailed())
                         {
                                 intersect->Mail();
-                                newPvs.AddSample(intersect, (*oit).second.mSumPdf);
+                                newPvs.AddSample(intersect, (*oit).mData.mSumPdf);
                         }
                 }
@@ -1829 +1836 @@
                 for (oit = (*it)->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
                 {
-                        Intersectable *intersect = (*oit).first;
+                        Intersectable *intersect = (*oit).mObject;
 
                         if (!intersect->Mailed())
@@ -2050 +2057 @@
 
 
-void ViewCellsTree::PropagatePvs(ViewCell *vc)
+void ViewCellsTree::PropagatePvs(ViewCell *root)
 {       
-        ViewCell *viewCell = vc;
+        ViewCell *viewCell = root;
 
         // propagate pvs up
         while (viewCell->GetParent())
         {
-                viewCell->GetParent()->GetPvs().Merge(vc->GetPvs());
+                ObjectPvs mergedPvs;
+                viewCell->GetParent()->GetPvs().MergeInPlace(root->GetPvs());
+
                 viewCell = viewCell->GetParent();
         }
 
-        if (vc->IsLeaf())
+        if (root->IsLeaf())
                 return;
 
         // propagate pvs to the leaves
         stack<ViewCell *> tstack;
-        tstack.push(vc);
+        tstack.push(root);
 
         while (!tstack.empty())
@@ -2073 +2082 @@
                 tstack.pop();
 
-                if (viewCell != vc)
-                {
-                        viewCell->GetPvs().Merge(vc->GetPvs());
+                if (viewCell != root)
+                {
+                        viewCell->GetPvs().MergeInPlace(root->GetPvs());
                 }
 
@@ -2105 +2114 @@
                 tqueue.pop();
 
-                // save the view cells if it is a leaf or if enough view cells have already been traversed
-                // because of the priority queue, this will be the optimal set of v
+                // save the view cells if it is a leaf or if enough view cells 
+                // have already been traversed because of the priority queue, 
+                // this will be the optimal set of v
                 if (!vc->IsLeaf()) 
                 {       
@@ -2343 +2353 @@
         for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
         {
-                Intersectable *obj = (*it).first;
+                Intersectable *obj = (*it).mObject;
                 // hack: just output full pvs
                 if (obj->Type() == Intersectable::BVH_INTERSECTABLE)
@@ -2359 +2369 @@
                 else
                 {
-                        stream << (*it).first->GetId() << " ";
+                        stream << (*it).mObject->GetId() << " ";
                 }
         }