From 9f784e81f81651bed087902f9f3afee113e56148 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
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/graphics/common/planet.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/graphics/common/planet.cpp')

diff --git a/src/graphics/common/planet.cpp b/src/graphics/common/planet.cpp
index 5353c54..6be1d31 100644
--- a/src/graphics/common/planet.cpp
+++ b/src/graphics/common/planet.cpp
@@ -135,7 +135,7 @@ void CPlanet::Draw()
 {
 	LPDIRECT3DDEVICE7 device;
 	D3DVERTEX2	vertex[4];	// 2 triangles
-	D3DVECTOR	n;
+	Math::Vector	n;
 	Math::Point		p1, p2;
 	float		eyeDirH, eyeDirV, dp, u1, u2, v1, v2, a;
 	int			i;
@@ -144,7 +144,7 @@ void CPlanet::Draw()
 	eyeDirH = m_engine->RetEyeDirH();
 	eyeDirV = m_engine->RetEyeDirV();
 
-	n = D3DVECTOR(0.0f, 0.0f, -1.0f);  // normal
+	n = Math::Vector(0.0f, 0.0f, -1.0f);  // normal
 	dp = 0.5f/256.0f;
 
 	for ( i=0 ; i<MAXPLANET ; i++ )
@@ -178,10 +178,10 @@ void CPlanet::Draw()
 		u2 = m_planet[m_mode][i].uv2.x - dp;
 		v2 = m_planet[m_mode][i].uv2.y - dp;
 
-		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