Changeset 840 for GTP/trunk/Lib/Vis/Preprocessing/src/Polygon3.cpp

Timestamp:

04/27/06 11:57:28 (18 years ago)

Author:

mattausch

Message:

implementing bounding box hack

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Polygon3.cpp (modified) (4 diffs)

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

@@ -498 +498 @@
 
 
-void Polygon3::Triangulate(vector<Triangle3> &triangles)
+void Polygon3::Triangulate(vector<Triangle3> &triangles) const
 {
         int i = 1;
@@ -517 +517 @@
 
 
-void Polygon3::Triangulate(VertexIndexContainer &indices)
+void Polygon3::Triangulate(VertexIndexContainer &indices) const
 {
         int i = 1;
@@ -539 +539 @@
 
 
-void Polygon3::AddToMesh(Mesh &mesh)
+void IncludePolyInMesh(const Polygon3 &poly, Mesh &mesh)
 {
         const int n = (int)mesh.mVertices.size();
 
     //-- add the vertices
-    VertexContainer::const_iterator vit, vit_end = mVertices.end();
-        for (vit = mVertices.begin(); vit != vit_end; ++ vit)
+    VertexContainer::const_iterator vit, vit_end = poly.mVertices.end();
+        for (vit = poly.mVertices.begin(); vit != vit_end; ++ vit)
         {
                 mesh.mVertices.push_back(*vit);
@@ -551 +551 @@
 
         // one quad => no triangulation necessary
-        if ((int)mVertices.size() == 4)
+        if (poly.mVertices.size() == 4)
         {
                 mesh.AddFace(new Face(n, n + 1, n + 2, n + 3));
-        }
-        else
-        {
-                VertexIndexContainer indices;
-                Triangulate(indices);
-
-                // add indices of triangle strip
-                for (int i = 0; i < (int)indices.size(); i += 3)
-                {
-                        Face *face = new Face(n + indices[i], 
-                                                                  n + indices[i + 1], 
-                                                                  n + indices[i + 2]);
-                        mesh.AddFace(face);
-                }
-        }
-}
+                return;
+        }
+        
+        VertexIndexContainer indices;
+        poly.Triangulate(indices);
+
+        // add indices of triangle strip
+        for (int i = 0; i < (int)indices.size(); i += 3)
+        {
+                Face *face = new Face(n + indices[i], 
+                                                          n + indices[i + 1], 
+                                                          n + indices[i + 2]);
+                mesh.AddFace(face);
+        }
+}