Changeset 2342 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

Timestamp:

05/02/07 17:28:26 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (12 diffs)

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

@@ -34 +34 @@
                                            myless<vector<ViewCell *>::value_type> > TraversalQueue;
 
-  int ViewCell::sMailId = 10000;//2147483647;
-  int ViewCell::sReservedMailboxes = 1;
-
+int ViewCell::sMailId = 10000;//2147483647;
+int ViewCell::sReservedMailboxes = 1;
 
 float MergeCandidate::sRenderCostWeight = 0;
@@ -1305 +1304 @@
         {
                 const float penalty = 
-                        EvalPvsPenalty(GetPvsCost(vc), lower, upper);
+                        EvalPvsPenalty(GetTrianglesInPvs(vc), lower, upper);
 
                 return (mAvgRenderCost - penalty) * (mAvgRenderCost - penalty) / 
@@ -1323 +1322 @@
         if (1)
         {
-                const float penalty = EvalPvsPenalty(GetPvsCost(vc), lower, upper);
+                const float penalty = EvalPvsPenalty(GetTrianglesInPvs(vc), lower, upper);
                 return fabs(mAvgRenderCost - penalty) / (float)mNumActiveViewCells;
         }
@@ -1515 +1514 @@
         const float vol = box.GetVolume();
 
-        const float rootPvs = GetPvsCost(mRoot);
+        const float rootPvs = GetTrianglesInPvs(mRoot);
         const int rootEntries = GetPvsEntries(mRoot);
         
@@ -1550 +1549 @@
                         ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
 
-                        const float parentCost = GetPvsCost(interior);
+                        const float parentCost = GetTrianglesInPvs(interior);
                         const int parentPvsEntries = GetPvsEntries(interior);
             const float parentExpCost = (float)parentCost * interior->GetVolume();
@@ -1566 +1565 @@
                                 ViewCell *vc = *it;
 
-                                const float pvsCost = GetPvsCost(vc);
+                                const float pvsCost = GetTrianglesInPvs(vc);
                                 const int pvsEntries = GetPvsEntries(vc);
 
@@ -1953 +1952 @@
 
 
-float ViewCellsTree::GetPvsCost(ViewCell *vc) const
+float ViewCellsTree::GetTrianglesInPvs(ViewCell *vc) const
 {
         float pvsCost = 0;
@@ -2159 +2158 @@
 
         const float vol = mViewCellsManager->GetViewSpaceBox().GetVolume();
-        const float rootPvs = GetPvsCost(mRoot);
+        const float rootPvs = GetTrianglesInPvs(mRoot);
         
         float totalRenderCost;
@@ -2182 +2181 @@
                         ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
 
-                        const float parentCost = GetPvsCost(interior);
+                        const float parentCost = GetTrianglesInPvs(interior);
                         const float parentExpCost = parentCost * interior->GetVolume();
 
@@ -2196 +2195 @@
                                 ViewCell *vc = *it;
 
-                                const float pvsCost = GetPvsCost(vc);
+                                const float pvsCost = GetTrianglesInPvs(vc);
                                 
                                 childExpCost += (float) pvsCost * vc->GetVolume();
@@ -2248 +2247 @@
                         ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
 
-                        const float parentPvsCost = GetPvsCost(interior);
+                        const float parentPvsCost = GetTrianglesInPvs(interior);
                         const int parentPvsEntries = GetPvsEntries(interior);
             const float parentExpCost = (float)parentPvsCost * interior->GetVolume();
@@ -2288 +2287 @@
         ++ vcStat.viewCells;
                 
-        const float pvsCost = GetPvsCost(vc);
+        const float pvsCost = GetTrianglesInPvs(vc);
 
         vcStat.pvsCost += pvsCost;