Fixed SatCom image loading

Now LoadTexture/SetTexture functions require full path with "textures/" directory

7 files changed, 38 insertions, 38 deletions

diff --git a/src/graphics/engine/cloud.cpp b/src/graphics/engine/cloud.cpp
index 74083af..2f1720e 100644
--- a/src/graphics/engine/cloud.cpp
+++ b/src/graphics/engine/cloud.cpp
@@ -125,8 +125,8 @@ void CCloud::Draw()
     material.ambient = m_ambient;
     m_engine->SetMaterial(material);
 
-    m_engine->SetTexture(m_fileName, 0);
-    m_engine->SetTexture(m_fileName, 1);
+    m_engine->SetTexture("textures/"+m_fileName, 0);
+    m_engine->SetTexture("textures/"+m_fileName, 1);
 
     m_engine->SetState(ENG_RSTATE_TTEXTURE_BLACK | ENG_RSTATE_FOG | ENG_RSTATE_WRAP);
 
@@ -218,7 +218,7 @@ void CCloud::Create(const std::string& fileName,
     m_fileName = fileName;
 
     if (! m_fileName.empty())
-        m_engine->LoadTexture(m_fileName);
+        m_engine->LoadTexture("textures/"+m_fileName);
 
     if (m_terrain == nullptr)
         m_terrain = CRobotMain::GetInstancePointer()->GetTerrain();
diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp
index cfb794a..2996cb2 100644
--- a/src/graphics/engine/engine.cpp
+++ b/src/graphics/engine/engine.cpp
@@ -282,7 +282,7 @@ bool CEngine::Create()
     params.minFilter = TEX_MIN_FILTER_NEAREST;
     params.magFilter = TEX_MAG_FILTER_NEAREST;
     params.mipmap = false;
-    m_miceTexture = LoadTexture("interface/mouse.png", params);
+    m_miceTexture = LoadTexture("textures/interface/mouse.png", params);
 
     GetSystemUtils()->GetCurrentTimeStamp(m_currentFrameTime);
     GetSystemUtils()->GetCurrentTimeStamp(m_lastFrameTime);
@@ -1123,10 +1123,10 @@ void CEngine::ChangeSecondTexture(int objRank, const std::string& tex2Name)
         p1.next[l2].next.clear();
 
         if (!newP2.tex1.Valid())
-            newP2.tex1 = LoadTexture(newP2.tex1Name);
+            newP2.tex1 = LoadTexture("textures/"+newP2.tex1Name);
 
         if (!newP2.tex2.Valid())
-            newP2.tex2 = LoadTexture(newP2.tex2Name);
+            newP2.tex2 = LoadTexture("textures/"+newP2.tex2Name);
     }
 }
 
@@ -2257,7 +2257,7 @@ Texture CEngine::CreateTexture(const std::string& texName, const TextureCreatePa
 
     if (image == nullptr)
     {
-        if (!img.Load("textures/"+texName))
+        if (!img.Load(texName))
         {
             std::string error = img.GetError();
             GetLogger()->Error("Couldn't load texture '%s': %s, blacklisting\n", texName.c_str(), error.c_str());
@@ -2308,27 +2308,27 @@ Texture CEngine::LoadTexture(const std::string& name, const TextureCreateParams&
 
 bool CEngine::LoadAllTextures()
 {
-    LoadTexture("interface/text.png");
-    m_miceTexture = LoadTexture("interface/mouse.png");
-    LoadTexture("interface/button1.png");
-    LoadTexture("interface/button2.png");
-    LoadTexture("interface/button3.png");
-    LoadTexture("interface/effect00.png");
-    LoadTexture("interface/effect01.png");
-    LoadTexture("interface/effect02.png");
-    LoadTexture("interface/map.png");
+    LoadTexture("textures/interface/text.png");
+    m_miceTexture = LoadTexture("textures/interface/mouse.png");
+    LoadTexture("textures/interface/button1.png");
+    LoadTexture("textures/interface/button2.png");
+    LoadTexture("textures/interface/button3.png");
+    LoadTexture("textures/interface/effect00.png");
+    LoadTexture("textures/interface/effect01.png");
+    LoadTexture("textures/interface/effect02.png");
+    LoadTexture("textures/interface/map.png");
 
     if (! m_backgroundName.empty())
     {
         TextureCreateParams params = m_defaultTexParams;
         params.padToNearestPowerOfTwo = true;
-        m_backgroundTex = LoadTexture(m_backgroundName, params);
+        m_backgroundTex = LoadTexture("textures/"+m_backgroundName, params);
     }
     else
         m_backgroundTex.SetInvalid();
 
     if (! m_foregroundName.empty())
-        m_foregroundTex = LoadTexture(m_foregroundName);
+        m_foregroundTex = LoadTexture("textures/"+m_foregroundName);
     else
         m_foregroundTex.SetInvalid();
 
@@ -2362,9 +2362,9 @@ bool CEngine::LoadAllTextures()
             if (! p2.tex1Name.empty())
             {
                 if (terrain)
-                    p2.tex1 = LoadTexture(p2.tex1Name, m_terrainTexParams);
+                    p2.tex1 = LoadTexture("textures/"+p2.tex1Name, m_terrainTexParams);
                 else
-                    p2.tex1 = LoadTexture(p2.tex1Name);
+                    p2.tex1 = LoadTexture("textures/"+p2.tex1Name);
 
                 if (! p2.tex1.Valid())
                     ok = false;
@@ -2373,9 +2373,9 @@ bool CEngine::LoadAllTextures()
             if (! p2.tex2Name.empty())
             {
                 if (terrain)
-                    p2.tex2 = LoadTexture(p2.tex2Name, m_terrainTexParams);
+                    p2.tex2 = LoadTexture("textures/"+p2.tex2Name, m_terrainTexParams);
                 else
-                    p2.tex2 = LoadTexture(p2.tex2Name);
+                    p2.tex2 = LoadTexture("textures/"+p2.tex2Name);
 
                 if (! p2.tex2.Valid())
                     ok = false;
@@ -2425,7 +2425,7 @@ bool CEngine::ChangeTextureColor(const std::string& texName,
 
 
     CImage img;
-    if (!img.Load("textures/"+texName))
+    if (!img.Load(texName))
     {
         std::string error = img.GetError();
         GetLogger()->Error("Couldn't load texture '%s': %s, blacklisting\n", texName.c_str(), error.c_str());
@@ -2770,7 +2770,7 @@ void CEngine::SetBackground(const std::string& name, Color up, Color down,
     {
         TextureCreateParams params = m_defaultTexParams;
         params.padToNearestPowerOfTwo = true;
-        m_backgroundTex = LoadTexture(m_backgroundName, params);
+        m_backgroundTex = LoadTexture("textures/"+m_backgroundName, params);
     }
 }
 
@@ -2796,7 +2796,7 @@ void CEngine::SetForegroundName(const std::string& name)
     m_foregroundName = name;
 
     if (! m_foregroundName.empty())
-        m_foregroundTex = LoadTexture(m_foregroundName);
+        m_foregroundTex = LoadTexture("textures/"+m_foregroundName);
 }
 
 void CEngine::SetOverFront(bool front)
@@ -3735,7 +3735,7 @@ void CEngine::UpdateGroundSpotTextures()
             }
 
             std::stringstream str;
-            str << "shadow" << std::setfill('0') << std::setw(2) << s << ".png";
+            str << "textures/shadow" << std::setfill('0') << std::setw(2) << s << ".png";
             std::string texName = str.str();
 
             DeleteTexture(texName);
@@ -3784,7 +3784,7 @@ void CEngine::DrawShadow()
     SetMaterial(material);
 
     // TODO: create a separate texture
-    SetTexture("interface/text.png");
+    SetTexture("textures/interface/text.png");
 
     Math::Point ts, ti;
 
diff --git a/src/graphics/engine/lightning.cpp b/src/graphics/engine/lightning.cpp
index b0e144c..69d8a3c 100644
--- a/src/graphics/engine/lightning.cpp
+++ b/src/graphics/engine/lightning.cpp
@@ -235,7 +235,7 @@ void CLightning::Draw()
     mat.LoadIdentity();
     device->SetTransform(TRANSFORM_WORLD, mat);
 
-    m_engine->SetTexture("interface/effect00.png");
+    m_engine->SetTexture("textures/interface/effect00.png");
     m_engine->SetState(ENG_RSTATE_TTEXTURE_BLACK);
 
     Math::Point texInf;
diff --git a/src/graphics/engine/particle.cpp b/src/graphics/engine/particle.cpp
index 3dc8c0d..229385e 100644
--- a/src/graphics/engine/particle.cpp
+++ b/src/graphics/engine/particle.cpp
@@ -3532,7 +3532,7 @@ void CParticle::DrawParticle(int sheet)
             if (m_particle[i].sheet != sheet)  continue;
             if (m_particle[i].type == PARTIPART)  continue;
 
-            m_engine->SetTexture(m_triangle[i].tex1Name);
+            m_engine->SetTexture("textures/"+m_triangle[i].tex1Name);
             m_engine->SetMaterial(m_triangle[i].material);
             m_engine->SetState(m_triangle[i].state);
             DrawParticleTriangle(i);
@@ -3551,7 +3551,7 @@ void CParticle::DrawParticle(int sheet)
     // Draw tire marks.
     if (m_wheelTraceTotal > 0 && sheet == SH_WORLD)
     {
-        m_engine->SetTexture("interface/text.png");
+        m_engine->SetTexture("textures/interface/text.png");
         m_engine->SetState(ENG_RSTATE_TTEXTURE_WHITE);
         Math::Matrix matrix;
         matrix.LoadIdentity();
@@ -3582,7 +3582,7 @@ void CParticle::DrawParticle(int sheet)
             {
                 std::string name;
                 NameParticle(name, t);
-                m_engine->SetTexture(name);
+                m_engine->SetTexture("textures/"+name);
                 loadTexture = true;
             }
 
diff --git a/src/graphics/engine/planet.cpp b/src/graphics/engine/planet.cpp
index 0c96f63..bfcfe8a 100644
--- a/src/graphics/engine/planet.cpp
+++ b/src/graphics/engine/planet.cpp
@@ -86,7 +86,7 @@ void CPlanet::LoadTexture()
     {
         for (int i = 0; i < static_cast<int>( m_planet[j].size() ); i++)
         {
-            m_engine->LoadTexture(m_planet[j][i].name);
+            m_engine->LoadTexture("textures/"+m_planet[j][i].name);
         }
     }
 }
@@ -102,7 +102,7 @@ void CPlanet::Draw()
 
     for (int i = 0; i < static_cast<int>( m_planet[m_mode].size() ); i++)
     {
-        m_engine->SetTexture(m_planet[m_mode][i].name);
+        m_engine->SetTexture("textures/"+m_planet[m_mode][i].name);
 
         if (m_planet[m_mode][i].transparent)
             m_engine->SetState(ENG_RSTATE_WRAP | ENG_RSTATE_ALPHA);
diff --git a/src/graphics/engine/pyro.cpp b/src/graphics/engine/pyro.cpp
index d3e0405..ea0b0fa 100644
--- a/src/graphics/engine/pyro.cpp
+++ b/src/graphics/engine/pyro.cpp
@@ -1594,7 +1594,7 @@ void CPyro::ExploStart()
         if (channel != -1)
             m_object->SetMasterParticle(i, channel);
     }
-    m_engine->LoadTexture("dirty04.png");
+    m_engine->LoadTexture("textures/dirty04.png");
 
     DeleteObject(false, true);  // destroys the object transported + the battery
 }
@@ -1637,7 +1637,7 @@ void CPyro::BurnStart()
             m_engine->ChangeSecondTexture(objRank, "dirty04.png");
         }
     }
-    m_engine->LoadTexture("dirty04.png");
+    m_engine->LoadTexture("textures/dirty04.png");
 
     m_burnPartTotal = 0;
 
diff --git a/src/graphics/engine/water.cpp b/src/graphics/engine/water.cpp
index d1f8d29..cb0c43f 100644
--- a/src/graphics/engine/water.cpp
+++ b/src/graphics/engine/water.cpp
@@ -348,8 +348,8 @@ void CWater::DrawSurf()
     material.ambient = m_ambient;
     m_engine->SetMaterial(material);
 
-    m_engine->SetTexture(m_fileName, 0);
-    m_engine->SetTexture(m_fileName, 1);
+    m_engine->SetTexture("textures/"+m_fileName, 0);
+    m_engine->SetTexture("textures/"+m_fileName, 1);
 
     if (m_type[rankview] == WATER_TT)
         m_engine->SetState(ENG_RSTATE_TTEXTURE_BLACK | ENG_RSTATE_DUAL_WHITE | ENG_RSTATE_WRAP, m_color);
@@ -492,7 +492,7 @@ void CWater::Create(WaterType type1, WaterType type2, const std::string& fileNam
     VaporFlush();
 
     if (! m_fileName.empty())
-        m_engine->LoadTexture(m_fileName);
+        m_engine->LoadTexture("textures/"+m_fileName);
 
     if (m_terrain == nullptr)
         m_terrain = CRobotMain::GetInstancePointer()->GetTerrain();