Changeset 1707 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

11/01/06 23:20:53 (18 years ago)

Author:

mattausch

Message:

worked on full render cost evaluation
warning: some change sin render cost evaluation for pvs which could have bugs

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (4 diffs)

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

@@ -654 +654 @@
                 // update scalar pvs size value
                 ObjectPvs &pvs = viewCell->GetPvs();
-                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountObjectsInPvs(), pvs.GetSize());
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.EvalPvsCost(), pvs.GetSize());
 
                 mVspStats.contributingSamples += conSamp;
@@ -768 +768 @@
                 // update scalar pvs size value
                 ObjectPvs &pvs = viewCell->GetPvs();
-                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountObjectsInPvs(), pvs.GetSize());
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.EvalPvsCost(), pvs.GetSize());
 
                 mVspStats.contributingSamples += conSamp;
@@ -1803 +1803 @@
                         if (leaf->TreeValid() && 
                                 (!onlyUnmailed || !leaf->Mailed()) &&
-                                ((maxPvsSize < 0) || (leaf->GetViewCell()->GetPvs().CountObjectsInPvs() <= maxPvsSize)))
+                                ((maxPvsSize < 0) || (leaf->GetViewCell()->GetPvs().EvalPvsCost() <= maxPvsSize)))
                         {
                                 leaves.push_back(leaf);
@@ -1880 +1880 @@
                   << "PVS: " << data.mPvs << " (min: " << mTermMinPvs << "), "
                   << "#rays: " << (int)data.mRays->size() << " (max: " << mTermMinRays << "), "
-                  << "#pvs: " << leaf->GetViewCell()->GetPvs().CountObjectsInPvs() << "), "
+                  << "#pvs: " << leaf->GetViewCell()->GetPvs().EvalPvsCost() << "), "
                   << "#avg ray contrib (pvs): " << (float)data.mPvs / (float)data.mRays->size() << endl;
 #endif