Changeset 1655

Timestamp:

10/20/06 08:32:45 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ObjParser.cpp (modified) (4 diffs)
• Preprocessor.cpp (modified) (2 diffs)

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

@@ -81 +81 @@
         {
                 const int index = (int)strtol(pch, NULL, 10) - 1;
-                //Debug << index << " x ";
-                
+                                
                 // store vertex in hash table
                 hashTable[index] = vertices[index];
@@ -89 +88 @@
                 pch = strtok(NULL, " ");
         }
-        //if (indices.size() > 4) return NULL;
-
+        
     return Triangle3(vertices[indices[0]], vertices[indices[1]], vertices[indices[2]]); 
 }
@@ -144 +142 @@
         Mesh *mesh = mi->GetMesh();
 
+        int i = 0;
         FaceContainer::const_iterator fit, fit_end = mesh->mFaces.end();
-        int i = 0;
+
         for (fit = mesh->mFaces.begin(); fit != fit_end; ++ fit, i++)
         {
@@ -210 +209 @@
                 case 'f': 
                         {
-                          //                            cout << "f";
-
+                                //      cout << "f";
                                 if (loadMeshes)
                                 {

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

@@ -224 +224 @@
 
 
+bool Preprocessor::LoadBinaryObj(const string filename,
+                                                                 SceneGraphNode *root,
+                                                                 const bool loadMeshes,
+                                                                 vector<FaceParentInfo> *parents)
+{
+        ifstream samplesIn(fileName, ios::binary);
+        if (!samplesIn.is_open())
+                return false;
+
+
+        // table associating indices with vectors
+        map<int, Vector3> hashTable;
+        // table for vertices
+        VertexContainer vertices; 
+        FaceContainer faces;
+
+        char str[100];
+        int meshGrouping;
+        Environment::GetSingleton()->GetIntValue("ObjParser.meshGrouping", meshGrouping);
+
+        int nMaxFaces = meshGrouping;
+
+        while (1)
+        {
+                Triangle3 tri;
+                
+                samplesIn.read(reinterpret_cast<char *>(tri.mVertices + 0), sizeof(Vector3));
+                samplesIn.read(reinterpret_cast<char *>(tri.mVertices + 1), sizeof(Vector3));
+                samplesIn.read(reinterpret_cast<char *>(tri.mVertices + 2), sizeof(Vector3));
+                
+                // end of file reached
+                if (samplesIn.eof())
+                        break;
+
+                TriangleIntersectable *obj = new TriangleIntersectable(tri);
+                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);
+                }       
+        }
+        
+        return true;
+}
+
+
 bool
 Preprocessor::LoadScene(const string filename)
 {
-        // use leaf nodes of the original spatial hierarchy as occludees
+    // use leaf nodes of the original spatial hierarchy as occludees
         mSceneGraph = new SceneGraph;
   
@@ -248 +298 @@
                 
                 if (strstr(filename.c_str(), ".x3d"))
-                  parser = new X3dParser;
+                {
+                        parser = new X3dParser;
+                }
                 else
+                {
                   if (strstr(filename.c_str(), ".ply") || strstr(filename.c_str(), ".plb"))
-                        parser = new PlyParser;
+                  {
+                          parser = new PlyParser;
+                  }
                   else if (strstr(filename.c_str(), ".obj"))
-                          parser = new ObjParser;
+                  {
+                          // hack: load binary dump
+                          string binFile = ReplaceSuffix(filename, ".obj", ".bin");
+                        
+                          const bool loaded = 
+                                  LoadBinaryObj(binFile, mSceneGraph->GetRoot(), mLoadMeshes, fi);
+                                
+                          if (loaded)
+                                return true;
+
+              parser = new ObjParser;
+                  }
                   else 
+                  {
                           parser = new UnigraphicsParser;
+                  }
+                }
 
                 cout << filename << endl;
                 
-                result = parser->ParseFile(
-                                filename, 
-                                mSceneGraph->GetRoot(),
-                                mLoadMeshes,
-                                fi);
-                        
+                result = parser->ParseFile(filename, 
+                                                                   mSceneGraph->GetRoot(),
+                                                                   mLoadMeshes,
+                                                                   fi);
+
+                // only works for triangles
+                ExportBinaryObj(binFile):
+
                 delete parser;