Changeset 2764 for GTP/trunk/App/Demos/Vis/CHC_revisited/BinaryLoader.cpp

Timestamp:

06/17/08 03:47:02 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/BinaryLoader.cpp (modified) (7 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/BinaryLoader.cpp

@@ -18 +18 @@
 SceneEntity *BinaryLoader::LoadSceneEntity(ifstream &str)
 {       
-        Geometry *geom = LoadGeometry(str);
-        Material *mat = LoadMaterial(str);
-        Matrix4x4 *trafo = NULL;//IdentityMatrix();
+        // shape
+        int shapeId;
+        str.read(reinterpret_cast<char *>(&shapeId), sizeof(int));
+
+        Geometry *geom = mGeometryTable[shapeId];
+        Material *mat = mMaterialTable[shapeId];
+
+
+        bool hasTrafo;
+        str.read(reinterpret_cast<char *>(&hasTrafo), sizeof(bool));
+
+        Matrix4x4 *trafo;
+        
+        if (!hasTrafo)
+        {
+                trafo = NULL;
+        }
+        else
+        {
+                trafo = new Matrix4x4();
+                //*trafo = IdentityMatrix();
+                str.read(reinterpret_cast<char *>(trafo->x), sizeof(Matrix4x4));
+                //str.read(reinterpret_cast<char *>(trafo), sizeof(Matrix4x4));
+                //cout << "m:\n" << *trafo<<endl;
+        }
 
         SceneEntity *sceneGeom = new SceneEntity(geom, mat, trafo);
@@ -37 +59 @@
                 // texture
                 int texnameSize;
-                int id;
-
-                str.read(reinterpret_cast<char *>(&id), sizeof(int));
+
+                //str.read(reinterpret_cast<char *>(&id), sizeof(int));
                 str.read(reinterpret_cast<char *>(&texnameSize), sizeof(int));
 
@@ -48 +69 @@
                 Texture *tex = new Texture(texname);
 
-                mTextureTable[id] = tex;
-        }
+                mTextureTable[i] = tex;
+        }
+
+        cout << "loaded " << mTextureTable.size() << " textures" << endl;
+}
+
+
+void BinaryLoader::LoadShapes(ifstream &str)
+{
+        int numShapes;
+        str.read(reinterpret_cast<char *>(&numShapes), sizeof(int));
+
+        for (int i = 0; i < numShapes; ++ i)
+        {
+                Geometry *geom = LoadGeometry(str);
+                Material *mat = LoadMaterial(str);
+
+                mGeometryTable[i] = geom;
+                mMaterialTable[i] = mat;
+        }
+
+        cout << "loaded " << mGeometryTable.size() << " shapes" << endl;
 }
 
@@ -61 +102 @@
         // texture
         int texId;
-
         str.read(reinterpret_cast<char *>(&texId), sizeof(int));
-        //cout << "texid: " << texId << endl;
 
         if (texId >= 0)
-        {
                 mat->SetTexture(mTextureTable[texId]);
-        }
+        
 
         // material
@@ -99 +137 @@
 
         return app;*/
-
         return mat;
 }
@@ -156 +193 @@
 
 
-bool BinaryLoader::Load(const std::string &filename, SceneEntityContainer &geometry)
+void BinaryLoader::LoadSceneEntities(ifstream &str, SceneEntityContainer &entities)
+{
+        int entityCount;
+        str.read(reinterpret_cast<char *>(&entityCount), sizeof(int));
+
+        entities.resize(entityCount);
+
+        for (int i = 0; i < entityCount; ++ i)
+        {
+                SceneEntity *ent = LoadSceneEntity(str);
+                ent->id = i;
+                entities[i] = ent;
+        }
+
+        cout << "loaded " << entityCount << " scene entities" << endl;
+}
+
+
+bool BinaryLoader::Load(const std::string &filename, SceneEntityContainer &entities)
 {
         //clear_textures(); // clear the texture table
@@ -166 +221 @@
                 return false;
 
+        cout << "loading textures" << endl;
+        
         // load the texture table
         LoadTextures(istr);
 
-        // #shapes
-        int shapeCount;
-        istr.read(reinterpret_cast<char *>(&shapeCount), sizeof(int));
-
-        geometry.resize(shapeCount);
-
-        for (size_t i = 0; i < geometry.size(); ++ i)
-                geometry[i] = NULL;
-        
-
-        int progress = 0;
-
-        for (int i = 0; i < shapeCount; ++ i)
-        {
-                //int id;istr.read(reinterpret_cast<char *>(&id), sizeof(int));
-                SceneEntity *ent = LoadSceneEntity(istr);
-                ent->id = i;
-
-                geometry[i] = ent;
-                
-                int p = (i + 1) * 100 / shapeCount;
-                
-                if (p >= progress)
-                {
-                        cout << "% loaded: " << p << endl;
-                        progress += 10;
-                }
-        }
-
-        for (size_t i = 0; i < geometry.size(); ++ i)
-        {
-                if (!geometry[i])
-                        Debug << "error: index " << i << " missing" << endl;
-        }
-
+        cout << "loading shapes (geometry + materials)" << endl;
+
+        // load the shapees
+        LoadShapes(istr);
+
+        cout << "loading scene entites" << endl;
+        LoadSceneEntities(istr, entities);
+        
         cout << "bin loading finished" << endl;