Improved ImageManager class.

zhenliang · May 6, 2011 · dbced7e · dbced7e
1 parent d4a98a5
commit dbced7e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/engine/image_mgr.cpp b/engine/image_mgr.cpp
@@ -2,11 +2,21 @@
 
 #include <util\container.h>
 
-bool ImageManager::LoadImage(const std::string path, const std::string& key)
+namespace
 {
-  Image image;
+  const Image kProxyImage = Image(10, 10);
+}
+
+bool ImageManager::LoadImage(const std::string& path, const std::string& key)
+{
+  static Image image;
+
   if (!image.LoadFromFile(path))
+  {
     assert(false);
+    image = kProxyImage;
+  }
+
   return util::Insert(images_, std::make_pair(key, image));
 }
 
@@ -16,6 +26,6 @@ Image& ImageManager::GetImage(const std::string& key)
     return images_[key];
 
   assert(false);
-  static Image nullImage;
-  return nullImage;
+  static Image image = kProxyImage;
+  return image;
 }
diff --git a/engine/image_mgr.h b/engine/image_mgr.h
@@ -12,7 +12,7 @@ class ENGINE_API ImageManager : public util::IGetInstance<ImageManager>
   ImageManager() {}
   virtual ~ImageManager() {}
 
-  bool LoadImage(const std::string path, const std::string& key);
+  bool LoadImage(const std::string& path, const std::string& key);
   Image& GetImage(const std::string& key);
 
 private: