Changeset 2307

Timestamp:

04/02/07 11:52:04 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ObjParser.cpp (modified) (8 diffs)
• Preprocessor.cpp (modified) (1 diff)

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

@@ -80 +80 @@
 {
         char *pch = strtok(str + 1, " ");
-        
+         
         VertexIndexContainer indices;
-        
+        int i = 0;
         while (pch != NULL)
-        {
+        {++ i;
           const int index = (int)strtol(pch, NULL, 10) - 1;
                                                 
           // store vertex in hash table
           //hashTable[index] = vertices[index];
-          if (index>=0)
+          if (index >= 0)
                 indices.push_back(index);
                 
-          //if (line == 451703)
-          //    cout << index + 1 << " ";
-          
           pch = strtok(NULL, " ");
           
@@ -106 +103 @@
                                                                                   vertices[indices[index_2]],           
                                                                                   vertices[indices[index_3]]));
-                        indices.clear();
                 }
         }
@@ -129 +125 @@
                 {
                         // go through indices
-                        const int index = *vit;            
-                        //Debug << "old idx: " << (*vit) << endl;
+                        const int index = *vit;
                         map<int, Vector3>::const_iterator hit = hashTable.find(index);
 
                         // correct face index (nust be relative to start of verices)
                         (*vit) = (int)distance(hashTable.begin(), hit);
-                        //Debug << "new idx: " << (*vit) << endl;
                 }
         }
@@ -228 +222 @@
         int line = 0;
 
-        char str[1000];
+        char str[100000];
         int meshGrouping;
         Environment::GetSingleton()->GetIntValue("ObjParser.meshGrouping", meshGrouping);
@@ -234 +228 @@
         int nMaxFaces = meshGrouping;
 
-        while (fgets(str, 1000, file) != NULL)
-        {
-                ++ line;
+        while (fgets(str, 100000, file) != NULL)
+        {
           switch (str[0]) 
                 {
@@ -264 +257 @@
                                         faces.push_back(face);
 
-                                        if (faces.size() >= nMaxFaces)
+                                        if ((int)faces.size() >= nMaxFaces)
                                         {
                                                 ProcessMesh(faces, hashTable, root, parents);
@@ -271 +264 @@
                                 else
                                 {
+                                        ++ line;
                                         vector<Triangle3> triangles;
                                         
@@ -291 +285 @@
                 }
         }
-        //cout << "\n** " << root->mGeometry.size() << " " << " lines: " << line << endl;
+        
+        //cout << "\n**** " << root->mGeometry.size() << " " << " lines: " << line << endl;
         if (loadMeshes)
         {

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

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