Changeset 1978 for GTP/trunk

Timestamp:

01/15/07 11:07:24 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ObjParser.cpp (modified) (5 diffs)
• Preprocessor.cpp (modified) (2 diffs)

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

@@ -76 +76 @@
 static void LoadTriangles(char *str, 
                                                   const VertexContainer &vertices, 
-                                                  map<int, Vector3> &hashTable,
-                          vector<Triangle3> &triangles)
+                                                  vector<Triangle3> &triangles)
 {
         char *pch = strtok(str + 1, " ");
@@ -98 +97 @@
                 if ((int)indices.size() > 2)
                 {
-                        int index_2 = (int)indices.size() - 2;
-                        int index_3 = (int)indices.size() - 1;
+                        const int index_2 = (int)indices.size() - 2;
+                        const int index_3 = (int)indices.size() - 1;
 
                         triangles.push_back(Triangle3(vertices[indices[0]], 
@@ -190 +189 @@
 
 
-
 bool TriangleValid(const Triangle3 &triangle)
 {
@@ -199 +197 @@
         if (SqrMagnitude(cross_a_b) <= 0.000001 * FLT_EPSILON * FLT_EPSILON) 
         {
-                // v0, v1 & v2 lays on a line (area == 0)
+                cout << "x";
+                // v0, v1 & v2 lies on a line (area == 0)
                 return false;
         }
@@ -265 +264 @@
                                         vector<Triangle3> triangles;
                                         
-                                        LoadTriangles(str, vertices, hashTable, triangles);
+                                        LoadTriangles(str, vertices, triangles);
+
                                         vector<Triangle3>::const_iterator tit, tit_end = triangles.end();
 
                                         for (tit = triangles.begin(); tit != tit_end; ++ tit)
                                         {
-                                                if (!TriangleValid(*tit))
-                                                        continue;
+                                                //if (!TriangleValid(*tit)) continue;
                                                 
                                                 TriangleIntersectable *obj = new TriangleIntersectable(*tit);   
                                                 root->mGeometry.push_back(obj);
-
-                                                // matt: we don't really need to keep an additional data structure
-                                                // if working with triangles => remove this
-                                                if (0 && parents) 
-                                                {
-                                                        FaceParentInfo info(obj, 0);
-                                                        parents->push_back(info);
-                                                }
                                         }
                                 }

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

@@ -410 +410 @@
                 if (index >= (int)mFaceParents.size())
                 {
-                        cerr<<"Warning: triangle  index out of range! "<<index<<endl;
+                        cerr << "Warning: triangle index out of range! " << index << endl;
                         return NULL;
                 }
@@ -422 +422 @@
                 if (index >= (int)mObjects.size())
                 {
-                        cerr<<"Warning: triangle  index out of range! "<<index<<endl;
+                        cerr << "Warning: triangle index out of range! " << index << endl;
                         return NULL;
                 }