Changeset 1979 for GTP

Timestamp:

01/15/07 13:58:15 (18 years ago)

Author:

mattausch

Message:

removed errors in loader

File:

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

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

@@ -76 +76 @@
 static void LoadTriangles(char *str, 
                                                   const VertexContainer &vertices, 
-                                                  vector<Triangle3> &triangles)
+                                                  vector<Triangle3> &triangles,
+                                                  const int line)
 {
         char *pch = strtok(str + 1, " ");
@@ -82 +83 @@
         VertexIndexContainer indices;
         
-        int i = 0;
         while (pch != NULL)
         {
                 const int index = (int)strtol(pch, NULL, 10) - 1;
-                ++ i;
-                                
+                                                
                 // store vertex in hash table
                 //hashTable[index] = vertices[index];
                 indices.push_back(index);
                 
+                //if (line == 451703)
+                //      cout << index + 1 << " ";
+
                 pch = strtok(NULL, " ");
 
@@ -101 +103 @@
 
                         triangles.push_back(Triangle3(vertices[indices[0]], 
-                                                                                  vertices[indices[index_2]], 
-                                                                                  vertices[indices[index_3]])); 
+                                                                                  vertices[indices[index_2]],           
+                                                                                  vertices[indices[index_3]]));
                 }
         }
+        //if (line == 451703)
+        //      cout << "t: " << triangles.size() << endl;
 }
 
@@ -221 +225 @@
         FaceContainer faces;
 
-        char str[100];
+        int line = 0;
+
+        char str[1000];
         int meshGrouping;
         Environment::GetSingleton()->GetIntValue("ObjParser.meshGrouping", meshGrouping);
@@ -227 +233 @@
         int nMaxFaces = meshGrouping;
 
-        while (fgets(str, 80, file) != NULL)
-        {
+        while (fgets(str, 1000, file) != NULL)
+        {++ line;
           switch (str[0]) 
                 {
@@ -264 +270 @@
                                         vector<Triangle3> triangles;
                                         
-                                        LoadTriangles(str, vertices, triangles);
+                                        LoadTriangles(str, vertices, triangles, line);
 
                                         vector<Triangle3>::const_iterator tit, tit_end = triangles.end();
@@ -270 +276 @@
                                         for (tit = triangles.begin(); tit != tit_end; ++ tit)
                                         {
-                                                //if (!TriangleValid(*tit)) continue;
-                                                
+                                                if (0 && !TriangleValid(*tit)) continue;
+
                                                 TriangleIntersectable *obj = new TriangleIntersectable(*tit);   
-                                                root->mGeometry.push_back(obj);
+                        root->mGeometry.push_back(obj);
                                         }
                                 }
@@ -282 +288 @@
                 }
         }
-
+        //cout << "\n** " << root->mGeometry.size() << " " << " lines: " << line << endl;
         if (loadMeshes)
         {