Changeset 1576 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

Timestamp:

10/05/06 18:51:15 (18 years ago)

Author:

mattausch

Message:

added measurement for pvs entries size decrease during subdivision

File:

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

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

@@ -369 +369 @@
 
     // how often was max cost ratio missed in this branch?
-        frontData.mMaxCostMisses = sc.mMaxCostMisses;
-        backData.mMaxCostMisses = sc.mMaxCostMisses;
+        frontData.mMaxCostMisses = sc.GetMaxCostMisses();
+        backData.mMaxCostMisses = sc.GetMaxCostMisses();
         
         // assign the objects in sorted order
@@ -475 +475 @@
         const bool maxCostRatioViolated = mTermMaxCostRatio < ratio;
 
-        splitCandidate.mMaxCostMisses = maxCostRatioViolated ? 
+        splitCandidate.SetMaxCostMisses(maxCostRatioViolated ? 
                 splitCandidate.mParentData.mMaxCostMisses + 1 :
-                splitCandidate.mParentData.mMaxCostMisses;
+                splitCandidate.mParentData.mMaxCostMisses);
 
         const float oldProp = EvalViewCellsVolume(leaf->mObjects);
@@ -488 +488 @@
 
         const float renderCostDecr = oldRenderCost - newRenderCost;
+        const int pvsEntriesIncr = EvalPvsEntriesIncr(splitCandidate);
 
 #ifdef _DEBUG
@@ -494 +495 @@
         Debug << "render cost decrease: " << renderCostDecr << endl;
 #endif
+
         splitCandidate.SetRenderCostDecrease(renderCostDecr);
+        splitCandidate.SetPvsEntriesIncr(EvalPvsEntriesIncr(splitCandidate));
 
 #if 1
@@ -510 +513 @@
 
 
+int BvHierarchy::EvalPvsEntriesIncr(BvhSubdivisionCandidate &splitCandidate) const
+{
+        const int oldPvsSize = CountViewCells(splitCandidate.mParentData.mNode->mObjects);
+        
+        const int fPvsSize = CountViewCells(splitCandidate.mFrontObjects);
+        const int bPvsSize = CountViewCells(splitCandidate.mBackObjects);
+
+        return fPvsSize + bPvsSize - oldPvsSize;
+}
+
+
 inline bool BvHierarchy::LocalTerminationCriteriaMet(const BvhTraversalData &data) const
 {
@@ -515 +529 @@
         return ( 0
                 || ((int)data.mNode->mObjects.size() <= mTermMinObjects)
-                || (data.mProbability <= mTermMinProbability)
-                || (data.mDepth >= mTermMaxDepth)
-                || (data.mNumRays <= mTermMinRays)
+                //|| (data.mProbability <= mTermMinProbability)
+                //|| (data.mNumRays <= mTermMinRays)
                  );
 }
@@ -1063 +1076 @@
         return vol;
 }
+
 ///////////////////////////////////////////////////////////
 
@@ -1289 +1303 @@
                         return 0.0f;
 
-                ////////////////////
+                ////////////////
                 //-- surface area heuristics
 
@@ -1298 +1312 @@
         }
         else
-        {       ////////////////////
+        {       ///////////////
                 //-- render cost heuristics
 
                 const float viewSpaceVol = mViewCellsManager->GetViewSpaceBox().GetVolume();
+
                 // probability that view point lies in a view cell which sees this node
                 const float p = EvalViewCellsVolume(objects) / viewSpaceVol;    
@@ -1404 +1419 @@
                 for (vit = tmpViewCells.begin(); vit != vit_end; ++ vit)
                 {
-                        VspViewCell *vc = dynamic_cast<VspViewCell *>(*vit);
+                        //VspViewCell *vc = dynamic_cast<VspViewCell *>(*vit);
+                        ViewCell *vc = *vit;
 
                         // store view cells
@@ -1426 +1442 @@
                 }
         }
+}
+
+
+int BvHierarchy::CountViewCells(Intersectable *obj) const
+{
+        int result = 0;
+        
+        VssRayContainer::const_iterator rit, rit_end = obj->mVssRays.end();
+
+        for (rit = obj->mVssRays.begin(); rit < rit_end; ++ rit)
+        {
+                VssRay *ray = (*rit);
+                ViewCellContainer tmpViewCells;
+        
+                mHierarchyManager->mVspTree->GetViewCells(*ray, tmpViewCells);
+                
+                ViewCellContainer::const_iterator vit, vit_end = tmpViewCells.end();
+                for (vit = tmpViewCells.begin(); vit != vit_end; ++ vit)
+                {
+                        ViewCell *vc = *vit;
+
+                        // store view cells
+                        if (!vc->Mailed())
+                        {
+                                vc->Mail();
+                                ++ result;
+                        }
+                }
+        }
+
+        return result;
+}
+
+
+int BvHierarchy::CountViewCells(const ObjectContainer &objects) const
+{
+        // no view cells yet
+        if (mHierarchyManager->GetViewSpaceSubdivisionType() == 
+                HierarchyManager::NO_VIEWSPACE_SUBDIV)
+                return 1;
+
+        int nViewCells = 0;
+
+        ViewCell::NewMail();
+
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+        // loop through all object and collect view cell pvs of this node
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                nViewCells += CountViewCells(*oit);
+        }
+
+        return nViewCells;
 }