New sound effects

[supertux.git] / src / video / texture_manager.hpp

diff --git a/src/video/texture_manager.hpp b/src/video/texture_manager.hpp
index a9a1fac..54520e2 100644 (file)
--- a/src/video/texture_manager.hpp
+++ b/src/video/texture_manager.hpp
@@ -17,27 +17,32 @@
 #ifndef HEADER_SUPERTUX_VIDEO_TEXTURE_MANAGER_HPP
 #define HEADER_SUPERTUX_VIDEO_TEXTURE_MANAGER_HPP
 
+#include <SDL_video.h>
+
 #include <config.h>
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
+#include "util/currenton.hpp"
 #include "video/glutil.hpp"
+#include "video/texture_ptr.hpp"
 
 class Texture;
 class GLTexture;
 class Rect;
 
-class TextureManager
+class TextureManager : public Currenton<TextureManager>
 {
 public:
   TextureManager();
   ~TextureManager();
 
-  Texture* get(const std::string& filename);
-  Texture* get(const std::string& filename, const Rect& rect);
+  TexturePtr get(const std::string& filename);
+  TexturePtr get(const std::string& filename, const Rect& rect);
 
 #ifdef HAVE_OPENGL
   void register_texture(GLTexture* texture);
@@ -49,24 +54,31 @@ public:
 
 private:
   friend class Texture;
-  void release(Texture* texture);
 
-  typedef std::map<std::string, Texture*> ImageTextures;
-  ImageTextures image_textures;
+  typedef std::map<std::string, std::weak_ptr<Texture> > ImageTextures;
+  ImageTextures m_image_textures;
+
+  typedef std::map<std::string, SDL_Surface*> Surfaces;
+  Surfaces m_surfaces;
+
+private:
+  void reap_cache_entry(const std::string& filename);
 
-  Texture* create_image_texture(const std::string& filename, const Rect& rect);
+  TexturePtr create_image_texture(const std::string& filename, const Rect& rect);
 
   /** on failure a dummy texture is returned and no exception is thrown */
-  Texture* create_image_texture(const std::string& filename);
+  TexturePtr create_image_texture(const std::string& filename);
 
   /** throw an exception on error */
-  Texture* create_image_texture_raw(const std::string& filename);
+  TexturePtr create_image_texture_raw(const std::string& filename);
+  TexturePtr create_image_texture_raw(const std::string& filename, const Rect& rect);
+
+  TexturePtr create_dummy_texture();
 
-  Texture* create_dummy_texture();
-  
 #ifdef HAVE_OPENGL
+private:
   typedef std::set<GLTexture*> Textures;
-  Textures textures;
+  Textures m_textures;
 
   struct SavedTexture
   {
@@ -81,8 +93,9 @@ private:
     GLint wrap_s;
     GLint wrap_t;
   };
-  std::vector<SavedTexture> saved_textures;
+  std::vector<SavedTexture> m_saved_textures;
 
+private:
   void save_texture(GLTexture* texture);
 #endif
 };