Changeset 719 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp

Timestamp:

03/27/06 18:56:45 (18 years ago)

Author:

mattausch

Message:

updating view cell hierarchy before pvs statistics

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp (modified) (9 diffs)

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

@@ -44 +44 @@
 
 
-/****************************************************************/
-/*                  class BspNode implementation                */
-/****************************************************************/
+/******************************************************************/
+/*                  class BspNode implementation                  */
+/******************************************************************/
 
 
@@ -2086 +2086 @@
         stack<BspRayTraversalData> tStack;
 
-        float mint = 0.0f, maxt = 1.0f;
+                float mint = 0.0f, maxt = 1.0f;
 
         Intersectable::NewMail();
@@ -2097 +2097 @@
         BspNode *farChild = NULL;
 
+
         const float thresh = 1 ? 1e-6f : 0.0f;
 
@@ -2104 +2105 @@
                 {
                         BspInterior *in = dynamic_cast<BspInterior *>(node);
-                
+
                         Plane3 splitPlane = in->GetPlane();
                         
@@ -2113 +2114 @@
                         {
                                 node = in->GetBack();
-                
-                                if(extSide <= 0) // plane does not split ray => no far child
+                                
+                                // plane does not split ray => no far child
+                                if (extSide <= 0) 
                                         continue;
-                
+  
                                 farChild = in->GetFront(); // plane splits ray
-                
                         } 
-                        else if (entSide > 0) 
+                        else if (entSide > 0)
                         {
                                 node = in->GetFront();
-                        
+
                                 if (extSide >= 0) // plane does not split ray => no far child
                                         continue;
-                        
-                                farChild = in->GetBack(); // plane splits ray                   
+
+                                farChild = in->GetBack(); // plane splits ray
                         }
-                        else // ray and plane are coincident
-                        {
-                                // NOTE: what to do if ray is coincident with plane?
+                        else // one of the ray end points is on the plane
+                        {       // NOTE: what to do if ray is coincident with plane?
                                 if (extSide < 0)
                                         node = in->GetBack();
                                 else //if (extSide > 0)
                                         node = in->GetFront();
-                                //else break;
+                                //else break; // coincident => count no intersections
 
                                 continue; // no far child
                         }
-                
+
                         // push data for far child
                         tStack.push(BspRayTraversalData(farChild, extp, maxt));
@@ -2177 +2177 @@
                 }
         }
+
         return hits;
 }
@@ -2319 +2320 @@
                 // split plane of node itself
                 n = n->GetParent();
-                
+
                 if (n)
                 {
@@ -2361 +2362 @@
         vector<Plane3> candidatePlanes;
 
+        vector<Plane3>::const_iterator pit, pit_end = halfSpaces.end();
+
         // bounded planes are added to the polygons
-        for (int i = 0; i < (int)halfSpaces.size(); ++ i)
-        {
-                Polygon3 *p = GetBoundingBox().CrossSection(halfSpaces[i]);
+        for (pit = halfSpaces.begin(); pit != pit_end; ++ pit)
+        {
+                Polygon3 *p = GetBoundingBox().CrossSection(*pit);
 
                 if (p->Valid(mEpsilon))
                 {
                         candidatePolys.push_back(p);
-                        candidatePlanes.push_back(halfSpaces[i]);
+                        candidatePlanes.push_back(*pit);
                 }
         }
@@ -2415 +2418 @@
                                         DEL_PTR(candidatePolys[i]);
 
-                                        if (frontPoly->Valid(mEpsilon))
-                                                candidatePolys[i] = frontPoly;
+                                        if (backPoly->Valid(mEpsilon))
+                                                candidatePolys[i] = backPoly;
                                         else
-                                                DEL_PTR(frontPoly);
-
-                                        DEL_PTR(backPoly);
+                                                DEL_PTR(backPoly);
+
+                                        // outside, don't need this
+                                        DEL_PTR(frontPoly);
                                         break;
                                 // polygon outside of halfspace