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

Timestamp:

03/20/06 00:11:27 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -159 +159 @@
     mFront = f;
 }
+
 
 /****************************************************************/
@@ -588 +589 @@
 }
 
+
 int BspTree::AddMeshToPolygons(Mesh *mesh, 
                                                            PolygonContainer &polys, 
                                                            MeshInstance *parent)
 {
-        FaceContainer::const_iterator fi;
+        FaceContainer::const_iterator fi, fi_end = mesh->mFaces.end();
         
         // copy the face data to polygons
-        for (fi = mesh->mFaces.begin(); fi != mesh->mFaces.end(); ++ fi)
+        for (fi = mesh->mFaces.begin(); fi != fi_end; ++ fi)
         {
                 Polygon3 *poly = new Polygon3((*fi), mesh);
@@ -2839 +2841 @@
 {
         mPolys.reserve(rhs.mPolys.size());
-        
+        mPlanes.reserve(rhs.mPolys.size());
+
+
         PolygonContainer::const_iterator it, it_end = rhs.mPolys.end();
 
         int i = 0;
 
-        for (it = rhs.mPolys.begin(); it != it_end; ++ it)
+        for (it = rhs.mPolys.begin(); it != it_end; ++ it, ++i)
         {
                 Polygon3 *poly = *it;
-                Add(new Polygon3(*poly), rhs.mPlanes[i ++]);
+                Add(new Polygon3(*poly), rhs.mPlanes[i]);
+        }
+}
+
+
+BspNodeGeometry& BspNodeGeometry::operator=(const BspNodeGeometry& g) 
+{
+    if (this == &g) 
+                return *this;
+ 
+        CLEAR_CONTAINER(mPolys);
+
+        mPolys.reserve(g.mPolys.size());
+        mPlanes.reserve(g.mPolys.size());
+
+        PolygonContainer::const_iterator it, it_end = g.mPolys.end();
+
+        int i = 0;
+
+        for (it = g.mPolys.begin(); it != it_end; ++ it, ++ i)
+        {
+                Polygon3 *poly = *it;
+                Add(new Polygon3(*poly), g.mPlanes[i]);
+        }
+
+        return *this;
+}
+
+
+BspNodeGeometry::BspNodeGeometry(const PolygonContainer &polys)
+{
+        mPolys = polys;
+        mPlanes.reserve(polys.size());
+        
+        PolygonContainer::const_iterator it, it_end = polys.end();
+
+        for (it = polys.begin(); it != it_end; ++ it)
+        {
+                Polygon3 *poly = *it;
+                mPlanes.push_back(poly->GetSupportingPlane());
         }
 }
@@ -2922 +2965 @@
 
 
-int BspNodeGeometry::Side(const Plane3 &plane) const
+int BspNodeGeometry::Side(const Plane3 &plane, const float eps) const
 {
         PolygonContainer::const_iterator it, it_end = mPolys.end();
@@ -2931 +2974 @@
         for (it = mPolys.begin(); it != it_end; ++ it)
         {
-        const int side = (*it)->Side(plane, 0.0f);
+        const int side = (*it)->Side(plane, eps);
 
                 if (side == -1)
@@ -3042 +3085 @@
                                                                         const float epsilon) const
 {       
+#if 0
+        // trivial cases
+        const int cf = Side(splitPlane, epsilon);
+
+        if (cf == -1)
+        {
+                back = *this;
+                return false;
+        }
+        else if (cf == 1)
+        {
+                front = *this;
+                return false;
+        }
+#endif
+
         // get cross section of new polygon
         Polygon3 *planePoly = box.CrossSection(splitPlane);
-        //Vector3 ndummy = planePoly->GetSupportingPlane().mNormal;
+        
         // split polygon with all other polygons
         planePoly = SplitPolygon(planePoly, epsilon);