Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-20 22:43:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix repeated texture allocation bug

Browse Source
This commit is contained in:
Eduardo Bart
2012-04-24 13:18:45 -03:00
parent 7526315d12
commit 9cf40d7f53
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/framework/graphics/texturemanager.cpp
View File

@@ -29,12 +29,15 @@
TextureManager g_textures;
TexturePtr TextureManager::getTexture(const std::string& textureFile)
TexturePtr TextureManager::getTexture(const std::string& fileName)
{
TexturePtr texture;
// before must resolve filename to full path
std::string filePath = g_resources.resolvePath(fileName);
// check if the texture is already loaded
auto it = m_textures.find(textureFile);
auto it = m_textures.find(filePath);
if(it != m_textures.end()) {
if(it->second.expired())
m_textures.erase(it);
@@ -46,17 +49,18 @@ TexturePtr TextureManager::getTexture(const std::string& textureFile)
if(!texture) {
try {
// currently only png textures are supported
if(!boost::ends_with(textureFile, ".png"))
if(!boost::ends_with(filePath, ".png"))
Fw::throwException("texture file format no supported");
// load texture file data
std::stringstream fin;
g_resources.loadFile(textureFile, fin);
g_resources.loadFile(filePath, fin);
texture = loadPNG(fin);
} catch(Exception& e) {
logError("unable to load texture '", textureFile, "': ", e.what());
logError("unable to load texture '", fileName, "': ", e.what());
texture = g_graphics.getEmptyTexture();
}
m_textures[filePath] = texture;
}
return texture;

2
src/framework/graphics/texturemanager.h
View File

@@ -28,7 +28,7 @@
class TextureManager
{
public:
TexturePtr getTexture(const std::string& textureFile);
TexturePtr getTexture(const std::string& fileName);
static TexturePtr loadPNG(std::stringstream& file);