Changeset 2575 for GTP/trunk/Lib/Vis/Preprocessing/src/ObjParser.cpp

Timestamp:

01/03/08 15:53:44 (17 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ObjParser.cpp (modified) (2 diffs)

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

@@ -209 +209 @@
         const Vector3 cross_a_b = CrossProd(a, b);
 
-        if (SqrMagnitude(cross_a_b) <= 0.000001 * FLT_EPSILON * FLT_EPSILON) 
+#define SMALL_FLT   1e-5
+        
+        if (SqrMagnitude(cross_a_b) <= 0.0001 * SMALL_FLT * SMALL_FLT) 
         {
                 // v0, v1 & v2 lies on a line (area == 0)
@@ -293 +295 @@
                                         for (tit = triangles.begin(); tit != tit_end; ++ tit)
                                         {
-                                                // test if it is a valid triangle
-                                                if (0 && !TriangleValid(*tit)) continue;
-
-                                                TriangleIntersectable *obj = new TriangleIntersectable(*tit);   
-                                                root->mGeometry.push_back(obj);
+                                          // test if it is a valid triangle
+                                          if (!TriangleValid(*tit))
+                                            continue;
+
+                                          TriangleIntersectable *obj = new TriangleIntersectable(*tit); 
+                                          root->mGeometry.push_back(obj);
                                         }
                                 }