From 9f784e81f81651bed087902f9f3afee113e56148 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Tue, 19 Jun 2012 20:11:47 +0200 Subject: Switched to new implementation of the rest of math module - changed structs from D3DVECTOR to Math::Vector and from D3DMATRIX to Math::Matrix - changed functions to new Math namespace functions - moved mainmovie module from graphics to object - added Get and Set to Math::Matrix --- src/ui/shortcut.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/ui/shortcut.cpp') diff --git a/src/ui/shortcut.cpp b/src/ui/shortcut.cpp index c96cc92..7651c63 100644 --- a/src/ui/shortcut.cpp +++ b/src/ui/shortcut.cpp @@ -198,7 +198,7 @@ void CShortcut::DrawVertex(int icon, float zoom) LPDIRECT3DDEVICE7 device; D3DVERTEX2 vertex[4]; // 2 triangles Math::Point p1, p2, c; - D3DVECTOR n; + Math::Vector n; float u1, u2, v1, v2, dp; device = m_engine->RetD3DDevice(); @@ -228,12 +228,12 @@ void CShortcut::DrawVertex(int icon, float zoom) u2 -= dp; v2 -= dp; - n = D3DVECTOR(0.0f, 0.0f, -1.0f); // normal + n = Math::Vector(0.0f, 0.0f, -1.0f); // normal - vertex[0] = D3DVERTEX2(D3DVECTOR(p1.x, p1.y, 0.0f), n, u1,v2); - vertex[1] = D3DVERTEX2(D3DVECTOR(p1.x, p2.y, 0.0f), n, u1,v1); - vertex[2] = D3DVERTEX2(D3DVECTOR(p2.x, p1.y, 0.0f), n, u2,v2); - vertex[3] = D3DVERTEX2(D3DVECTOR(p2.x, p2.y, 0.0f), n, u2,v1); + vertex[0] = D3DVERTEX2(Math::Vector(p1.x, p1.y, 0.0f), n, u1,v2); + vertex[1] = D3DVERTEX2(Math::Vector(p1.x, p2.y, 0.0f), n, u1,v1); + vertex[2] = D3DVERTEX2(Math::Vector(p2.x, p1.y, 0.0f), n, u2,v2); + vertex[3] = D3DVERTEX2(Math::Vector(p2.x, p2.y, 0.0f), n, u2,v1); device->DrawPrimitive(D3DPT_TRIANGLESTRIP, D3DFVF_VERTEX2, vertex, 4, NULL); m_engine->AddStatisticTriangle(2); -- cgit v1.2.3-1-g7c22