X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvideo%2Ftexture_manager.cpp;h=f334275d46f15b9fb35b45238aa2260096cfcbc0;hb=9af7ca781183b7d57410e5cd3b8bc7f8128ed1b0;hp=7343a45f3a593c970dc3695bb539c44f9dbd090a;hpb=0594f8e8dd1a5e2e3410b408441eeab3baad19f7;p=supertux.git diff --git a/src/video/texture_manager.cpp b/src/video/texture_manager.cpp index 7343a45f3..f334275d4 100644 --- a/src/video/texture_manager.cpp +++ b/src/video/texture_manager.cpp @@ -28,55 +28,63 @@ #include "util/log.hpp" #include "video/sdl_surface_ptr.hpp" #include "video/texture.hpp" -#include "video/video_systems.hpp" +#include "video/video_system.hpp" #ifdef HAVE_OPENGL #include "video/gl/gl_texture.hpp" #endif TextureManager::TextureManager() : - image_textures() + m_image_textures() + ,m_surfaces() #ifdef HAVE_OPENGL - ,textures(), - saved_textures() + ,m_textures(), + m_saved_textures() #endif { } TextureManager::~TextureManager() { - for(ImageTextures::iterator i = image_textures.begin(); i != image_textures.end(); ++i) + for(ImageTextures::iterator i = m_image_textures.begin(); i != m_image_textures.end(); ++i) { if(!i->second.expired()) { log_warning << "Texture '" << i->first << "' not freed" << std::endl; } } - image_textures.clear(); + m_image_textures.clear(); + + for(auto& surface : m_surfaces) + { + SDL_FreeSurface(surface.second); + } + m_surfaces.clear(); } TexturePtr TextureManager::get(const std::string& _filename) { std::string filename = FileSystem::normalize(_filename); - ImageTextures::iterator i = image_textures.find(filename); + ImageTextures::iterator i = m_image_textures.find(filename); TexturePtr texture; - if(i != image_textures.end()) + if(i != m_image_textures.end()) texture = i->second.lock(); if(!texture) { texture = create_image_texture(filename); texture->cache_filename = filename; - image_textures[filename] = texture; + m_image_textures[filename] = texture; } return texture; } TexturePtr -TextureManager::get(const std::string& filename, const Rect& rect) +TextureManager::get(const std::string& _filename, const Rect& rect) { + std::string filename = FileSystem::normalize(_filename); // FIXME: implement caching return create_image_texture(filename, rect); } @@ -84,30 +92,30 @@ TextureManager::get(const std::string& filename, const Rect& rect) void TextureManager::reap_cache_entry(const std::string& filename) { - ImageTextures::iterator i = image_textures.find(filename); - assert(i != image_textures.end()); + ImageTextures::iterator i = m_image_textures.find(filename); + assert(i != m_image_textures.end()); assert(i->second.expired()); - image_textures.erase(i); + m_image_textures.erase(i); } #ifdef HAVE_OPENGL void TextureManager::register_texture(GLTexture* texture) { - textures.insert(texture); + m_textures.insert(texture); } void TextureManager::remove_texture(GLTexture* texture) { - textures.erase(texture); + m_textures.erase(texture); } #endif TexturePtr TextureManager::create_image_texture(const std::string& filename, const Rect& rect) { - try + try { return create_image_texture_raw(filename, rect); } @@ -121,46 +129,61 @@ TextureManager::create_image_texture(const std::string& filename, const Rect& re 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) + SDL_Surface *image = nullptr; + + Surfaces::iterator i = m_surfaces.find(filename); + if (i != m_surfaces.end()) { - std::ostringstream msg; - msg << "Couldn't load image '" << filename << "' :" << SDL_GetError(); - throw std::runtime_error(msg.str()); + image = i->second; } else { - SDLSurfacePtr subimage(SDL_CreateRGBSurfaceFrom(static_cast(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) + image = IMG_Load_RW(get_physfs_SDLRWops(filename), 1); + if (!image) { - throw std::runtime_error("SDL_CreateRGBSurfaceFrom() call failed"); + std::ostringstream msg; + msg << "Couldn't load image '" << filename << "' :" << SDL_GetError(); + throw std::runtime_error(msg.str()); } - 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); - } - return VideoSystem::new_texture(subimage.get()); - } + m_surfaces[filename] = image; + } + + SDL_PixelFormat* format = image->format; + if(format->Rmask == 0 && format->Gmask == 0 && format->Bmask == 0 && format->Amask == 0) { + log_warning << "Wrong surface format for image " << filename << ". Compensating." << std::endl; + image = SDL_ConvertSurfaceFormat(image, SDL_PIXELFORMAT_RGBA8888, 0); } + + SDLSurfacePtr subimage(SDL_CreateRGBSurfaceFrom(static_cast(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"); + } + +#ifdef OLD_SDL + if (image->format->palette) + { // copy the image palette to subimage if present + SDL_SetSurfacePalette(subimage.get(), image->format->palette->colors); + } +#endif + + return VideoSystem::current()->new_texture(subimage.get()); } TexturePtr TextureManager::create_image_texture(const std::string& filename) { - try + try { return create_image_texture_raw(filename); } @@ -175,7 +198,7 @@ TexturePtr TextureManager::create_image_texture_raw(const std::string& filename) { SDLSurfacePtr image(IMG_Load_RW(get_physfs_SDLRWops(filename), 1)); - if (!image) + if (!image) { std::ostringstream msg; msg << "Couldn't load image '" << filename << "' :" << SDL_GetError(); @@ -183,7 +206,9 @@ TextureManager::create_image_texture_raw(const std::string& filename) } else { - return VideoSystem::new_texture(image.get()); + TexturePtr texture = VideoSystem::current()->new_texture(image.get()); + image.reset(NULL); + return texture; } } @@ -191,26 +216,28 @@ TexturePtr TextureManager::create_dummy_texture() { const std::string dummy_texture_fname = "images/engine/missing.png"; - + // on error, try loading placeholder file - try + try { TexturePtr tex = create_image_texture_raw(dummy_texture_fname); return tex; } - catch (const std::exception& err) + 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; + throw; } else { log_warning << "Couldn't load texture '" << dummy_texture_fname << "' (now using empty one): " << err.what() << std::endl; - return VideoSystem::new_texture(image.get()); + TexturePtr texture = VideoSystem::current()->new_texture(image.get()); + image.reset(NULL); + return texture; } } } @@ -219,7 +246,7 @@ TextureManager::create_dummy_texture() void TextureManager::save_textures() { -#ifdef GL_PACK_ROW_LENGTH +#if defined(GL_PACK_ROW_LENGTH) || defined(USE_GLBINDING) /* all this stuff is not support by OpenGL ES */ glPixelStorei(GL_PACK_ROW_LENGTH, 0); glPixelStorei(GL_PACK_IMAGE_HEIGHT, 0); @@ -229,12 +256,20 @@ TextureManager::save_textures() #endif glPixelStorei(GL_PACK_ALIGNMENT, 1); - for(Textures::iterator i = textures.begin(); i != textures.end(); ++i) { + + for(Textures::iterator i = m_textures.begin(); i != m_textures.end(); ++i) + { save_texture(*i); } - for(ImageTextures::iterator i = image_textures.begin(); - i != image_textures.end(); ++i) { - save_texture(dynamic_cast(i->second.lock().get())); + + for(ImageTextures::iterator i = m_image_textures.begin(); + i != m_image_textures.end(); ++i) + { + GLTexture* texture = dynamic_cast(i->second.lock().get()); + if(texture == NULL) + continue; + + save_texture(texture); } } @@ -269,7 +304,7 @@ TextureManager::save_texture(GLTexture* texture) saved_texture.pixels); #endif - saved_textures.push_back(saved_texture); + m_saved_textures.push_back(saved_texture); glDeleteTextures(1, &(texture->get_handle())); texture->set_handle(0); @@ -280,7 +315,7 @@ TextureManager::save_texture(GLTexture* texture) void TextureManager::reload_textures() { -#ifdef GL_UNPACK_ROW_LENGTH +#if defined(GL_UNPACK_ROW_LENGTH) || defined(USE_GLBINDING) /* OpenGL ES doesn't support these */ glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0); @@ -290,8 +325,8 @@ TextureManager::reload_textures() #endif glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - for(std::vector::iterator i = saved_textures.begin(); - i != saved_textures.end(); ++i) { + for(std::vector::iterator i = m_saved_textures.begin(); + i != m_saved_textures.end(); ++i) { SavedTexture& saved_texture = *i; GLuint handle; @@ -299,7 +334,7 @@ TextureManager::reload_textures() assert_gl("creating texture handle"); glBindTexture(GL_TEXTURE_2D, handle); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, + glTexImage2D(GL_TEXTURE_2D, 0, static_cast(GL_RGBA), saved_texture.width, saved_texture.height, saved_texture.border, GL_RGBA, GL_UNSIGNED_BYTE, saved_texture.pixels); @@ -319,7 +354,7 @@ TextureManager::reload_textures() saved_texture.texture->set_handle(handle); } - saved_textures.clear(); + m_saved_textures.clear(); } #endif