Changeset 1658 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

10/20/06 13:21:15 (18 years ago)

Author:

mattausch

Message:

implemented obj dump for fast loading

File:

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

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

@@ -226 +226 @@
 bool Preprocessor::LoadBinaryObj(const string filename,
                                                                  SceneGraphNode *root,
-                                                                 const bool loadMeshes,
                                                                  vector<FaceParentInfo> *parents)
 {
-        ifstream samplesIn(fileName, ios::binary);
+        //ifstream samplesIn(filename, ios::binary);
+        igzstream samplesIn(filename.c_str());
+        
         if (!samplesIn.is_open())
                 return false;
 
-
+        cout << "binary obj dump available, loading " << filename.c_str() << endl;
         // 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)
         {
@@ -271 +267 @@
         
         return true;
+}
+
+
+bool Preprocessor::ExportBinaryObj(const string filename, SceneGraphNode *root)
+{
+        //ifstream samplesIn(filename, ios::binary);
+        ogzstream samplesOut(filename.c_str());
+        if (!samplesOut.is_open())
+                return false;
+
+        ObjectContainer::const_iterator oit, oit_end = root->mGeometry.end();
+
+        for (oit = root->mGeometry.begin(); oit != oit_end; ++ oit)
+        {
+                Intersectable *obj = *oit;
+
+                if (obj->Type() == Intersectable::TRIANGLE_INTERSECTABLE)
+                {
+                        Triangle3 tri = dynamic_cast<TriangleIntersectable *>(obj)->GetItem();
+
+                        samplesOut.write(reinterpret_cast<char *>(tri.mVertices + 0), sizeof(Vector3));
+                        samplesOut.write(reinterpret_cast<char *>(tri.mVertices + 1), sizeof(Vector3));
+                        samplesOut.write(reinterpret_cast<char *>(tri.mVertices + 2), sizeof(Vector3));
+                }
+                else
+                {
+                        cout << "not implemented intersectable type " << obj->Type() << endl;
+                }
+        }
+
+        return true;
+}
+
+static string ReplaceSuffix(string filename, string a, string b)
+{
+        string result = filename;
+
+        int pos = (int)filename.rfind(a, (int)filename.size() - 1);
+        if (pos == filename.size() - a.size()) {
+                result.replace(pos, a.size(), b);
+        }
+        return result;
 }
 
@@ -295 +333 @@
                 &mFaceParents : NULL;
 
-        if (files == 1) {
-                
+        if (files == 1) 
+        {
                 if (strstr(filename.c_str(), ".x3d"))
                 {
                         parser = new X3dParser;
-                }
-                else
-                {
-                  if (strstr(filename.c_str(), ".ply") || strstr(filename.c_str(), ".plb"))
-                  {
-                          parser = new PlyParser;
-                  }
-                  else if (strstr(filename.c_str(), ".obj"))
-                  {
-                          // 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, 
+                        result = parser->ParseFile(filename, 
+                                                                           mSceneGraph->GetRoot(),
+                                                                           mLoadMeshes,
+                                                                           fi);
+                        delete parser;
+                }
+                else if (strstr(filename.c_str(), ".ply") || strstr(filename.c_str(), ".plb"))
+                {
+                        parser = new PlyParser;
+
+                        result = parser->ParseFile(filename, 
+                                                                           mSceneGraph->GetRoot(),
+                                                                           mLoadMeshes,
+                                                                           fi);
+                        delete parser;
+                }
+                else if (strstr(filename.c_str(), ".obj"))
+                {
+                        // hack: load binary dump
+                        string binFile = ReplaceSuffix(filename, ".obj", ".bin");
+
+                        if (!mLoadMeshes)
+                        {
+                                result = LoadBinaryObj(binFile, mSceneGraph->GetRoot(), fi);
+                        }
+
+                        if (!result)
+                        {
+                                cout << "no binary dump available or loading full meshes, parsing file" << endl;
+                                parser = new ObjParser;
+                
+                                result = parser->ParseFile(filename, 
                                                                    mSceneGraph->GetRoot(),
                                                                    mLoadMeshes,
                                                                    fi);
-
-                // only works for triangles
-                ExportBinaryObj(binFile):
-
-                delete parser;
-
+                                                
+                                // only works for triangles
+                                if (!mLoadMeshes)
+                                {
+                                        cout << "exporting binary obj to " << binFile << "... " << endl;
+                                        ExportBinaryObj(binFile, mSceneGraph->GetRoot());
+                                        cout << "finished" << endl;
+                                }
+
+                                delete parser;
+                        }
+                        else if (1)
+                        {
+                                ExportBinaryObj("../data/test.bin", mSceneGraph->GetRoot());
+                                //Exporter *exporter = Exporter::GetExporter("dummy.wrl");
+                                //exporter->ExportGeometry(mSceneGraph->GetRoot()->mGeometry);
+                        }
+                }
+                else 
+                {
+                        parser = new UnigraphicsParser;
+                        result = parser->ParseFile(filename, 
+                                                                           mSceneGraph->GetRoot(),
+                                                                           mLoadMeshes,                                                           
+                                                                           fi);
+                        delete parser;
+                }
+                
+                cout << filename << endl;
         } 
-        else {
+        else 
+        {
                 vector<string>::const_iterator fit, fit_end = filenames.end();