diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-26 16:40:27 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-26 16:40:27 +0200 |
| commit | 6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c (patch) | |
| tree | 0743ec727b22c5f91579d9baafa10a5cbb67bd60 /src/ui/color.cpp | |
| parent | dad42df4c7878e3da67ab66549fc1a3132893160 (diff) | |
| parent | 45fd8aad33029746424031e12777f2824bda245e (diff) | |
| download | colobot-6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c.tar.gz colobot-6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c.tar.bz2 colobot-6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c.zip | |
Merge master & dev
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); |