immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved effect??.png textures and made pos= in GroundSpot optional

dev-mp
krzys-h 2014-09-27 18:26:29 +02:00
parent 32504be8a9
commit b3fa72c007
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data

@ -1 +1 @@
Subproject commit 933ba1930466880db0a751f64ce536ff1d55cb88 Subproject commit 314f1eae8b72374f8234b450e340cad249e2e241

6
src/graphics/engine/engine.cpp
View File

@ -2313,9 +2313,9 @@ bool CEngine::LoadAllTextures()
LoadTexture("textures/interface/button1.png"); LoadTexture("textures/interface/button1.png");
LoadTexture("textures/interface/button2.png"); LoadTexture("textures/interface/button2.png");
LoadTexture("textures/interface/button3.png"); LoadTexture("textures/interface/button3.png");
LoadTexture("textures/interface/effect00.png"); LoadTexture("textures/effect00.png");
LoadTexture("textures/interface/effect01.png"); LoadTexture("textures/effect01.png");
LoadTexture("textures/interface/effect02.png"); LoadTexture("textures/effect02.png");
LoadTexture("textures/interface/map.png"); LoadTexture("textures/interface/map.png");
if (! m_backgroundName.empty()) if (! m_backgroundName.empty())

2
src/graphics/engine/lightning.cpp
View File

@ -235,7 +235,7 @@ void CLightning::Draw()
mat.LoadIdentity(); mat.LoadIdentity();
device->SetTransform(TRANSFORM_WORLD, mat); device->SetTransform(TRANSFORM_WORLD, mat);
m_engine->SetTexture("textures/interface/effect00.png"); m_engine->SetTexture("textures/effect00.png");
m_engine->SetState(ENG_RSTATE_TTEXTURE_BLACK); m_engine->SetState(ENG_RSTATE_TTEXTURE_BLACK);
Math::Point texInf; Math::Point texInf;

6
src/graphics/engine/particle.cpp
View File

@ -198,9 +198,9 @@ void CParticle::FlushParticle(int sheet)
//! Returns file name of the effect effectNN.png, with NN = number //! Returns file name of the effect effectNN.png, with NN = number
void NameParticle(std::string &name, int num) void NameParticle(std::string &name, int num)
{ {
if (num == 1) name = "interface/effect00.png"; if (num == 1) name = "effect00.png";
else if (num == 2) name = "interface/effect01.png"; else if (num == 2) name = "effect01.png";
else if (num == 3) name = "interface/effect02.png"; else if (num == 3) name = "effect02.png";
else if (num == 4) name = "interface/text.png"; else if (num == 4) name = "interface/text.png";
else name = ""; else name = "";
} }

6
src/object/robotmain.cpp
View File

@ -4689,7 +4689,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
rank = m_engine->CreateGroundSpot(); rank = m_engine->CreateGroundSpot();
if (rank != -1) if (rank != -1)
{ {
m_engine->SetObjectGroundSpotPos(rank, line->GetParam("pos")->AsPoint()*g_unit); m_engine->SetObjectGroundSpotPos(rank, line->GetParam("pos")->AsPoint(Math::Vector(0.0f, 0.0f, 0.0f))*g_unit);
m_engine->SetObjectGroundSpotRadius(rank, line->GetParam("radius")->AsFloat(10.0f)*g_unit); m_engine->SetObjectGroundSpotRadius(rank, line->GetParam("radius")->AsFloat(10.0f)*g_unit);
m_engine->SetObjectGroundSpotColor(rank, line->GetParam("color")->AsColor(Gfx::Color(0.533f, 0.533f, 0.533f, 0.533f))); m_engine->SetObjectGroundSpotColor(rank, line->GetParam("color")->AsColor(Gfx::Color(0.533f, 0.533f, 0.533f, 0.533f)));
m_engine->SetObjectGroundSpotSmooth(rank, line->GetParam("smooth")->AsFloat(1.0f)); m_engine->SetObjectGroundSpotSmooth(rank, line->GetParam("smooth")->AsFloat(1.0f));
@ -5102,12 +5102,12 @@ void CRobotMain::ChangeColor()
// PARTIPLOUF0 and PARTIDROP : // PARTIPLOUF0 and PARTIDROP :
ts = Math::Point(0.500f, 0.500f); ts = Math::Point(0.500f, 0.500f);
ti = Math::Point(0.875f, 0.750f); ti = Math::Point(0.875f, 0.750f);
m_engine->ChangeTextureColor("textures/interface/effect00.png", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, true); m_engine->ChangeTextureColor("textures/effect00.png", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, true);
// PARTIFLIC : // PARTIFLIC :
ts = Math::Point(0.00f, 0.75f); ts = Math::Point(0.00f, 0.75f);
ti = Math::Point(0.25f, 1.00f); ti = Math::Point(0.25f, 1.00f);
m_engine->ChangeTextureColor("textures/interface/effect02.png", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, true); m_engine->ChangeTextureColor("textures/effect02.png", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, true);
} }
//! Updates the number of unnecessary objects //! Updates the number of unnecessary objects