Changeset 2795 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.cpp

Timestamp:

06/22/08 05:24:22 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.cpp (moved) (moved from GTP/trunk/App/Demos/Vis/FriendlyCulling/src/BinaryLoader.cpp) (16 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.cpp

@@ -1 @@
-#include "BinaryLoader.h"
+#include "ResourceManager.h"
 #include "Matrix4x4.h"
 #include "Geometry.h"
@@ -5 +5 @@
 #include "Material.h"
 #include "Texture.h"
-//#include "gzstream.h"
+#include "gzstream.h"
 
 
@@ -15 +15 @@
 
 
-BinaryLoader::~BinaryLoader()
-{
-        /** delete all maps.
-        */
-        std::map<int, Texture *>::iterator it, it_end = mTextureTable.end();
-
-        for (it = mTextureTable.begin(); it != it_end; ++ it)
-        {
-                Texture *tex = (*it).second;
-                delete tex;
-        }
-
-        std::map<int, Material *>::iterator nit, nit_end = mMaterialTable.end();
-
-        for (nit = mMaterialTable.begin(); nit != nit_end; ++ nit)
-        {
-                Material *mat = (*nit).second;
-                delete mat;
-        }
-
-        
-        std::map<int, Geometry *>::iterator git, git_end = mGeometryTable.end();
-
-        for (git = mGeometryTable.begin(); git != git_end; ++git)
-        {
-                Geometry *geom = (*git).second;
-                delete geom;
-        }
-}
-
-//SceneEntity *BinaryLoader::LoadSceneEntity(igzstream &str)
-SceneEntity *BinaryLoader::LoadSceneEntity(ifstream &str)
+ResourceManager::~ResourceManager()
+{
+        // delete all resources.
+        CLEAR_CONTAINER(mSceneEntities);
+        CLEAR_CONTAINER(mGeometry);
+        CLEAR_CONTAINER(mMaterials);
+        CLEAR_CONTAINER(mTextures);
+        CLEAR_CONTAINER(mTrafos);
+}
+
+
+SceneEntity *ResourceManager::LoadSceneEntity(igzstream &str)
 {       
         // shape
@@ -69 +49 @@
                 trafo = new Matrix4x4();
                 str.read(reinterpret_cast<char *>(trafo->x), sizeof(Matrix4x4));
+                mTrafos.push_back(trafo);
         }
 
@@ -77 +58 @@
 
 
-void BinaryLoader::LoadTextures(ifstream &str)
+void ResourceManager::LoadTextures(igzstream &str)
 {
         int numTextures;
@@ -97 +78 @@
 
                 mTextureTable[i] = tex;
+                mTextures.push_back(tex);
         }
 
@@ -103 +85 @@
 
 
-void BinaryLoader::LoadShapes(ifstream &str)
+void ResourceManager::LoadShapes(igzstream &str)
 {
         int numShapes;
@@ -115 +97 @@
                 mGeometryTable[i] = geom;
                 mMaterialTable[i] = mat;
+
+                mGeometry.push_back(geom);
+                mMaterials.push_back(mat);
         }
 
@@ -121 +106 @@
 
 
-//Appearance *BinaryLoader::LoadMaterial(igzstream &str)
-Material *BinaryLoader::LoadMaterial(ifstream &str)
+Material *ResourceManager::LoadMaterial(igzstream &str)
 {
         // default material
@@ -145 +129 @@
                 str.read(reinterpret_cast<char *>(&mat->mAmbientColor), sizeof(Vector3));
                 str.read(reinterpret_cast<char *>(&mat->mDiffuseColor), sizeof(Vector3));
+                str.read(reinterpret_cast<char *>(&mat->mEmmisiveColor), sizeof(Vector3));
                 str.read(reinterpret_cast<char *>(&mat->mSpecularColor), sizeof(Vector3));
         }
@@ -152 +137 @@
 
 
-//Geometry *BinaryLoader::LoadGeometry(igzstream &str)
-Geometry *BinaryLoader::LoadGeometry(ifstream &str)
+Geometry *ResourceManager::LoadGeometry(igzstream &str)
 {
         Vector3 *vertices;
@@ -183 +167 @@
         if (texCoordCount)
         {
-                //cout << "loading texcoords of size " << texCoordCount << endl;
                 texcoords = new float[texCoordCount * 2];
                 str.read(reinterpret_cast<char *>(texcoords), sizeof(float) * vertexCount * 2);
@@ -194 +177 @@
 
 
-void BinaryLoader::LoadSceneEntities(ifstream &str, SceneEntityContainer &entities)
+void ResourceManager::LoadSceneEntities(igzstream &str, SceneEntityContainer &entities)
 {
         int entityCount;
@@ -205 +188 @@
                 SceneEntity *ent = LoadSceneEntity(str);
                 entities[i] = ent;
+                mSceneEntities.push_back(ent);
         }
 
@@ -211 +195 @@
 
 
-bool BinaryLoader::Load(const std::string &filename, SceneEntityContainer &entities)
-{
-        //clear_textures(); // clear the texture table
-
-        //igzstream str(filename.c_str());//, ios::binary);
-        ifstream istr(filename.c_str(), ios::binary);
+bool ResourceManager::Load(const std::string &filename, SceneEntityContainer &entities)
+{
+        igzstream istr(filename.c_str());
         
         if (!istr.is_open())
@@ -236 +217 @@
         cout << "bin loading finished" << endl;
 
+        // clean up
+        mTextureTable.clear();
+        mGeometryTable.clear();
+        mMaterialTable.clear();
+
         return true;
 }