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/graphics/engine/engine.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/graphics/engine/engine.cpp')
| -rw-r--r-- | src/graphics/engine/engine.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 37f9b00..c170922 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -3417,10 +3417,10 @@ void CEngine::DrawBackgroundGradient(const Color& up, const Color& down) VertexCol vertex[4] = { - VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color[1], color[2]), - VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color[0], color[2]), - VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color[1], color[2]), - VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color[0], color[2]) + VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color[1]), + VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color[0]), + VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color[1]), + VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color[0]) }; m_device->DrawPrimitive(PRIMITIVE_TRIANGLE_STRIP, vertex, 4); @@ -3567,10 +3567,10 @@ void CEngine::DrawOverColor() VertexCol vertex[4] = { - VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color[1], color[2]), - VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color[0], color[2]), - VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color[1], color[2]), - VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color[0], color[2]) + VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color[1]), + VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color[0]), + VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color[1]), + VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color[0]) }; m_device->DrawPrimitive(PRIMITIVE_TRIANGLE_STRIP, vertex, 4); |