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

Timestamp:

02/01/07 14:42:05 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -3655 +3655 @@
 
         ///////////
-        //-- faster way of computing pvs:
-        //-- construct merged pvs by adding
-        //-- and only those of the next pvs which were not mailed.
-        //-- note: sumpdf is not correct!!
+        //-- merge pvss
 
         vector<ObjectPvs>::iterator oit = pvsList.begin();
@@ -3666 +3663 @@
                 ObjectPvsIterator pit = (*oit).GetIterator();
                 
-                // first mark all object from this pvs
+                // add pvss to new pvs: use mailing to avoid adding entries two times.
                 while (pit.HasMoreEntries())
                 {               
@@ -3677 +3674 @@
                                 intersect->Mail();
 
-                                if (pvs.AddSampleDirtyCheck(intersect, entry.mData.mSumPdf))
-                                {
-                                        if (pvs.RequiresResort())
-                                        {
-                                                pvs.SimpleSort();
-                                        }
-                                }
-                                
+                                pvs.AddSampleDirty(intersect, entry.mData.mSumPdf);
                         }
                 }
         }
+
+        if (0) pvs.Sort();
 
         // store pvs in this node
@@ -3699 +3691 @@
         
 #else 
-        // really merge cells: slow put sumPdf is correct
+        // really merge cells: slow but sumPdf is correct
         viewCellInterior->GetPvs().Merge(backVc->GetPvs());
         viewCellInterior->GetPvs().Merge(frontVc->GetPvs());