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

Timestamp:

11/24/06 00:24:41 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -29 +29 @@
 #define USE_FIXEDPOINT_T 0
 
-
+#define STUPID_METHOD 0
 
 /*******************************************************************/
@@ -1787 +1787 @@
                 // hack for choosing which node to account for
                 if (intersect->IsLeaf())
+                {
                         activeNode = dynamic_cast<BvhLeaf *>(intersect)->GetActiveNode();
+                }
                 else
+                {
                         activeNode = intersect;
+                }
 
                 if (!activeNode->Mailed())
@@ -1795 +1799 @@
                         activeNode->Mail();
 
+#if STUPID_METHOD
+
                         ObjectContainer objects;
-                        activeNode->CollectObjects(objects);
-
+            activeNode->CollectObjects(objects);
+                        rc += mBvHierarchy->EvalAbsCost(objects);
+#else
+                        rc += mBvHierarchy->GetRenderCostIncrementially(activeNode);
+#endif
                         ++ pvsEntries;
-                        rc += mBvHierarchy->EvalAbsCost(objects);
                 }
         }
@@ -1810 +1818 @@
         ////////////////
         //-- pvs is not stored with the interiors => reconstruct
-        ViewCell *root = vc;
         
         // add pvs from leaves
@@ -1824 +1831 @@
                 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();
@@ -1836 +1846 @@
                         }               
                 }
-        }
-}
+                else cout <<"k";
+        }
+}
+
+
+// TODO matt: implement this function for different storing methods
+void HierarchyManager::PullUpPvsIncrementally(ViewCell *viewCell) const
+{
+        ////////////////
+        //-- pvs is not stored with the interiors => reconstruct
+        
+        // early exit: pvs is already pulled up to this view cell
+        if (!viewCell->GetPvs().Empty())
+                return;
+
+        // add pvs from leaves
+        stack<ViewCell *> tstack;
+        tstack.push(viewCell);
+
+        ViewCell *vc = viewCell;
+
+        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 " << viewCell->GetPvs().GetSize();
+                        else cout << " i " << viewCell->GetPvs().GetSize();
+                        */
+                                viewCell->GetPvs().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);
+                        }               
+                }
+        }
+}
+
+
+
+// TODO matt: implement this function for different storing methods
+void HierarchyManager::GetPvsRecursive(ViewCell *vc, ObjectPvs &pvs) const
+{
+        ////////////////
+        //-- pvs is not stored with the interiors => reconstruct
+        if (vc->IsLeaf() || !vc->GetPvs().Empty())
+        {
+                pvs = vc->GetPvs();
+        }
+        else
+        {
+                ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+#if 0
+                ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+                const int childPvsSize = (int)interior->mChildren.size();
+                vector<ObjectPvs> childPvs;
+                childPvs.resize((int)interior->mChildren.size());
+
+                int i = 0;
+                for (it = interior->mChildren.begin(); it != it_end; ++ it, ++ i)
+                {
+                        GetPvsRecursive(*it, childPvs[i]);
+                        pvs.MergeInPlace(childPvs[i]);
+                }
+#else
+
+                ObjectPvs leftPvs, rightPvs;
+
+                GetPvsRecursive(interior->mChildren[0], leftPvs);
+                GetPvsRecursive(interior->mChildren[1], rightPvs);
+
+                ObjectPvs::Merge(pvs, leftPvs, rightPvs);
+#endif
+        }
+}
+
 
 int HierarchyManager::ExtractStatistics(const int maxSplits,
@@ -1868 +1963 @@
         ViewCell::NewMail();
 
+        cout << "\n**************viewcells: " << viewCells.size() << endl;
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
                 ViewCell *vc = *vit;
 
+                //cout << "\nhere5: ";
                 float rc = 0;
-        ObjectPvs pvs;
-                
-                //mVspTree->mViewCellsTree->GetPvs(vc, pvs);
+        
+#if STUPID_METHOD       
+                ObjectPvs pvs;
                 GetPvsIncrementally(vc, pvs);
-                
                 vc->SetPvs(pvs);
+#else
+                //PullUpPvsIncrementally(vc);
+                ObjectPvs pvs;
+                GetPvsRecursive(vc, pvs);
+                vc->SetPvs(pvs);
+#endif
 
                 vc->Mail();
@@ -1884 +1986 @@
                 if (useFilter)
                 {
+                        const long startT = GetTime();
                         ObjectPvs filteredPvs;
                         mVspTree->mViewCellsManager->ApplyFilter2(vc, false, 1.0f, filteredPvs);
+                        const long endT = GetTime();
+
+                        cout << "filter computed in " << TimeDiff(startT, endT) * 1e-3f << " secs" << endl;
                         ComputePvs(filteredPvs, rc, pvsEntries);
                 }
                 else
                 {
-                        ComputePvs(pvs, rc, pvsEntries);
+                        ComputePvs(vc->GetPvs(), rc, pvsEntries);
                 }
 
@@ -1915 +2021 @@
         }
 
+        // store current level
         mOldViewCells = viewCells;
 
@@ -2098 +2205 @@
         vector<HierarchySubdivisionStats> subStatsContainer;
 
-        int splits = (1 + mHierarchyStats.Leaves() / splitsStepSize) * splitsStepSize;
+        int splits = (1 + (mHierarchyStats.Leaves() - 1) / splitsStepSize) * splitsStepSize;
         cout << "splits: " << splits << endl;
 
@@ -2133 +2240 @@
                 
                 if (splits == 0)
+                {
                         break;
-
+                }
                 splits -= splitsStepSize;
 
-                cout << subStats.mNumSplits << " ";
+                cout << "splits: " << subStats.mNumSplits << " ";
         }