Changeset 1168 for GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp

Timestamp:

07/28/06 09:37:05 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp (modified) (6 diffs)

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

@@ -610 +610 @@
                 // update scalar pvs size value
                 ObjectPvs &pvs = viewCell->GetPvs();
-                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountPvs(), pvs.GetSize());
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountObjectsInPvs(), pvs.GetSize());
 
                 mVspStats.contributingSamples += conSamp;
@@ -725 +725 @@
                 // update scalar pvs size value
                 ObjectPvs &pvs = viewCell->GetPvs();
-                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountPvs(), pvs.GetSize());
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountObjectsInPvs(), pvs.GetSize());
 
                 mVspStats.contributingSamples += conSamp;
@@ -1797 +1797 @@
                         if (leaf->TreeValid() && 
                                 (!onlyUnmailed || !leaf->Mailed()) &&
-                                ((maxPvsSize < 0) || (leaf->GetViewCell()->GetPvs().CountPvs() <= maxPvsSize)))
+                                ((maxPvsSize < 0) || (leaf->GetViewCell()->GetPvs().CountObjectsInPvs() <= maxPvsSize)))
                         {
                                 leaves.push_back(leaf);
@@ -1874 +1874 @@
                   << "PVS: " << data.mPvs << " (min: " << mTermMinPvs << "), "
                   << "#rays: " << (int)data.mRays->size() << " (max: " << mTermMinRays << "), "
-                  << "#pvs: " << leaf->GetViewCell()->GetPvs().CountPvs() << "), "
+                  << "#pvs: " << leaf->GetViewCell()->GetPvs().CountObjectsInPvs() << "), "
                   << "#avg ray contrib (pvs): " << (float)data.mPvs / (float)data.mRays->size() << endl;
 #endif
@@ -4496 +4496 @@
                 mTotalCost -= splitCandidate->GetRenderCostDecrease();
 
-                //-- subdivide leaf node
-                SubdivideSplitCandidate(splitCandidate);
-                
                 // cost ratio of cost decrease / totalCost
                 const float costRatio = splitCandidate->GetRenderCostDecrease() / mTotalCost;
@@ -4506 +4503 @@
                           << splitCandidate->GetRenderCostDecrease() 
                           << " cost ratio: " << costRatio << endl << endl;
+
+                //-- subdivide leaf node
+                SubdivideSplitCandidate(splitCandidate);
 
                 if (costRatio < mTermMinGlobalCostRatio)