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

Timestamp:

03/09/06 04:27:07 (18 years ago)

Author:

mattausch

Message:

fixed a bsp node geometry problem (debug code)

File:

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

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

@@ -2511 +2511 @@
                         Plane3 halfSpace = dynamic_cast<BspInterior *>(interior)->GetPlane();
 
-            if (interior->GetFront() != lastNode)
+            if (interior->GetBack() != lastNode)
                                 halfSpace.ReverseOrientation();
 
@@ -2530 +2530 @@
         vector<Plane3> candidatePlanes;
 
-        // bounded planes are added to the polygons (reverse polygons
-        // as they have to be outfacing)
+        // bounded planes are added to the polygons
         for (int i = 0; i < (int)halfSpaces.size(); ++ i)
         {
@@ -2538 +2537 @@
                 if (p->Valid(mEpsilon))
                 {
-                        candidatePolys.push_back(p->CreateReversePolygon());
-                        // Why?
-                        Plane3 candidatePlane = p->GetSupportingPlane(); //halfSpaces[i];
-                        //candidatePlane.ReverseOrientation();
-                        candidatePlanes.push_back(candidatePlane);
-
-                        DEL_PTR(p);
+                        candidatePolys.push_back(p);
+                        candidatePlanes.push_back(halfSpaces[i]);
                 }
         }
@@ -2590 +2584 @@
                                         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;
-
-                                case Polygon3::BACK_SIDE:
+                                // polygon outside of halfspace
+                                case Polygon3::FRONT_SIDE:
                                         DEL_PTR(candidatePolys[i]);
                                         break;
                                 // just take polygon as it is
-                                case Polygon3::FRONT_SIDE:
+                                case Polygon3::BACK_SIDE:
                                 case Polygon3::COINCIDENT:
                                 default:
@@ -2685 +2680 @@
                                                                                                         mEpsilon);
 
-                                                if (cf == Polygon3::BACK_SIDE)
+                                                if (cf == Polygon3::FRONT_SIDE)
                                                 {
                                                         isAdjacent = false;
@@ -2704 +2699 @@
                                                                                                         mEpsilon);
 
-                                                if (cf == Polygon3::BACK_SIDE)
+                                                if (cf == Polygon3::FRONT_SIDE)
                                                 {
                                                         isAdjacent = false;
@@ -2738 +2733 @@
                                                                 mEpsilon);
                 
-                        if (cf == Polygon3::FRONT_SIDE)
-                        {
-                                nodeStack.push(bspNodePair(interior->GetFront(), fGeom));
-                                DEL_PTR(bGeom);
+                        if (cf == Polygon3::BACK_SIDE)
+                        {
+                                nodeStack.push(bspNodePair(interior->GetBack(), bGeom));
+                                DEL_PTR(fGeom);
                         }
                         else
                         {
-                                if (cf == Polygon3::BACK_SIDE)
+                                if (cf == Polygon3::FRONT_SIDE)
                                 {
-                                        nodeStack.push(bspNodePair(interior->GetBack(), bGeom));
-                                        DEL_PTR(fGeom);
+                                        nodeStack.push(bspNodePair(interior->GetFront(), fGeom));
+                                        DEL_PTR(bGeom);
                                 }
                                 else
@@ -2830 +2825 @@
                                                                 mEpsilon);
                 
-                        if (cf == Polygon3::FRONT_SIDE)
-                        {
-                                nodeStack.push(bspNodePair(interior->GetFront(), fGeom));
-                                DEL_PTR(bGeom);
+                        if (cf == Polygon3::BACK_SIDE)
+                        {
+                                nodeStack.push(bspNodePair(interior->GetBack(), bGeom));
+                                DEL_PTR(fGeom);
                         }
                         else
                         {
-                                if (cf == Polygon3::BACK_SIDE)
+                                if (cf == Polygon3::FRONT_SIDE)
                                 {
-                                        nodeStack.push(bspNodePair(interior->GetBack(), bGeom));
-                                        DEL_PTR(fGeom);
+                                        nodeStack.push(bspNodePair(interior->GetFront(), fGeom));
+                                        DEL_PTR(bGeom);
                                 }
                                 else
@@ -3044 +3039 @@
 
         float t;
-        const float thresh = 1 ? 1e-6f : 0.0f;
+        //const float thresh = 1 ? 1e-6f : 0.0f;
+        const float thresh = 0.01f;
 
         while (1)