From 45fd8aad33029746424031e12777f2824bda245e Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 26 Sep 2012 16:31:04 +0200 Subject: Fog color fix; refactoring - fixed fog color setting - removed unused glSecondaryColor and altered struct VertexCol - minor refactoring in CText --- src/ui/color.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ui') 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); -- cgit v1.2.3-1-g7c22