summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-09-26 16:31:04 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-09-26 16:31:04 +0200
commit45fd8aad33029746424031e12777f2824bda245e (patch)
tree7c984ec6bfda42c807ba48440f6d61fcef9056ef /src/ui
parentb06544871ae48871fc302706ecc49b78c6bcb3d2 (diff)
downloadcolobot-45fd8aad33029746424031e12777f2824bda245e.tar.gz
colobot-45fd8aad33029746424031e12777f2824bda245e.tar.bz2
colobot-45fd8aad33029746424031e12777f2824bda245e.zip
Fog color fix; refactoring
- fixed fog color setting - removed unused glSecondaryColor and altered struct VertexCol - minor refactoring in CText
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/color.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/color.cpp b/src/ui/color.cpp
index 2ba87a3..65f9770 100644
--- a/src/ui/color.cpp
+++ b/src/ui/color.cpp
@@ -190,10 +190,10 @@ void CColor::Draw()
m_engine->SetTexture(""); // no texture
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
- vertex[0] = Gfx::VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
- vertex[1] = Gfx::VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
- vertex[2] = Gfx::VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
- vertex[3] = Gfx::VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
+ vertex[0] = Gfx::VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color);
+ vertex[1] = Gfx::VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color);
+ vertex[2] = Gfx::VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color);
+ vertex[3] = Gfx::VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color);
device = m_engine->GetDevice();
device->DrawPrimitive(Gfx::PRIMITIVE_TRIANGLE_STRIP, vertex, 4);