Changeset 1787 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

11/24/06 12:05:28 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -1813 +1813 @@
 
 
-// TODO matt: implement this function for different storing methods
-void HierarchyManager::GetPvsIncrementally(ViewCell *vc, ObjectPvs &pvs) const
+void HierarchyManager::GetPvsEfficiently(ViewCell *viewCell, ObjectPvs &pvs) const
 {
         ////////////////
@@ -1821 +1820 @@
         // add pvs from leaves
         stack<ViewCell *> tstack;
-        tstack.push(vc);
+        tstack.push(viewCell);
+
+        Intersectable::NewMail();
 
         while (!tstack.empty())
         {
-                vc = tstack.top();
+                ViewCell *vc = tstack.top();
                 tstack.pop();
         
@@ -1831 +1832 @@
                 if (!vc->GetPvs().Empty())
                 {
-                        if (vc->IsLeaf()) cout << " l " << pvs.GetSize();
-                        else cout << " i " << pvs.GetSize();
-                        pvs.MergeInPlace(vc->GetPvs());
+                        ObjectPvsIterator pit = vc->GetPvs().GetIterator();
+
+                        while (pit.HasMoreEntries())
+                        {               
+                                const ObjectPvsEntry &entry = pit.Next();
+
+                                Intersectable *object = entry.mObject;
+                                if (!object->Mailed())
+                                {
+                                        object->Mail();
+                                        pvs.AddSampleDirty(object, 1.0f);
+                                }
+                        }
                 }
                 else if (!vc->IsLeaf()) // interior cells: go down to leaf level
                 {
-                        cout <<" t";
                         ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
@@ -1846 +1856 @@
                         }               
                 }
+        }
+}
+
+
+// TODO matt: implement this function for different storing methods
+void HierarchyManager::GetPvsIncrementially(ViewCell *vc, ObjectPvs &pvs) const
+{
+        ////////////////
+        //-- pvs is not stored with the interiors => reconstruct
+        
+        // add pvs from leaves
+        stack<ViewCell *> tstack;
+        tstack.push(vc);
+
+        while (!tstack.empty())
+        {
+                vc = tstack.top();
+                tstack.pop();
+        
+                // add newly found pvs to merged pvs: break here even for interior
+                if (!vc->GetPvs().Empty())
+                {
+                        //if (vc->IsLeaf()) cout << " l " << pvs.GetSize();
+                        //else cout << " i " << pvs.GetSize();
+                        pvs.MergeInPlace(vc->GetPvs());
+                }
+                else if (!vc->IsLeaf()) // interior cells: go down to leaf level
+                {
+                        //cout <<" t";
+                        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);
+                        }               
+                }
                 else cout <<"k";
         }
@@ -1875 +1922 @@
                 if (!vc->GetPvs().Empty())
                 {
-                        /*if (vc->IsLeaf()) 
-                                cout << " l " << viewCell->GetPvs().GetSize();
-                        else cout << " i " << viewCell->GetPvs().GetSize();
-                        */
-                                viewCell->GetPvs().MergeInPlace(vc->GetPvs());
+                        viewCell->GetPvs().MergeInPlace(vc->GetPvs());
                 }
                 else if (!vc->IsLeaf()) // interior cells: go down to leaf level
@@ -1963 +2006 @@
         ViewCell::NewMail();
 
-        cout << "\n**************viewcells: " << viewCells.size() << endl;
+        //cout << "\nviewcells: " << viewCells.size() << endl;
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
                 ViewCell *vc = *vit;
-
-                //cout << "\nhere5: ";
                 float rc = 0;
         
 #if STUPID_METHOD       
                 ObjectPvs pvs;
-                GetPvsIncrementally(vc, pvs);
+                GetPvsIncrementially(vc, pvs);
                 vc->SetPvs(pvs);
+                
 #else
-                //PullUpPvsIncrementally(vc);
+        
                 ObjectPvs pvs;
-                GetPvsRecursive(vc, pvs);
-                vc->SetPvs(pvs);
+                //GetPvsRecursive(vc, pvs);
+                
+                // uses mailing
+                // warning: pvs not sorted!!
+                if (vc->GetPvs().Empty())
+                {
+                        GetPvsEfficiently(vc, pvs);
+                        vc->SetPvs(pvs);
+                        //cout << "q";
+                }
+                //else cout << "t";
 #endif
 
@@ -1991 +2042 @@
                         const long endT = GetTime();
 
-                        cout << "filter computed in " << TimeDiff(startT, endT) * 1e-3f << " secs" << endl;
+                        //cout << "filter computed in " << TimeDiff(startT, endT) * 1e-3f << " secs" << endl;
                         ComputePvs(filteredPvs, rc, pvsEntries);
                 }