#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()
- ,surfaces()
+ 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;
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);
}
TexturePtr
TextureManager::create_image_texture_raw(const std::string& filename, const Rect& rect)
{
- SDL_Surface *image = NULL;
+ SDL_Surface *image = nullptr;
- Surfaces::iterator i = surfaces.find(filename);
- if (i != surfaces.end())
+ Surfaces::iterator i = m_surfaces.find(filename);
+ if (i != m_surfaces.end())
+ {
image = i->second;
-
- if (!image) {
- image = IMG_Load_RW(get_physfs_SDLRWops(filename), 1);
}
-
- if (!image)
+ else
{
- std::ostringstream msg;
- msg << "Couldn't load image '" << filename << "' :" << SDL_GetError();
- throw std::runtime_error(msg.str());
- }
+ 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());
+ }
- 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;
- SDLSurfacePtr subimage(SDL_CreateRGBSurfaceFrom(static_cast<uint8_t*>(image->pixels) +
- rect.top * image->pitch +
- rect.left * image->format->BytesPerPixel,
+ SDL_Surface* converted_surf = SDL_ConvertSurfaceFormat(image, SDL_PIXELFORMAT_RGBA8888, 0);
+ m_surfaces[filename] = converted_surf;
+ }
+ else
+ {
+ m_surfaces[filename] = image;
+ }
+ }
+ 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,
throw std::runtime_error("SDL_CreateRGBSurfaceFrom() call failed");
}
- /* if (image->format->palette)
+#ifdef OLD_SDL
+ if (image->format->palette)
{ // copy the image palette to subimage if present
- SDL_SetSurfacePalette(subimage.get(), image->format->palette->colors); //edited by giby
- } */
+ SDL_SetSurfacePalette(subimage.get(), image->format->palette->colors);
+ }
+#endif
- return VideoSystem::new_texture(subimage.get());
+ return VideoSystem::current()->new_texture(subimage.get());
}
TexturePtr
TextureManager::create_image_texture(const std::string& filename)
{
- try
+ try
{
return create_image_texture_raw(filename);
}
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();
}
else
{
- TexturePtr texture = VideoSystem::new_texture(image.get());
+ TexturePtr texture = VideoSystem::current()->new_texture(image.get());
image.reset(NULL);
return texture;
}
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;
- TexturePtr texture = VideoSystem::new_texture(image.get());
+ TexturePtr texture = VideoSystem::current()->new_texture(image.get());
image.reset(NULL);
return 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);
#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<GLTexture*>(i->second.lock().get()));
+
+ for(ImageTextures::iterator i = m_image_textures.begin();
+ i != m_image_textures.end(); ++i)
+ {
+ GLTexture* texture = dynamic_cast<GLTexture*>(i->second.lock().get());
+ if(texture == NULL)
+ continue;
+
+ save_texture(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);
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);
#endif
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- for(std::vector<SavedTexture>::iterator i = saved_textures.begin();
- i != saved_textures.end(); ++i) {
+ for(std::vector<SavedTexture>::iterator i = m_saved_textures.begin();
+ i != m_saved_textures.end(); ++i) {
SavedTexture& saved_texture = *i;
GLuint handle;
assert_gl("creating texture handle");
glBindTexture(GL_TEXTURE_2D, handle);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+ glTexImage2D(GL_TEXTURE_2D, 0, static_cast<GLint>(GL_RGBA),
saved_texture.width, saved_texture.height,
saved_texture.border, GL_RGBA,
GL_UNSIGNED_BYTE, saved_texture.pixels);
saved_texture.texture->set_handle(handle);
}
- saved_textures.clear();
+ m_saved_textures.clear();
}
#endif
projects / supertux.git / blobdiff