ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong texture if absolute path is not given

Browse Source
This commit is contained in:
Benau 2017-01-04 11:41:11 +08:00
parent 05a29fe7da
commit 63f57d6a9c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/graphics/stk_tex_manager.cpp
View File

@ -31,8 +31,9 @@ STKTexManager::~STKTexManager()
STKTexture* STKTexManager::findTextureInFileSystem(const std::string& filename, STKTexture* STKTexManager::findTextureInFileSystem(const std::string& filename,
std::string* full_path) std::string* full_path)
{ {
*full_path = file_manager->searchTexture(filename); *full_path = file_manager->getFileSystem()->getAbsolutePath
if (*full_path == "") (file_manager->searchTexture(filename).c_str()).c_str();
if (full_path->empty())
{ {
Log::warn("STKTexManager", "Failed to load %s.", filename.c_str()); Log::warn("STKTexManager", "Failed to load %s.", filename.c_str());
return NULL; return NULL;
@ -41,7 +42,7 @@ STKTexture* STKTexManager::findTextureInFileSystem(const std::string& filename,
{ {
if (p.second == NULL) if (p.second == NULL)
continue; continue;
if (*full_path == p.second->getName().getPtr()) if (*full_path == p.first)
return p.second; return p.second;
} }
@ -57,7 +58,7 @@ STKTexture* STKTexManager::findTexturePathless(const std::string& filename)
continue; continue;
std::string lc_name = StringUtils::toLowerCase(filename); std::string lc_name = StringUtils::toLowerCase(filename);
std::string lc_path = std::string lc_path =
StringUtils::toLowerCase(p.second->getName().getPtr()); StringUtils::toLowerCase(p.first);
std::string tex_name = StringUtils::getBasename(lc_path); std::string tex_name = StringUtils::getBasename(lc_path);
if (lc_name == tex_name || lc_name == lc_path) if (lc_name == tex_name || lc_name == lc_path)
return p.second; return p.second;
@ -80,13 +81,13 @@ STKTexture* STKTexManager::getTexture(const std::string& path, bool srgb,
if (path.find('/') == std::string::npos) if (path.find('/') == std::string::npos)
{ {
new_texture = findTextureInFileSystem(path, &full_path); new_texture = findTextureInFileSystem(path, &full_path);
if (full_path == "") if (full_path.empty())
return NULL; return NULL;
if (!no_upload && new_texture) if (!no_upload && new_texture)
return new_texture; return new_texture;
} }
new_texture = new STKTexture(full_path == "" ? path : full_path, srgb, new_texture = new STKTexture(full_path.empty() ? path : full_path, srgb,
premul_alpha, set_material, mesh_tex, no_upload); premul_alpha, set_material, mesh_tex, no_upload);
if (new_texture->getOpenGLTextureName() == 0 && !no_upload) if (new_texture->getOpenGLTextureName() == 0 && !no_upload)
{ {