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

Timestamp:

09/20/06 18:32:10 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -211 +211 @@
                         {
                                 cout << "f";
-#if CONNECT_SEQUENTIAL_FACES
-                                Face *face = LoadFace(str, vertices, hashTable);
-                                if (!face) break;
-        
-                                faces.push_back(face);
-
-                                if (faces.size() >= nMaxFaces)
+
+                                if (loadMeshes)
                                 {
-                                        ProcessMesh(faces, hashTable, root, parents);
+                                        Face *face = LoadFace(str, vertices, hashTable);
+                                        if (!face) break;
+        
+                                        faces.push_back(face);
+
+                                        if (faces.size() >= nMaxFaces)
+                                        {
+                                                ProcessMesh(faces, hashTable, root, parents);
+                                        }
                                 }
-#else
-                                Triangle3 triangle = LoadTriangle(str, vertices, hashTable);
+                                else
+                                {
+                                        Triangle3 triangle = LoadTriangle(str, vertices, hashTable);
                                 
-                                TriangleIntersectable *obj = new TriangleIntersectable(triangle);
-                                root->mGeometry.push_back(obj);
-
-                                // matt: we don't really need to keep an additional data structure
-                                // if working with triangles => remove this
-                                if (parents) 
-                                {
-                                        FaceParentInfo info(obj, 0);
-                                        parents->push_back(info);
+                                        TriangleIntersectable *obj = new TriangleIntersectable(triangle);
+                                        root->mGeometry.push_back(obj);
+
+                                        // matt: we don't really need to keep an additional data structure
+                                        // if working with triangles => remove this
+                                        if (parents) 
+                                        {
+                                                FaceParentInfo info(obj, 0);
+                                                parents->push_back(info);
+                                        }
                                 }
-#endif
                                 break;
                         }   // end face
@@ -242 +246 @@
         }
 
-#if CONNECT_SEQUENTIAL_FACES
-        // there could be faces remaining
-        if (!faces.empty())
-        {       
-                ProcessMesh(faces, hashTable, root, parents);
-        }
-#endif
+        if (loadMeshes)
+        {
+                // there could be faces remaining
+                if (!faces.empty())
+                {       
+                        ProcessMesh(faces, hashTable, root, parents);
+                }
+        }
+
         // reset tables
         hashTable.clear();