Further cleanups to texture caching, from bug 523:
[supertux.git] / src / video / texture_manager.cpp
index 5cb962b..7343a45 100644 (file)
 #include "video/texture_manager.hpp"
 
 #include <SDL_image.h>
+#include <assert.h>
 #include <iostream>
+#include <sstream>
+#include <stdexcept>
 
+#include "math/rect.hpp"
 #include "physfs/physfs_sdl.hpp"
 #include "util/file_system.hpp"
 #include "util/log.hpp"
-#include "video/gl/gl_texture.hpp"
+#include "video/sdl_surface_ptr.hpp"
+#include "video/texture.hpp"
 #include "video/video_systems.hpp"
 
+#ifdef HAVE_OPENGL
+#include "video/gl/gl_texture.hpp"
+#endif
+
 TextureManager::TextureManager() :
   image_textures()
 #ifdef HAVE_OPENGL
@@ -36,38 +45,49 @@ TextureManager::TextureManager() :
 
 TextureManager::~TextureManager()
 {
-  for(ImageTextures::iterator i = image_textures.begin();
-      i != image_textures.end(); ++i) {
-    if(i->second == NULL)
-      continue;
-    log_warning << "Texture '" << i->first << "' not freed" << std::endl;
-    delete i->second;
+  for(ImageTextures::iterator i = image_textures.begin(); i != image_textures.end(); ++i)
+  {
+    if(!i->second.expired())
+    {
+      log_warning << "Texture '" << i->first << "' not freed" << std::endl;
+    }
   }
+  image_textures.clear();
 }
 
-Texture*
+TexturePtr
 TextureManager::get(const std::string& _filename)
 {
   std::string filename = FileSystem::normalize(_filename);
   ImageTextures::iterator i = image_textures.find(filename);
 
-  Texture* texture = NULL;
+  TexturePtr texture;
   if(i != image_textures.end())
-    texture = i->second;
+    texture = i->second.lock();
 
-  if(texture == NULL) {
+  if(!texture) {
     texture = create_image_texture(filename);
+    texture->cache_filename = filename;
     image_textures[filename] = texture;
   }
 
   return texture;
 }
 
+TexturePtr
+TextureManager::get(const std::string& filename, const Rect& rect)
+{
+  // FIXME: implement caching
+  return create_image_texture(filename, rect);
+}
+
 void
-TextureManager::release(Texture* texture)
+TextureManager::reap_cache_entry(const std::string& filename)
 {
-  image_textures.erase(texture->get_filename());
-  delete texture;
+  ImageTextures::iterator i = image_textures.find(filename);
+  assert(i != image_textures.end());
+  assert(i->second.expired());
+  image_textures.erase(i);
 }
 
 #ifdef HAVE_OPENGL
@@ -84,70 +104,113 @@ TextureManager::remove_texture(GLTexture* texture)
 }
 #endif
 
-Texture*
-TextureManager::create_image_texture(const std::string& filename)
+TexturePtr
+TextureManager::create_image_texture(const std::string& filename, const Rect& rect)
 {
-  try {
+  try 
+  {
+    return create_image_texture_raw(filename, rect);
+  }
+  catch(const std::exception& err)
+  {
+    log_warning << "Couldn't load texture '" << filename << "' (now using dummy texture): " << err.what() << std::endl;
+    return create_dummy_texture();
+  }
+}
 
-    SDL_Surface* image = IMG_Load_RW(get_physfs_SDLRWops(filename), 1);
-    if(image == 0) {
-      std::ostringstream msg;
-      msg << "Couldn't load image '" << filename << "' :" << SDL_GetError();
-      throw std::runtime_error(msg.str());
+TexturePtr
+TextureManager::create_image_texture_raw(const std::string& filename, const Rect& rect)
+{
+  SDLSurfacePtr image(IMG_Load_RW(get_physfs_SDLRWops(filename), 1));
+  if (!image)
+  {
+    std::ostringstream msg;
+    msg << "Couldn't load image '" << filename << "' :" << SDL_GetError();
+    throw std::runtime_error(msg.str());
+  }
+  else
+  {
+    SDLSurfacePtr subimage(SDL_CreateRGBSurfaceFrom(static_cast<uint8_t*>(image->pixels) + 
+                                                    rect.top * image->pitch + 
+                                                    rect.left * image->format->BytesPerPixel, 
+
+                                                    rect.get_width(), rect.get_height(),
+                                                    image->format->BitsPerPixel,
+                                                    image->pitch,
+                                                    image->format->Rmask,
+                                                    image->format->Gmask,
+                                                    image->format->Bmask,
+                                                    image->format->Amask));
+    if (!subimage)
+    {
+      throw std::runtime_error("SDL_CreateRGBSurfaceFrom() call failed");
     }
+    else
+    {
+      if (image->format->palette)
+      { // copy the image palette to subimage if present
+        SDL_SetColors(subimage.get(), image->format->palette->colors, 0, image->format->palette->ncolors);
+      }
 
-    Texture* result = 0;
-    try {
-      result = VideoSystem::new_texture(image);
-      result->set_filename(filename);
-    } catch(...) {
-      delete result;
-      SDL_FreeSurface(image);
-      throw;
+      return VideoSystem::new_texture(subimage.get());
     }
+  }
+}
 
-    SDL_FreeSurface(image);
-    return result;
-
-  } catch (const std::runtime_error& err) {
-    const std::string dummy_texture_fname = "images/engine/missing.png";
-    if (filename == dummy_texture_fname) throw err;
-
-    // on error, try loading placeholder file
-    try {
-
-      Texture* tex = create_image_texture(dummy_texture_fname);
-      log_warning << "Couldn't load texture '" << filename << "' (now using dummy texture): " << err.what() << std::endl;
-      return tex;
-
-    } catch (...) {
-
-      // on error (when loading placeholder), try using empty surface
-      try {
-
-        SDL_Surface* image = SDL_CreateRGBSurface(0, 1024, 1024, 8, 0, 0, 0, 0);
-        if(image == 0) {
-          throw err;
-        }
-
-        Texture* result = 0;
-        try {
-          result = VideoSystem::new_texture(image);
-          result->set_filename("-dummy-texture-.png");
-        } catch(...) {
-          delete result;
-          SDL_FreeSurface(image);
-          throw err;
-        }
+TexturePtr
+TextureManager::create_image_texture(const std::string& filename)
+{
+  try 
+  {
+    return create_image_texture_raw(filename);
+  }
+  catch (const std::exception& err)
+  {
+    log_warning << "Couldn't load texture '" << filename << "' (now using dummy texture): " << err.what() << std::endl;
+    return create_dummy_texture();
+  }
+}
 
-        SDL_FreeSurface(image);
-        log_warning << "Couldn't load texture '" << filename << "' (now using empty one): " << err.what() << std::endl;
-        return result;
+TexturePtr
+TextureManager::create_image_texture_raw(const std::string& filename)
+{
+  SDLSurfacePtr image(IMG_Load_RW(get_physfs_SDLRWops(filename), 1));
+  if (!image) 
+  {
+    std::ostringstream msg;
+    msg << "Couldn't load image '" << filename << "' :" << SDL_GetError();
+    throw std::runtime_error(msg.str());
+  }
+  else
+  {
+    return VideoSystem::new_texture(image.get());
+  }
+}
 
-        // on error (when trying to use empty surface), give up
-      } catch (const std::runtime_error& err) {
-        throw err;
-      }
+TexturePtr
+TextureManager::create_dummy_texture()
+{
+  const std::string dummy_texture_fname = "images/engine/missing.png";
+  // on error, try loading placeholder file
+  try 
+  {
+    TexturePtr tex = create_image_texture_raw(dummy_texture_fname);
+    return tex;
+  }
+  catch (const std::exception& err) 
+  {
+    // on error (when loading placeholder), try using empty surface,
+    // when that fails to, just give up
+    SDLSurfacePtr image(SDL_CreateRGBSurface(0, 1024, 1024, 8, 0, 0, 0, 0));
+    if (!image)
+    {
+      throw err;
+    }
+    else
+    {
+      log_warning << "Couldn't load texture '" << dummy_texture_fname << "' (now using empty one): " << err.what() << std::endl;
+      return VideoSystem::new_texture(image.get());
     }
   }
 }
@@ -171,7 +234,7 @@ TextureManager::save_textures()
   }
   for(ImageTextures::iterator i = image_textures.begin();
       i != image_textures.end(); ++i) {
-    save_texture(dynamic_cast<GLTexture *>(i->second));
+    save_texture(dynamic_cast<GLTexture*>(i->second.lock().get()));
   }
 }