Changeset 882 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

Timestamp:

05/03/06 10:28:20 (18 years ago)

Author:

mattausch

Message:

added new active view cell concept

File:

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

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

@@ -34 +34 @@
 
 // pvs penalty can be different from pvs size
-inline float EvalPvsPenalty(const int pvs, 
-                                                        const int lower,
-                                                        const int upper)
+inline static float EvalPvsPenalty(const int pvs, 
+                                                                   const int lower,
+                                                                   const int upper)
 {
         // clamp to minmax values
@@ -269 +269 @@
 
 int VspBspTree::AddToPolygonSoup(const ViewCellContainer &viewCells,
-                                                          PolygonContainer &polys,
-                                                          int maxObjects)
+                                                                 PolygonContainer &polys,
+                                                                 int maxObjects)
 {
         int limit = (maxObjects > 0) ?
@@ -1147 +1147 @@
   RayInfoContainer::const_iterator it, it_end = rays.end();
   
-  ViewCell *vc = leaf->GetViewCell();
+  ViewCellLeaf *vc = leaf->GetViewCell();
   
   // add contributions from samples to the PVS
@@ -2589 +2589 @@
                         if (!onlyValid || node->TreeValid())
                         {
-                                ViewCell *leafVc = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+                                ViewCellLeaf *leafVc = dynamic_cast<BspLeaf *>(node)->GetViewCell();
 
                                 ViewCell *viewCell = mViewCellsTree->GetActiveViewCell(leafVc);
@@ -3260 +3260 @@
 int VspBspTree::CastLineSegment(const Vector3 &origin,
                                                                 const Vector3 &termination,
-                                                                vector<ViewCell *> &viewcells)
+                                                                ViewCellContainer &viewcells)
 {
         int hits = 0;
@@ -3755 +3755 @@
         nodeStack.push(mRoot);
   
-        ViewCell *viewcell = NULL;
+        ViewCellLeaf *viewcell = NULL;
   
         while (!nodeStack.empty())