diff options
author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-26 22:59:37 +0200 |
---|---|---|
committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-26 22:59:37 +0200 |
commit | 400869ff86e88fdb12c892c7885c07ce2ae99e5e (patch) | |
tree | 4974075a6d57d0054284ca126f8a423ae48060e0 /src/ui/color.cpp | |
parent | f6638a173e21fbee3cc961d3dea82cc89382b873 (diff) | |
parent | 45fd8aad33029746424031e12777f2824bda245e (diff) | |
download | colobot-400869ff86e88fdb12c892c7885c07ce2ae99e5e.tar.gz colobot-400869ff86e88fdb12c892c7885c07ce2ae99e5e.tar.bz2 colobot-400869ff86e88fdb12c892c7885c07ce2ae99e5e.zip |
Merge branch 'master' of git://github.com/colobot/colobot
Diffstat (limited to 'src/ui/color.cpp')
-rw-r--r-- | src/ui/color.cpp | 8 |
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); |