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

Timestamp:

11/13/06 23:41:00 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -737 +737 @@
 
         if (sc->IsDirty())
-                cout << "*******************************error!" << endl;
+                cerr << "Error: Should never come here!" << endl;
 
         if (!success) // split was not taken
         {
-                cout << "x";
                 return false;
         }
@@ -988 +987 @@
                 if ((steps >= maxSteps) || ((priority < threshold) && !(steps < minSteps)))
                 {
-                        cout << "\n**************** breaking on " << priority 
-                                 << " smaller than " << threshold << endl;
+                        cout << "\nbreaking on " << priority << " smaller than " << threshold << endl;
                         break;
                 }
@@ -1831 +1829 @@
 
 
+void HierarchyManager::ComputePvs(const ObjectPvs &pvs, float &rc, int &pvsEntries)
+{
+        BvhNode::NewMail();
+
+        ObjectPvsIterator pit = pvs.GetIterator();
+
+        while (pit.HasMoreEntries())
+        {
+                ObjectPvsEntry entry = pit.Next();
+
+                BvhIntersectable *intersect = dynamic_cast<BvhIntersectable *>(entry.mObject);
+
+                BvhLeaf *leaf = intersect->GetItem();
+                BvhNode *activeNode = leaf->GetActiveNode();
+
+                if (!activeNode->Mailed())
+                {
+                        activeNode->Mail();
+
+                        ObjectContainer objects;
+                        activeNode->CollectObjects(objects);
+
+                        ++ pvsEntries;
+                        rc += mBvHierarchy->EvalAbsCost(objects);
+                        //cout << " pvs: " << mBvHierarchy->EvalAbsCost(leaf->mObjects);
+                }
+        }
+}
+
+
 int HierarchyManager::ExtractStatistics(const int maxSplits,
                                                                                 const float maxMemoryCost,
@@ -1837 +1865 @@
                                                                                 int &pvsEntries,
                                                                                 int &viewSpaceSplits,
-                                                                                int &objectSpaceSplits)
+                                                                                int &objectSpaceSplits,
+                                                                                const bool useFilter)
 {
         ViewCellContainer viewCells;
@@ -1858 +1887 @@
         renderCost = 0.0f;
 
-        //BvhNode::NewMail();
-        //int dummy = 0;
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
                 float rc = 0;
                 ViewCell *vc = *vit;
+
                 ObjectPvs pvs;
                 mVspTree->mViewCellsTree->GetPvs(vc, pvs);
-                //dummy+=pvs.GetSize();
-                BvhNode::NewMail();
-
-                // hack: should not be done here
-                ObjectPvsIterator pit = pvs.GetIterator();
-
-                while (pit.HasMoreEntries())
-                {
-                        ObjectPvsEntry entry = pit.Next();
-
-                        BvhIntersectable *intersect = dynamic_cast<BvhIntersectable *>(entry.mObject);
-
-                        BvhLeaf *leaf = intersect->GetItem();
-                        BvhNode *activeNode = leaf->GetActiveNode();
-
-                        if (!activeNode->Mailed())
-                        {
-                                activeNode->Mail();
-
-                                ObjectContainer objects;
-                                activeNode->CollectObjects(objects);
-
-                                ++ pvsEntries;
-                                rc += mBvHierarchy->EvalAbsCost(objects);
-                                //cout << " pvs: " << mBvHierarchy->EvalAbsCost(leaf->mObjects);
-                        }
-                }
+
+                if (useFilter)
+                {
+                        ObjectPvs filteredPvs;
+                        mVspTree->mViewCellsManager->ApplyFilter2(vc, false, 1.0f, filteredPvs);
+                        ComputePvs(filteredPvs, rc, pvsEntries);
+                }
+                else
+                {
+                        ComputePvs(pvs, rc, pvsEntries);
+                }               
 
                 rc *= vc->GetVolume();
@@ -2082 +2094 @@
 
 void HierarchyManager::EvaluateSubdivision2(ofstream &splitsStats,
-                                                                                        const int splitsStepSize)
+                                                                                        const int splitsStepSize,
+                                                                                        const bool useFilter)
 {
         HierarchySubdivisionStats subStats;
@@ -2096 +2109 @@
                                                                                                 subStats.mEntriesInPvs,
                                                                                                 subStats.mViewSpaceSplits,
-                                                                                                subStats.mObjectSpaceSplits);
+                                                                                                subStats.mObjectSpaceSplits,
+                                                                                                useFilter);
 
                 
@@ -2123 +2137 @@
                 cout << subStats.mNumSplits << " ";
         }
+
         cout << endl;
 }