Changeset 2387

Timestamp:

05/16/07 18:29:58 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCell.h (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (7 diffs)

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

@@ -246 +246 @@
         virtual bool IsLeaf() const = 0;
 
-        inline bool SmallerPvs(const ViewCell *a, const ViewCell *b) 
-        {
-                // HACK: take scalar value because pvs may not have been stored properly
-#if 1
-                return a->mPvsCost < b->mPvsCost;
-#else
-                return a->GetPvs().EvalPvsCost() < b->GetPvs().EvalPvsCost();
-#endif
-        }
-
-        inline bool GreaterOrEqualPvs(const ViewCell *a, const ViewCell *b) 
-        {
-                return !SmallerPvs(a, b);
-        }
-
-        inline bool SmallerRenderCost(const ViewCell *a, const ViewCell *b) 
-        {
-                return a->GetRenderCost() < b->GetRenderCost();
-        }
-
-        inline bool LargerRenderCost(const ViewCell *a, const ViewCell *b) 
-        {
-                return a->GetRenderCost() > b->GetRenderCost();
-        }
+        friend inline bool SmallerPvs(const ViewCell *a, const ViewCell *b);
+        friend inline bool GreaterOrEqualPvs(const ViewCell *a, const ViewCell *b);
+        friend inline bool SmallerRenderCost(const ViewCell *a, const ViewCell *b);
+        friend inline bool LargerRenderCost(const ViewCell *a, const ViewCell *b);
+        
 
         /** Sets merge cost used for merging this view cell from other cells. 
@@ -344 +325 @@
 };
 
+inline bool SmallerPvs(const ViewCell *a, const ViewCell *b) 
+{
+        // HACK: take scalar value because pvs may not have been stored properly
+#if 1
+        return a->mPvsCost < b->mPvsCost;
+#else
+        return a->GetPvs().EvalPvsCost() < b->GetPvs().EvalPvsCost();
+#endif
+}
+
+inline bool GreaterOrEqualPvs(const ViewCell *a, const ViewCell *b) 
+{
+        return !SmallerPvs(a, b);
+}
+
+inline bool SmallerRenderCost(const ViewCell *a, const ViewCell *b) 
+{
+        return a->GetRenderCost() < b->GetRenderCost();
+}
+
+inline bool LargerRenderCost(const ViewCell *a, const ViewCell *b) 
+{
+        return a->GetRenderCost() > b->GetRenderCost();
+}
 
 class ViewCellInterior: public ViewCell

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

@@ -1220 +1220 @@
 
         // sort by render cost
-        sort(viewCells.begin(), viewCells.end(), ViewCell::SmallerRenderCost);
+        sort(viewCells.begin(), viewCells.end(), SmallerRenderCost);
 
         minRenderCost = viewCells.front()->GetRenderCost();
@@ -1323 +1323 @@
         
         // sort by pvs size
-        sort(viewCells.begin(), viewCells.end(), ViewCell::SmallerPvs);
+        sort(viewCells.begin(), viewCells.end(), SmallerPvs);
 
         maxPvs = viewCells.back()->GetTrianglesInPvs();
@@ -1410 +1410 @@
         
         // sort by pvs size
-        sort(viewCells.begin(), viewCells.end(), ViewCell::SmallerPvs);
+        sort(viewCells.begin(), viewCells.end(), SmallerPvs);
 
         maxPvs = viewCells.back()->GetTrianglesInPvs();
@@ -1923 +1923 @@
   }
   
-  sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
+  sort(mViewCells.begin(), mViewCells.end(), SmallerPvs);
   
   int start = (int)(mViewCells.size() * minValid);
@@ -4078 +4078 @@
         if (sortViewCells)
         {       // sort view cells to visualize the largest view cells
-                sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
+                sort(mViewCells.begin(), mViewCells.end(), LargerRenderCost);
         }
 
@@ -5401 +5401 @@
         {
                 // sort view cells to visualize the largest view cells
-                sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
+                sort(mViewCells.begin(), mViewCells.end(), LargerRenderCost);
         }
 
@@ -6453 +6453 @@
         {
                 // sort view cells to visualize the view cells with highest render cost
-                sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
+                sort(mViewCells.begin(), mViewCells.end(), LargerRenderCost);
         }