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

Timestamp:

08/24/06 22:23:33 (18 years ago)

Author:

bittner

Message:

mlrt 16 ray tracing support

File:

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

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

@@ -128 +128 @@
 
 // HACK: associate mesh instances with triangles
-void AssociateFacesWithInstance(MeshInstance *mi, vector<Intersectable *> &parents)
-{
-        Mesh *mesh = mi->GetMesh();
-
-        FaceContainer::const_iterator fit, fit_end = mesh->mFaces.end();
-        
-        for (fit = mesh->mFaces.begin(); fit != fit_end; ++ fit)
-        {
-        parents.push_back(mi);
+void AssociateFacesWithInstance(MeshInstance *mi,
+                                                                vector<FaceParentInfo> &parents)
+{
+  Mesh *mesh = mi->GetMesh();
+  
+  FaceContainer::const_iterator fit, fit_end = mesh->mFaces.end();
+  int i = 0;
+  for (fit = mesh->mFaces.begin(); fit != fit_end; ++ fit, i++)
+        {
+          parents.push_back(FaceParentInfo(mi, i));
         }
 }
@@ -144 +145 @@
                                                   SceneGraphNode **proot,
                                                   const bool loadPolygonsAsMeshes,
-                                                  vector<Intersectable *> *parents)
+                                                  vector<FaceParentInfo> *parents)
 {
         FILE *file;
@@ -192 +193 @@
                                         
                                         if (parents) 
-                                        {
+                                          {
                                                 AssociateFacesWithInstance(mi, *parents);
-                                        }
-
+                                          }
+                                        
                                         // reset tables
                                         hashTable.clear();