BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Texture error checking and removed redundant caching

Browse Source
This commit is contained in:
sippeangelo
2014-05-30 18:51:11 +02:00
parent 235a03ab4c
commit 55db057e50
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Texture.cpp
+5 -4
View File
@@ -8,13 +8,14 @@ Texture::Texture(std::string path)
void Texture::Load(std::string path) void Texture::Load(std::string path)
{ {
auto cachedTexture = m_TextureCache.find(path); m_Texture = SOIL_load_OGL_texture(path.c_str(), 0, 0, SOIL_FLAG_INVERT_Y);
if (cachedTexture == m_TextureCache.end())
if (m_Texture == 0)
{ {
m_TextureCache[path] = SOIL_load_OGL_texture(path.c_str(), 0, 0, SOIL_FLAG_INVERT_Y); LOG_ERROR("SOIL: Failed to load texture \"%s\"", path.c_str());
return;
} }
m_Texture = m_TextureCache[path];
glBindTexture(GL_TEXTURE_2D, m_Texture); glBindTexture(GL_TEXTURE_2D, m_Texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);