Changeset 1707 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.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/ViewCell.cpp (modified) (12 diffs)

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

@@ -503 +503 @@
                                 tstack.push(*it);
                         }
-                        
                 }
         }
@@ -930 +929 @@
                 const int upper = mViewCellsManager->GetMaxPvsSize();
 
-                const float penalty = EvalPvsPenalty((*vit)->GetPvs().CountObjectsInPvs(), lower, upper);
+                const float penalty = EvalPvsPenalty((*vit)->GetPvs().EvalPvsCost(), lower, upper);
                 
                 mDeviation += fabs(mAvgRenderCost - penalty);
@@ -1023 +1022 @@
         vc->Mail();
 
-        const int pvs1 = left->GetPvs().CountObjectsInPvs();
-        const int pvs2 = right->GetPvs().CountObjectsInPvs();
+        const float pvs1 = left->GetPvs().EvalPvsCost();
+        const float pvs2 = right->GetPvs().EvalPvsCost();
 
 
@@ -1030 +1029 @@
         mMergedViewCells.push_back(vc);
 
-        pvsDiff = vc->GetPvs().CountObjectsInPvs() - pvs1 - pvs2;
+        pvsDiff = vc->GetPvs().EvalPvsCost() - pvs1 - pvs2;
 
 
@@ -1038 +1037 @@
                 // set scalars
                 mViewCellsManager->UpdateScalarPvsSize(left, 
-                                left->GetPvs().CountObjectsInPvs(), 
+                                left->GetPvs().EvalPvsCost(), 
                                 left->GetPvs().GetSize());
                         
@@ -1049 +1048 @@
                 // set scalars
                 mViewCellsManager->UpdateScalarPvsSize(right, 
-                        right->GetPvs().CountObjectsInPvs(), 
+                        right->GetPvs().EvalPvsCost(), 
                         right->GetPvs().GetSize());
 
@@ -1336 +1335 @@
         if (1)
         {
-                const float penalty = EvalPvsPenalty(vc->GetPvs().CountObjectsInPvs(), lower, upper);
+                const float penalty = EvalPvsPenalty(vc->GetPvs().EvalPvsCost(), lower, upper);
                 return fabs(mAvgRenderCost - penalty) / (float)mNumActiveViewCells;
         }
@@ -1349 +1348 @@
         if (mUseAreaForPvs)
         {
-                return vc->GetPvs().CountObjectsInPvs() * vc->GetArea();
-        }
-
-        return vc->GetPvs().CountObjectsInPvs() * vc->GetVolume();
+                return vc->GetPvs().EvalPvsCost() * vc->GetArea();
+        }
+
+        return vc->GetPvs().EvalPvsCost() * vc->GetVolume();
 }
 
@@ -1795 +1794 @@
         if (vc->IsLeaf())
         {
-                return vc->GetPvs().CountObjectsInPvs();
-        }
-        
-        // interior nodes: pvs is either stored as a scalar or
-        // has to be reconstructed from the leaves
+                return vc->GetPvs().EvalPvsCost();
+        }
+        
+        // interior nodes: pvs is either stored as a 
+        // scalar or has to be reconstructed from the leaves
         // the stored pvs size is the valid pvs size => just return scalar
         if (vc->mPvsSizeValid)
@@ -1833 +1832 @@
         }
 
-        return newPvs.CountObjectsInPvs();
+        return newPvs.EvalPvsCost();
 }
 
@@ -2002 +2001 @@
         switch (mViewCellsStorage)
         {
-        case PVS_IN_LEAVES: //-- store pvs only in leaves
+        case PVS_IN_LEAVES: 
+                // pvs is stored only in leaves
                 pvsSize = GetPvsSizeForLeafStorage(vc);                 
                 break;
@@ -2012 +2012 @@
                 // pvs is stored consistently in the tree up to the root
                 // just return pvs size 
-                pvsSize = vc->GetPvs().CountObjectsInPvs();     
+                pvsSize = vc->GetPvs().EvalPvsCost();   
                 break;
         }