From 106ec014b812c6f5eb93ea30c04b3bba333542dd Mon Sep 17 00:00:00 2001 From: krzys-h Date: Thu, 10 Jul 2014 16:25:40 +0200 Subject: Fixed texture and script loading --- src/graphics/engine/engine.cpp | 26 +++++++++++++------------- src/graphics/engine/lightning.cpp | 2 +- src/graphics/engine/particle.cpp | 10 +++++----- src/graphics/engine/terrain.cpp | 6 ------ 4 files changed, 19 insertions(+), 25 deletions(-) (limited to 'src/graphics/engine') diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 6f6141b..2745068 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("textures/interface/mouse.png", params); + m_miceTexture = LoadTexture("interface/mouse.png", params); GetSystemUtils()->GetCurrentTimeStamp(m_currentFrameTime); GetSystemUtils()->GetCurrentTimeStamp(m_lastFrameTime); @@ -2246,7 +2246,7 @@ Texture CEngine::CreateTexture(const std::string& texName, const TextureCreatePa if (image == nullptr) { - if (!img.Load(texName)) + if (!img.Load("textures/"+texName)) { std::string error = img.GetError(); GetLogger()->Error("Couldn't load texture '%s': %s, blacklisting\n", texName.c_str(), error.c_str()); @@ -2297,15 +2297,15 @@ Texture CEngine::LoadTexture(const std::string& name, const TextureCreateParams& bool CEngine::LoadAllTextures() { - 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"); + 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"); if (! m_backgroundName.empty()) { @@ -2414,7 +2414,7 @@ bool CEngine::ChangeTextureColor(const std::string& texName, CImage img; - if (!img.Load(texName)) + if (!img.Load("textures/"+texName)) { std::string error = img.GetError(); GetLogger()->Error("Couldn't load texture '%s': %s, blacklisting\n", texName.c_str(), error.c_str()); @@ -3773,7 +3773,7 @@ void CEngine::DrawShadow() SetMaterial(material); // TODO: create a separate texture - SetTexture("textures/interface/text.png"); + SetTexture("interface/text.png"); Math::Point ts, ti; diff --git a/src/graphics/engine/lightning.cpp b/src/graphics/engine/lightning.cpp index 69d8a3c..b0e144c 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("textures/interface/effect00.png"); + m_engine->SetTexture("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 9e36153..3dc8c0d 100644 --- a/src/graphics/engine/particle.cpp +++ b/src/graphics/engine/particle.cpp @@ -198,10 +198,10 @@ void CParticle::FlushParticle(int sheet) //! Returns file name of the effect effectNN.png, with NN = number void NameParticle(std::string &name, int num) { - if (num == 1) name = "textures/interface/effect00.png"; - else if (num == 2) name = "textures/interface/effect01.png"; - else if (num == 3) name = "textures/interface/effect02.png"; - else if (num == 4) name = "textures/interface/text.png"; + if (num == 1) name = "interface/effect00.png"; + else if (num == 2) name = "interface/effect01.png"; + else if (num == 3) name = "interface/effect02.png"; + else if (num == 4) name = "interface/text.png"; else name = ""; } @@ -3551,7 +3551,7 @@ void CParticle::DrawParticle(int sheet) // Draw tire marks. if (m_wheelTraceTotal > 0 && sheet == SH_WORLD) { - m_engine->SetTexture("textures/interface/text.png"); + m_engine->SetTexture("interface/text.png"); m_engine->SetState(ENG_RSTATE_TTEXTURE_WHITE); Math::Matrix matrix; matrix.LoadIdentity(); diff --git a/src/graphics/engine/terrain.cpp b/src/graphics/engine/terrain.cpp index 037cba6..6a8dc6b 100644 --- a/src/graphics/engine/terrain.cpp +++ b/src/graphics/engine/terrain.cpp @@ -365,17 +365,11 @@ bool CTerrain::RandomizeRelief() double xi, yi, a, b; a = modf(x * (rozmiar_oktawy-1), &xi); b = modf(y * (rozmiar_oktawy-1), &yi); - /*int xi = floor(x * (rozmiar_oktawy-1)); - int yi = floor(y * (rozmiar_oktawy-1)); - float a = (x * (rozmiar_oktawy-1)) - xi; - float b = (y * (rozmiar_oktawy-1)) - yi;*/ - //CLogger::GetInstancePointer()->Error("%f %f %f %f\n", xi, yi, a, b); float lg = oktawy[i][static_cast(yi * rozmiar_oktawy + xi)]; float pg = oktawy[i][static_cast(yi * rozmiar_oktawy + xi + 1)]; float ld = oktawy[i][static_cast((yi+1) * rozmiar_oktawy + xi)]; float pd = oktawy[i][static_cast((yi+1) * rozmiar_oktawy + xi + 1)]; - //CLogger::GetInstancePointer()->Error("%f %f %f %f\n", lg, pg, ld, pd); float g = pg * a + lg * (1-a); float d = pd * a + ld * (1-a); -- cgit v1.2.3-1-g7c22