Refactor m_revTexNameMap m_texNameMap

hexagonrecursion · Aug 21, 2024 · a29dcd3 · a29dcd3
1 parent 13ed7ba
commit a29dcd3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/colobot-base/src/graphics/engine/engine.cpp b/colobot-base/src/graphics/engine/engine.cpp
@@ -1894,8 +1894,8 @@ Texture CEngine::CreateTexture(const std::filesystem::path& texName, const Textu
         return tex;
     }
 
-    m_texNameMap[TempToString(texName)] = tex;
-    m_revTexNameMap[tex] = TempToString(texName);
+    m_texNameMap[texName] = tex;
+    m_revTexNameMap[tex] = texName;
 
     return tex;
 }
@@ -1916,7 +1916,7 @@ Texture CEngine::LoadTexture(const std::string& name, const TextureCreateParams&
     if (m_texBlacklist.find(TempToPath(name)) != m_texBlacklist.end())
         return Texture();
 
-    std::map<std::string, Texture>::iterator it = m_texNameMap.find(name);
+    auto it = m_texNameMap.find(TempToPath(name));
     if (it != m_texNameMap.end())
         return (*it).second;
 
@@ -2031,7 +2031,7 @@ bool CEngine::LoadAllTextures()
 
 void CEngine::DeleteTexture(const std::string& texName)
 {
-    auto it = m_texNameMap.find(texName);
+    auto it = m_texNameMap.find(TempToPath(texName));
     if (it == m_texNameMap.end())
         return;
 
@@ -2062,7 +2062,7 @@ void CEngine::DeleteTexture(const Texture& tex)
 
 void CEngine::CreateOrUpdateTexture(const std::string& texName, CImage* img)
 {
-    auto it = m_texNameMap.find(texName);
+    auto it = m_texNameMap.find(TempToPath(texName));
     if (it == m_texNameMap.end())
     {
         LoadTexture(texName, img);

diff --git a/colobot-base/src/graphics/engine/engine.h b/colobot-base/src/graphics/engine/engine.h
@@ -1258,9 +1258,9 @@ class CEngine : public CSingleton<CEngine>
     int m_multisample;
 
     //! Map of loaded textures (by name)
-    std::map<std::string, Texture> m_texNameMap;
+    std::map<std::filesystem::path, Texture> m_texNameMap;
     //! Reverse map of loaded textures (by texture)
-    std::map<Texture, std::string> m_revTexNameMap;
+    std::map<Texture, std::filesystem::path> m_revTexNameMap;
     //! Blacklist map of textures
     /** Textures on this list were not successful in first loading,
      *  so are disabled for subsequent load calls. */