No commit message

common/Assets.cpp

@@ -10,7 +10,18 @@ Model* Assets::GetModel(const Parameters &params, const std::string &modelName)
     {
         return _models[modelName];
     }
-    Model *result = new Model(params.databaseDirectory + "models/", modelName);
+    Model *result = new Model(params.databaseDirectory + "models/", modelName, *this);
     _models[modelName] = result;
     return result;
 }
+
+GLuint Assets::GetTexture(const std::string &filename)
+{
+    if(_textures.find(filename) != _textures.end())
+    {
+        return _textures[filename];
+    }
+    GLuint result = Utility::MakeOpenGLBitmap(filename);
+    _textures[filename] = result;
+    return result;
+}

common/Assets.h

@@ -8,7 +8,9 @@ class Assets
 {
 public:
     Model* GetModel(const Parameters &params, const std::string &modelName);
+    GLuint GetTexture(const std::string &textureFilename);
 
 private:
     std::map<std::string, Model*> _models;
+    std::map<std::string, GLuint> _textures;
 };

common/Model.cpp

@@ -4,7 +4,7 @@
 
 #include "Common.h"
 
-Model::Model(const std::string &directory, const std::string &baseFilename)
+Model::Model(const std::string &directory, const std::string &baseFilename, Assets &textureStore)
 {
     std::cout << "  Loading model: " << baseFilename << '\n';
 
@@ -50,7 +50,7 @@ Model::Model(const std::string &directory, const std::string &baseFilename)
             //
             // Load the texture
             //
-            activeMaterial->texture = Utility::MakeOpenGLBitmap(directory + textureName);
+            activeMaterial->texture = textureStore.GetTexture(directory + textureName);
         }
     }
 

common/Model.h

@@ -4,10 +4,11 @@
 
 #include "Common.h"
 
+class Assets;
 class Model
 {
 public:
-    Model(const std::string &directory, const std::string &baseFilename);
+    Model(const std::string &directory, const std::string &baseFilename, Assets &textureStore);
 
     void Render();