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

Timestamp:

09/20/06 13:37:29 (18 years ago)

Author:

mattausch

Message:

corrected raycasting bug for triangles because of ill defined triangles

File:

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

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

@@ -43 +43 @@
 {       
         mVertices.reserve(face->mVertexIndices.size());
-        
         VertexIndexContainer::iterator it, it_end = face->mVertexIndices.end();
 
-        for (it = face->mVertexIndices.begin(); it != it_end;  ++ it)
+        for (it = face->mVertexIndices.begin(); it != it_end; ++ it)
         {
                 mVertices.push_back(parentMesh->mVertices[*it]);
@@ -69 +68 @@
         VertexContainer::iterator it, it_end = mVertices.end();
 
-        for (it = mVertices.begin(); it != it_end;  ++ it)
-        {
-                cout << (*it) << " ";
-        }cout<<endl<<endl;
+        //for (it = mVertices.begin(); it != it_end;  ++ it){cout << (*it) << " ";}cout<<endl<<endl;
         //cout << "poly n: " << GetNormal() << " t normal: " << tri.GetNormal() << endl;
 }
@@ -267 +263 @@
 }
 
+
 bool Polygon3::Valid(const float epsilon) const
 {
@@ -272 +269 @@
                 return false;
 
-        //TODO: remove for performance
-#if 0
-        if (1)
+        // matt: removed for performance issues
+#if _DEBUG
+        if (0)
         {
                 // check if area exceeds certain size
@@ -291 +288 @@
                 for (it = mVertices.begin(); it != it_end; ++it)
                 {
-                        if (EpsilonEqualV3(vtx, *it, 0.0001))
+                        if (EpsilonEqualV3(vtx, *it, epsilon))
                         {
-                                //Debug << "Malformed vertices:\n" << *this << endl;
+                                //cout << "Malformed vertices:\n" << *this << endl;
                                 return false;
                         }
@@ -590 +587 @@
         const int n = (int)mesh.mVertices.size();
 
+
         /////////////
     //-- add the vertices to the mesh
@@ -609 +607 @@
         poly.Triangulate(indices);
 
+        //if (indices.size() < 3) return; // something is wrong
+        
         // add indices of triangle strip
-        for (int i = n; i < (int)indices.size() + n; i += 3)
-        {
-                Face *face = new Face(indices[i], 
-                                                          indices[i + 1], 
-                                                          indices[i + 2]);
+        for (int i = 0; i < (int)indices.size(); i += 3)
+        {
+                Face *face = new Face(indices[i] + n, 
+                                                          indices[i + 1] + n, 
+                                                          indices[i + 2] + n);
                 mesh.AddFace(face);
         }