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

Timestamp:

09/03/06 03:13:29 (18 years ago)

Author:

mattausch

Message:

started osp mesh construction for obj files. Introduced new primitive faceintersectable

File:

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

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

@@ -13 +13 @@
 #include "Environment.h"
 #include "ResourceManager.h"
-
+#include "KdIntersectable.h"
 
 
@@ -93 +93 @@
 
                         // correct face index (nust be relative to start of verices)
-                        (*vit) = distance(hashTable.begin(), hit);
+                        (*vit) = (int)distance(hashTable.begin(), hit);
                         //Debug << "new idx: " << (*vit) << endl;
                 }
@@ -185 +185 @@
                                 Face *face = LoadFace(str, vertices, hashTable);
                                 if (!face) break;
-                                
+#if 1
                                 faces.push_back(face);
-
                                 if (faces.size() >= nMaxFaces)
                                 {
@@ -197 +196 @@
                                         
                                         if (parents) 
-                                          {
                                                 AssociateFacesWithInstance(mi, *parents);
-                                          }
-                                        
+                                                                                
                                         // reset tables
                                         hashTable.clear();
                                         faces.clear();
                                 }
+#else
+                                root->mGeometry.push_back(new FaceIntersectable(face));
+                                hashTable.clear();
+#endif
                                 break;
-                        }      // end face
+                        }   // end face
                 default:
                         break;
                 }
-
         }
 
         // there could be faces remaining
-        if (1 && !faces.empty())
+        if (!faces.empty())
         {       
                 Mesh *mesh = CreateMesh(faces, hashTable);
@@ -222 +222 @@
                 
                 if (parents) 
-                {
                         AssociateFacesWithInstance(mi, *parents);
-                }
-
+                
                 root->mGeometry.push_back(mi);  
         }