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

18 files changed, 311 insertions, 310 deletions

diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp
index 255feb7..f769dae 100644
--- a/src/object/motion/motion.cpp
+++ b/src/object/motion/motion.cpp
@@ -69,9 +69,9 @@ CMotion::CMotion(CInstanceManager* iMan, CObject* object)
 	m_actionTime = 0.0f;

 	m_progress   = 0.0f;

 

-	m_linVibration  = D3DVECTOR(0.0f, 0.0f, 0.0f);

-	m_cirVibration  = D3DVECTOR(0.0f, 0.0f, 0.0f);

-	m_inclinaison   = D3DVECTOR(0.0f, 0.0f, 0.0f);

+	m_linVibration  = Math::Vector(0.0f, 0.0f, 0.0f);

+	m_cirVibration  = Math::Vector(0.0f, 0.0f, 0.0f);

+	m_inclinaison   = Math::Vector(0.0f, 0.0f, 0.0f);

 }

 

 // Object's destructor.

@@ -101,7 +101,7 @@ void CMotion::SetBrain(CBrain* brain)
 

 // Creates.

 

-bool CMotion::Create(D3DVECTOR pos, float angle, ObjectType type, float power)

+bool CMotion::Create(Math::Vector pos, float angle, ObjectType type, float power)

 {

 	return true;

 }

@@ -110,7 +110,7 @@ bool CMotion::Create(D3DVECTOR pos, float angle, ObjectType type, float power)
 

 bool CMotion::EventProcess(const Event &event)

 {

-	D3DVECTOR	pos, dir;

+	Math::Vector	pos, dir;

 	float		time;

 

 	if ( m_object->RetType() != OBJECT_TOTO &&

@@ -221,36 +221,36 @@ bool CMotion::Read(char *line)
 

 // Gives the linear vibration.

 

-void CMotion::SetLinVibration(D3DVECTOR dir)

+void CMotion::SetLinVibration(Math::Vector dir)

 {

 	m_linVibration = dir;

 }

 

-D3DVECTOR CMotion::RetLinVibration()

+Math::Vector CMotion::RetLinVibration()

 {

 	return m_linVibration;

 }

 

 // Gives the circular vibration.

 

-void CMotion::SetCirVibration(D3DVECTOR dir)

+void CMotion::SetCirVibration(Math::Vector dir)

 {

 	m_cirVibration = dir;

 }

 

-D3DVECTOR CMotion::RetCirVibration()

+Math::Vector CMotion::RetCirVibration()

 {

 	return m_cirVibration;

 }

 

 // Gives the tilt.

 

-void CMotion::SetInclinaison(D3DVECTOR dir)

+void CMotion::SetInclinaison(Math::Vector dir)

 {

 	m_inclinaison = dir;

 }

 

-D3DVECTOR CMotion::RetInclinaison()

+Math::Vector CMotion::RetInclinaison()

 {

 	return m_inclinaison;

 }

diff --git a/src/object/motion/motion.h b/src/object/motion/motion.h
index 1c3ab6c..ca2ef79 100644
--- a/src/object/motion/motion.h
+++ b/src/object/motion/motion.h
@@ -49,7 +49,7 @@ public:
 	void	SetBrain(CBrain* brain);

 

 	virtual void	DeleteObject(bool bAll=false);

-	virtual bool	Create(D3DVECTOR pos, float angle, ObjectType type, float power);

+	virtual bool	Create(Math::Vector pos, float angle, ObjectType type, float power);

 	virtual bool	EventProcess(const Event &event);

 	virtual	Error	SetAction(int action, float time=0.2f);

 	virtual int		RetAction();

@@ -60,12 +60,12 @@ public:
 	virtual bool	Write(char *line);

 	virtual bool	Read(char *line);

 

-	virtual void		SetLinVibration(D3DVECTOR dir);

-	virtual D3DVECTOR	RetLinVibration();

-	virtual void		SetCirVibration(D3DVECTOR dir);

-	virtual D3DVECTOR	RetCirVibration();

-	virtual void		SetInclinaison(D3DVECTOR dir);

-	virtual D3DVECTOR	RetInclinaison();

+	virtual void		SetLinVibration(Math::Vector dir);

+	virtual Math::Vector	RetLinVibration();

+	virtual void		SetCirVibration(Math::Vector dir);

+	virtual Math::Vector	RetCirVibration();

+	virtual void		SetInclinaison(Math::Vector dir);

+	virtual Math::Vector	RetInclinaison();

 

 protected:

 

@@ -87,8 +87,8 @@ protected:
 	float			m_actionTime;

 	float			m_progress;

 

-	D3DVECTOR		m_linVibration;		// linear vibration

-	D3DVECTOR		m_cirVibration;		// circular vibration

-	D3DVECTOR		m_inclinaison;		// tilt

+	Math::Vector		m_linVibration;		// linear vibration

+	Math::Vector		m_cirVibration;		// circular vibration

+	Math::Vector		m_inclinaison;		// tilt

 };

 

diff --git a/src/object/motion/motionant.cpp b/src/object/motion/motionant.cpp
index 62a58dc..bdfe773 100644
--- a/src/object/motion/motionant.cpp
+++ b/src/object/motion/motionant.cpp
@@ -80,7 +80,7 @@ void CMotionAnt::DeleteObject(bool bAll)
 

 // Creates a vehicle poses some rolling on the floor.

 

-bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,

+bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type,

 						float power)

 {

 	CModFile*	pModFile;

@@ -105,8 +105,8 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 

 	// A vehicle must have necessarily a collision

 	//with a sphere of center (0, y, 0) (see GetCrashSphere).

-	m_object->CreateCrashSphere(D3DVECTOR(0.0f, -2.0f, 0.0f), 4.0f, SOUND_BOUM, 0.20f);

-	m_object->SetGlobalSphere(D3DVECTOR(-0.5f, 1.0f, 0.0f), 4.0f);

+	m_object->CreateCrashSphere(Math::Vector(0.0f, -2.0f, 0.0f), 4.0f, SOUND_BOUM, 0.20f);

+	m_object->SetGlobalSphere(Math::Vector(-0.5f, 1.0f, 0.0f), 4.0f);

 

 	// Creates the head.

 	rank = m_engine->CreateObject();

@@ -115,7 +115,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(1, 0);

 	pModFile->ReadModel("objects\\ant2.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(1, D3DVECTOR(2.0f, 0.0f, 0.0f));

+	m_object->SetPosition(1, Math::Vector(2.0f, 0.0f, 0.0f));

 

 	// Creates the tail.

 	rank = m_engine->CreateObject();

@@ -124,7 +124,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(2, 0);

 	pModFile->ReadModel("objects\\ant3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(2, D3DVECTOR(-1.0f, 0.0f, 0.0f));

+	m_object->SetPosition(2, Math::Vector(-1.0f, 0.0f, 0.0f));

 

 	// Creates a right-back thigh.

 	rank = m_engine->CreateObject();

@@ -133,7 +133,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(3, 0);

 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(3, D3DVECTOR(-0.4f, -0.1f, -0.3f));

+	m_object->SetPosition(3, Math::Vector(-0.4f, -0.1f, -0.3f));

 

 	// Creates a right-back leg.

 	rank = m_engine->CreateObject();

@@ -142,7 +142,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(4, 3);

 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(4, D3DVECTOR(0.0f, 0.0f, -1.0f));

+	m_object->SetPosition(4, Math::Vector(0.0f, 0.0f, -1.0f));

 

 	// Creates a right-back foot.

 	rank = m_engine->CreateObject();

@@ -151,7 +151,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(5, 4);

 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(5, D3DVECTOR(0.0f, 0.0f, -2.0f));

+	m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -2.0f));

 

 	// Creates two middle-right thighs.

 	rank = m_engine->CreateObject();

@@ -160,7 +160,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(6, 0);

 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(6, D3DVECTOR(0.1f, -0.1f, -0.4f));

+	m_object->SetPosition(6, Math::Vector(0.1f, -0.1f, -0.4f));

 

 	// Creates two middle-right legs.

 	rank = m_engine->CreateObject();

@@ -169,7 +169,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(7, 6);

 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(7, D3DVECTOR(0.0f, 0.0f, -1.0f));

+	m_object->SetPosition(7, Math::Vector(0.0f, 0.0f, -1.0f));

 

 	// Creates two middle-right foots.

 	rank = m_engine->CreateObject();

@@ -178,7 +178,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(8, 7);

 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(8, D3DVECTOR(0.0f, 0.0f, -2.0f));

+	m_object->SetPosition(8, Math::Vector(0.0f, 0.0f, -2.0f));

 

 	// Creates the right front thigh.

 	rank = m_engine->CreateObject();

@@ -187,7 +187,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(9, 0);

 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(9, D3DVECTOR(1.4f, -0.1f, -0.6f));

+	m_object->SetPosition(9, Math::Vector(1.4f, -0.1f, -0.6f));

 

 	// Creates the right front leg.

 	rank = m_engine->CreateObject();

@@ -196,7 +196,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(10, 9);

 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(10, D3DVECTOR(0.0f, 0.0f, -1.0f));

+	m_object->SetPosition(10, Math::Vector(0.0f, 0.0f, -1.0f));

 

 	// Creates the right front foot.

 	rank = m_engine->CreateObject();

@@ -205,7 +205,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(11, 10);

 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(11, D3DVECTOR(0.0f, 0.0f, -2.0f));

+	m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, -2.0f));

 

 	// Creates a left-back thigh.

 	rank = m_engine->CreateObject();

@@ -215,7 +215,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(12, D3DVECTOR(-0.4f, -0.1f, 0.3f));

+	m_object->SetPosition(12, Math::Vector(-0.4f, -0.1f, 0.3f));

 

 	// Creates a left-back leg.

 	rank = m_engine->CreateObject();

@@ -225,7 +225,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(13, D3DVECTOR(0.0f, 0.0f, 1.0f));

+	m_object->SetPosition(13, Math::Vector(0.0f, 0.0f, 1.0f));

 

 	// Creates a left-back foot.

 	rank = m_engine->CreateObject();

@@ -235,7 +235,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(14, D3DVECTOR(0.0f, 0.0f, 2.0f));

+	m_object->SetPosition(14, Math::Vector(0.0f, 0.0f, 2.0f));

 

 	// Creates two middle-left thighs.

 	rank = m_engine->CreateObject();

@@ -245,7 +245,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(15, D3DVECTOR(0.1f, -0.1f, 0.4f));

+	m_object->SetPosition(15, Math::Vector(0.1f, -0.1f, 0.4f));

 

 	// Creates two middle-left legs.

 	rank = m_engine->CreateObject();

@@ -255,7 +255,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(16, D3DVECTOR(0.0f, 0.0f, 1.0f));

+	m_object->SetPosition(16, Math::Vector(0.0f, 0.0f, 1.0f));

 

 	// Creates two middle-left foot.

 	rank = m_engine->CreateObject();

@@ -265,7 +265,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(17, D3DVECTOR(0.0f, 0.0f, 2.0f));

+	m_object->SetPosition(17, Math::Vector(0.0f, 0.0f, 2.0f));

 

 	// Creates the left front thigh.

 	rank = m_engine->CreateObject();

@@ -275,7 +275,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(18, D3DVECTOR(1.4f, -0.1f, 0.6f));

+	m_object->SetPosition(18, Math::Vector(1.4f, -0.1f, 0.6f));

 

 	// Creates the left front leg.

 	rank = m_engine->CreateObject();

@@ -285,7 +285,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(19, D3DVECTOR(0.0f, 0.0f, 1.0f));

+	m_object->SetPosition(19, Math::Vector(0.0f, 0.0f, 1.0f));

 

 	// Creates the left front foot.

 	rank = m_engine->CreateObject();

@@ -295,7 +295,7 @@ bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(20, D3DVECTOR(0.0f, 0.0f, 2.0f));

+	m_object->SetPosition(20, Math::Vector(0.0f, 0.0f, 2.0f));

 

 	m_object->CreateShadowCircle(4.0f, 0.5f);

 

@@ -475,7 +475,7 @@ bool CMotionAnt::EventProcess(const Event &event)
 

 bool CMotionAnt::EventFrame(const Event &event)

 {

-	D3DVECTOR	dir, pos, speed;

+	Math::Vector	dir, pos, speed;

 	Math::Point		dim;

 	float		s, a, prog, time;

 	float		tSt[9], tNd[9];

@@ -671,11 +671,11 @@ bool CMotionAnt::EventFrame(const Event &event)
 	}

 	else if ( m_actionType == MAS_BURN )  // burning?

 	{

-		dir = D3DVECTOR(Math::PI, 0.0f, 0.0f);

+		dir = Math::Vector(Math::PI, 0.0f, 0.0f);

 		SetCirVibration(dir);

-		dir = D3DVECTOR(0.0f, -1.5f, 0.0f);

+		dir = Math::Vector(0.0f, -1.5f, 0.0f);

 		SetLinVibration(dir);

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetInclinaison(dir);

 

 		time = event.rTime*1.0f;

@@ -684,7 +684,7 @@ bool CMotionAnt::EventFrame(const Event &event)
 	}

 	else if ( m_actionType == MAS_RUIN )  // destroyed?

 	{

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetLinVibration(dir);

 		SetCirVibration(dir);

 		SetInclinaison(dir);

@@ -723,7 +723,7 @@ bool CMotionAnt::EventFrame(const Event &event)
 		dir.z = 0.0f;

 		SetCirVibration(dir);

 

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetInclinaison(dir);

 

 		if ( m_progress >= 1.0f )

@@ -752,7 +752,7 @@ bool CMotionAnt::EventFrame(const Event &event)
 			}

 		}

 

-		dir = D3DVECTOR(0.0f, -1.0f, 0.0f);

+		dir = Math::Vector(0.0f, -1.0f, 0.0f);

 		SetLinVibration(dir);

 		dir.x = sinf(m_armTimeAbs* 4.0f)*0.10f+

 				sinf(m_armTimeAbs* 7.0f)*0.20f+

@@ -767,7 +767,7 @@ bool CMotionAnt::EventFrame(const Event &event)
 				sinf(m_armTimeAbs* 9.0f)*0.04f+

 				sinf(m_armTimeAbs*23.0f)*0.03f;

 		SetCirVibration(dir);

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetInclinaison(dir);

 

 		m_object->SetAngleY(1, sinf(m_armTimeAbs*8.0f)*0.7f);  // head

@@ -814,7 +814,7 @@ bool CMotionAnt::EventFrame(const Event &event)
 		dir.z = 0.0f;

 		SetCirVibration(dir);

 

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetInclinaison(dir);

 

 		if ( m_progress >= 1.0f )

@@ -833,7 +833,7 @@ bool CMotionAnt::EventFrame(const Event &event)
 		{

 			m_object->SetAngleZ(2, sinf(m_armTimeAbs*1.7f)*0.15f);  // tail

 

-			dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+			dir = Math::Vector(0.0f, 0.0f, 0.0f);

 			SetLinVibration(dir);

 			SetInclinaison(dir);

 		}

@@ -872,7 +872,7 @@ bool CMotionAnt::EventFrame(const Event &event)
 			SetLinVibration(dir);

 		}

 

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetCirVibration(dir);

 

 		m_object->SetAngleZ(1, sinf(m_armTimeAbs*1.4f)*0.20f);  // head

diff --git a/src/object/motion/motionant.h b/src/object/motion/motionant.h
index dc969fe..499e18e 100644
--- a/src/object/motion/motionant.h
+++ b/src/object/motion/motionant.h
@@ -59,7 +59,7 @@ public:
 	~CMotionAnt();

 

 	void	DeleteObject(bool bAll=false);

-	bool	Create(D3DVECTOR pos, float angle, ObjectType type, float power);

+	bool	Create(Math::Vector pos, float angle, ObjectType type, float power);

 	bool	EventProcess(const Event &event);

 

 protected:

diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp
index 41da476..c072ea2 100644
--- a/src/object/motion/motionbee.cpp
+++ b/src/object/motion/motionbee.cpp
@@ -79,7 +79,7 @@ void CMotionBee::DeleteObject(bool bAll)
 

 // Creates a vehicle traveling any lands on the ground.

 

-bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,

+bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,

 						float power)

 {

 	CModFile*	pModFile;

@@ -104,8 +104,8 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 

 	// A vehicle must have an obligatory collision

 	// with a sphere of center (0, y, 0) (see GetCrashSphere).

-	m_object->CreateCrashSphere(D3DVECTOR(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUM, 0.20f);

-	m_object->SetGlobalSphere(D3DVECTOR(-1.0f, 1.0f, 0.0f), 5.0f);

+	m_object->CreateCrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUM, 0.20f);

+	m_object->SetGlobalSphere(Math::Vector(-1.0f, 1.0f, 0.0f), 5.0f);

 

 	// Creates the head.

 	rank = m_engine->CreateObject();

@@ -114,7 +114,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(1, 0);

 	pModFile->ReadModel("objects\\bee2.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(1, D3DVECTOR(1.6f, 0.3f, 0.0f));

+	m_object->SetPosition(1, Math::Vector(1.6f, 0.3f, 0.0f));

 

 	// Creates the tail.

 	rank = m_engine->CreateObject();

@@ -123,7 +123,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(2, 0);

 	pModFile->ReadModel("objects\\bee3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(2, D3DVECTOR(-0.8f, 0.0f, 0.0f));

+	m_object->SetPosition(2, Math::Vector(-0.8f, 0.0f, 0.0f));

 

 	// Creates a right-back thigh.

 	rank = m_engine->CreateObject();

@@ -132,7 +132,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(3, 0);

 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(3, D3DVECTOR(-0.3f, -0.1f, -0.2f));

+	m_object->SetPosition(3, Math::Vector(-0.3f, -0.1f, -0.2f));

 

 	// Creates a right-back leg.

 	rank = m_engine->CreateObject();

@@ -141,7 +141,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(4, 3);

 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(4, D3DVECTOR(0.0f, 0.0f, -1.0f));

+	m_object->SetPosition(4, Math::Vector(0.0f, 0.0f, -1.0f));

 

 	// Creates a right-back foot.

 	rank = m_engine->CreateObject();

@@ -150,7 +150,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(5, 4);

 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(5, D3DVECTOR(0.0f, 0.0f, -2.0f));

+	m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -2.0f));

 

 	// Creates two middle-right thighs.

 	rank = m_engine->CreateObject();

@@ -159,7 +159,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(6, 0);

 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(6, D3DVECTOR(0.3f, -0.1f, -0.4f));

+	m_object->SetPosition(6, Math::Vector(0.3f, -0.1f, -0.4f));

 

 	// Creates two middle-right legs.

 	rank = m_engine->CreateObject();

@@ -168,7 +168,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(7, 6);

 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(7, D3DVECTOR(0.0f, 0.0f, -1.0f));

+	m_object->SetPosition(7, Math::Vector(0.0f, 0.0f, -1.0f));

 

 	// Creates two middle-right feet.

 	rank = m_engine->CreateObject();

@@ -177,7 +177,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(8, 7);

 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(8, D3DVECTOR(0.0f, 0.0f, -2.0f));

+	m_object->SetPosition(8, Math::Vector(0.0f, 0.0f, -2.0f));

 

 	// Creates the right front thigh.

 	rank = m_engine->CreateObject();

@@ -186,7 +186,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(9, 0);

 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(9, D3DVECTOR(1.0f, -0.1f, -0.7f));

+	m_object->SetPosition(9, Math::Vector(1.0f, -0.1f, -0.7f));

 

 	// Creates the right front leg.

 	rank = m_engine->CreateObject();

@@ -195,7 +195,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(10, 9);

 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(10, D3DVECTOR(0.0f, 0.0f, -1.0f));

+	m_object->SetPosition(10, Math::Vector(0.0f, 0.0f, -1.0f));

 

 	// Creates the right front foot.

 	rank = m_engine->CreateObject();

@@ -204,7 +204,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(11, 10);

 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(11, D3DVECTOR(0.0f, 0.0f, -2.0f));

+	m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, -2.0f));

 

 	// Creates a left-back thigh.

 	rank = m_engine->CreateObject();

@@ -213,7 +213,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(12, 0);

 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(12, D3DVECTOR(-0.3f, -0.1f, 0.2f));

+	m_object->SetPosition(12, Math::Vector(-0.3f, -0.1f, 0.2f));

 	m_object->SetAngleY(12, Math::PI);

 

 	// Creates a left-back leg.

@@ -223,7 +223,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(13, 12);

 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(13, D3DVECTOR(0.0f, 0.0f, -1.0f));

+	m_object->SetPosition(13, Math::Vector(0.0f, 0.0f, -1.0f));

 

 	// Creates a left-back foot.

 	rank = m_engine->CreateObject();

@@ -232,7 +232,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(14, 13);

 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(14, D3DVECTOR(0.0f, 0.0f, -2.0f));

+	m_object->SetPosition(14, Math::Vector(0.0f, 0.0f, -2.0f));

 

 	// Creates two middle-left thigh.

 	rank = m_engine->CreateObject();

@@ -241,7 +241,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(15, 0);

 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(15, D3DVECTOR(0.3f, -0.1f, 0.4f));

+	m_object->SetPosition(15, Math::Vector(0.3f, -0.1f, 0.4f));

 	m_object->SetAngleY(15, Math::PI);

 

 	// Creates two middle-left legs.

@@ -251,7 +251,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(16, 15);

 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(16, D3DVECTOR(0.0f, 0.0f, -1.0f));

+	m_object->SetPosition(16, Math::Vector(0.0f, 0.0f, -1.0f));

 

 	// Creates two middle-left feet.

 	rank = m_engine->CreateObject();

@@ -260,7 +260,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(17, 16);

 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(17, D3DVECTOR(0.0f, 0.0f, -2.0f));

+	m_object->SetPosition(17, Math::Vector(0.0f, 0.0f, -2.0f));

 

 	// Creates front-left thigh.

 	rank = m_engine->CreateObject();

@@ -269,7 +269,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(18, 0);

 	pModFile->ReadModel("objects\\ant4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(18, D3DVECTOR(1.0f, -0.1f, 0.7f));

+	m_object->SetPosition(18, Math::Vector(1.0f, -0.1f, 0.7f));

 	m_object->SetAngleY(18, Math::PI);

 

 	// Creates front-left leg.

@@ -279,7 +279,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(19, 18);

 	pModFile->ReadModel("objects\\ant5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(19, D3DVECTOR(0.0f, 0.0f, -1.0f));

+	m_object->SetPosition(19, Math::Vector(0.0f, 0.0f, -1.0f));

 

 	// Creates front-left foot.

 	rank = m_engine->CreateObject();

@@ -288,7 +288,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(20, 19);

 	pModFile->ReadModel("objects\\ant6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(20, D3DVECTOR(0.0f, 0.0f, -2.0f));

+	m_object->SetPosition(20, Math::Vector(0.0f, 0.0f, -2.0f));

 

 	// Creates the right wing.

 	rank = m_engine->CreateObject();

@@ -297,7 +297,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(21, 0);

 	pModFile->ReadModel("objects\\bee7.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(21, D3DVECTOR(0.8f, 0.4f, -0.5f));

+	m_object->SetPosition(21, Math::Vector(0.8f, 0.4f, -0.5f));

 

 	// Creates the left wing.

 	rank = m_engine->CreateObject();

@@ -307,7 +307,7 @@ bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\bee7.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(22, D3DVECTOR(0.8f, 0.4f, 0.5f));

+	m_object->SetPosition(22, Math::Vector(0.8f, 0.4f, 0.5f));

 

 	m_object->CreateShadowCircle(6.0f, 0.5f);

 

@@ -452,7 +452,7 @@ bool CMotionBee::EventProcess(const Event &event)
 

 bool CMotionBee::EventFrame(const Event &event)

 {

-	D3DVECTOR		dir;

+	Math::Vector		dir;

 	float			s, a, prog;

 	int				action, i, st, nd;

 	bool			bStop;

diff --git a/src/object/motion/motionbee.h b/src/object/motion/motionbee.h
index 5c69bff..7dce32b 100644
--- a/src/object/motion/motionbee.h
+++ b/src/object/motion/motionbee.h
@@ -54,7 +54,7 @@ public:
 	~CMotionBee();

 

 	void	DeleteObject(bool bAll=false);

-	bool	Create(D3DVECTOR pos, float angle, ObjectType type, float power);

+	bool	Create(Math::Vector pos, float angle, ObjectType type, float power);

 	bool	EventProcess(const Event &event);

 

 protected:

diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp
index bcdf2df..bf4e588 100644
--- a/src/object/motion/motionhuman.cpp
+++ b/src/object/motion/motionhuman.cpp
@@ -105,7 +105,7 @@ Error CMotionHuman::SetAction(int action, float time)
 

 // Creates cosmonaut on the ground.

 

-bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,

+bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type,

 						  float power)

 {

 	CModFile*	pModFile;

@@ -173,8 +173,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetAngleY(0, angle);

 

 	// A vehicle must have an obligatory collision with a sphere of center (0, y, 0) (see GetCrashSphere).

-	m_object->CreateCrashSphere(D3DVECTOR(0.0f, 0.0f, 0.0f), 2.0f, SOUND_AIE, 0.20f);

-	m_object->SetGlobalSphere(D3DVECTOR(0.0f, 1.0f, 0.0f), 4.0f);

+	m_object->CreateCrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 2.0f, SOUND_AIE, 0.20f);

+	m_object->SetGlobalSphere(Math::Vector(0.0f, 1.0f, 0.0f), 4.0f);

 

 	// Creates the head.

 	rank = m_engine->CreateObject();

@@ -203,11 +203,11 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 		pModFile->ReadModel("objects\\human2t.mod");

 	}

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(1, D3DVECTOR(0.0f, 2.7f, 0.0f));

+	m_object->SetPosition(1, Math::Vector(0.0f, 2.7f, 0.0f));

 	if ( option == 1 ||  // head without helmet?

 		 option == 2 )   // without a backpack?

 	{

-		m_object->SetZoom(1, D3DVECTOR(1.0f, 1.05f, 1.0f));

+		m_object->SetZoom(1, Math::Vector(1.0f, 1.05f, 1.0f));

 	}

 

 	// Creates the glasses.

@@ -230,8 +230,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(2, 0);

 	pModFile->ReadModel("objects\\human3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(2, D3DVECTOR(0.0f, 2.3f, -1.2f));

-	m_object->SetAngle(2, D3DVECTOR(90.0f*Math::PI/180.0f, 90.0f*Math::PI/180.0f, -50.0f*Math::PI/180.0f));

+	m_object->SetPosition(2, Math::Vector(0.0f, 2.3f, -1.2f));

+	m_object->SetAngle(2, Math::Vector(90.0f*Math::PI/180.0f, 90.0f*Math::PI/180.0f, -50.0f*Math::PI/180.0f));

 

 	// Creates the right forearm.

 	rank = m_engine->CreateObject();

@@ -240,8 +240,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(3, 2);

 	pModFile->ReadModel("objects\\human4r.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(3, D3DVECTOR(1.3f, 0.0f, 0.0f));

-	m_object->SetAngle(3, D3DVECTOR(0.0f*Math::PI/180.0f, -20.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f));

+	m_object->SetPosition(3, Math::Vector(1.3f, 0.0f, 0.0f));

+	m_object->SetAngle(3, Math::Vector(0.0f*Math::PI/180.0f, -20.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f));

 

 	// Creates right hand.

 	rank = m_engine->CreateObject();

@@ -250,7 +250,7 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(4, 3);

 	pModFile->ReadModel("objects\\human5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(4, D3DVECTOR(1.2f, 0.0f, 0.0f));

+	m_object->SetPosition(4, Math::Vector(1.2f, 0.0f, 0.0f));

 

 	// Creates the right thigh.

 	rank = m_engine->CreateObject();

@@ -259,8 +259,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(5, 0);

 	pModFile->ReadModel("objects\\human6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(5, D3DVECTOR(0.0f, 0.0f, -0.7f));

-	m_object->SetAngle(5, D3DVECTOR(10.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));

+	m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -0.7f));

+	m_object->SetAngle(5, Math::Vector(10.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));

 

 	// Creates the right leg.

 	rank = m_engine->CreateObject();

@@ -269,8 +269,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(6, 5);

 	pModFile->ReadModel("objects\\human7.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(6, D3DVECTOR(0.0f, -1.5f, 0.0f));

-	m_object->SetAngle(6, D3DVECTOR(0.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, -10.0f*Math::PI/180.0f));

+	m_object->SetPosition(6, Math::Vector(0.0f, -1.5f, 0.0f));

+	m_object->SetAngle(6, Math::Vector(0.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, -10.0f*Math::PI/180.0f));

 

 	// Creates the right foot.

 	rank = m_engine->CreateObject();

@@ -279,8 +279,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(7, 6);

 	pModFile->ReadModel("objects\\human8.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(7, D3DVECTOR(0.0f, -1.5f, 0.0f));

-	m_object->SetAngle(7, D3DVECTOR(-10.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));

+	m_object->SetPosition(7, Math::Vector(0.0f, -1.5f, 0.0f));

+	m_object->SetAngle(7, Math::Vector(-10.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));

 

 	// Creates the left arm.

 	rank = m_engine->CreateObject();

@@ -290,8 +290,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\human3.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(8, D3DVECTOR(0.0f, 2.3f, 1.2f));

-	m_object->SetAngle(8, D3DVECTOR(-90.0f*Math::PI/180.0f, -90.0f*Math::PI/180.0f, -50.0f*Math::PI/180.0f));

+	m_object->SetPosition(8, Math::Vector(0.0f, 2.3f, 1.2f));

+	m_object->SetAngle(8, Math::Vector(-90.0f*Math::PI/180.0f, -90.0f*Math::PI/180.0f, -50.0f*Math::PI/180.0f));

 

 	// Creates the left forearm.

 	rank = m_engine->CreateObject();

@@ -301,8 +301,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\human4l.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(9, D3DVECTOR(1.3f, 0.0f, 0.0f));

-	m_object->SetAngle(9, D3DVECTOR(0.0f*Math::PI/180.0f, 20.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f));

+	m_object->SetPosition(9, Math::Vector(1.3f, 0.0f, 0.0f));

+	m_object->SetAngle(9, Math::Vector(0.0f*Math::PI/180.0f, 20.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f));

 

 	// Creates left hand.

 	rank = m_engine->CreateObject();

@@ -312,7 +312,7 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\human5.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(10, D3DVECTOR(1.2f, 0.0f, 0.0f));

+	m_object->SetPosition(10, Math::Vector(1.2f, 0.0f, 0.0f));

 

 	// Creates the left thigh.

 	rank = m_engine->CreateObject();

@@ -322,8 +322,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\human6.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(11, D3DVECTOR(0.0f, 0.0f, 0.7f));

-	m_object->SetAngle(11, D3DVECTOR(-10.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));

+	m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, 0.7f));

+	m_object->SetAngle(11, Math::Vector(-10.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));

 

 	// Creates the left leg.

 	rank = m_engine->CreateObject();

@@ -333,8 +333,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\human7.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(12, D3DVECTOR(0.0f, -1.5f, 0.0f));

-	m_object->SetAngle(12, D3DVECTOR(0.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, -10.0f*Math::PI/180.0f));

+	m_object->SetPosition(12, Math::Vector(0.0f, -1.5f, 0.0f));

+	m_object->SetAngle(12, Math::Vector(0.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, -10.0f*Math::PI/180.0f));

 

 	// Creates the left foot.

 	rank = m_engine->CreateObject();

@@ -344,8 +344,8 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\human8.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(13, D3DVECTOR(0.0f, -1.5f, 0.0f));

-	m_object->SetAngle(13, D3DVECTOR(10.0f*Math::PI/180.0f, -5.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));

+	m_object->SetPosition(13, Math::Vector(0.0f, -1.5f, 0.0f));

+	m_object->SetAngle(13, Math::Vector(10.0f*Math::PI/180.0f, -5.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));

 

 	// Creates the neutron gun.

 	if ( option != 2 )  // with backpack?

@@ -356,7 +356,7 @@ bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(14, 0);

 		pModFile->ReadModel("objects\\human9.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(14, D3DVECTOR(-1.5f, 0.3f, -1.35f));

+		m_object->SetPosition(14, Math::Vector(-1.5f, 0.3f, -1.35f));

 		m_object->SetAngleZ(14, Math::PI);

 	}

 

@@ -717,8 +717,8 @@ bool CMotionHuman::EventProcess(const Event &event)
 

 bool CMotionHuman::EventFrame(const Event &event)

 {

-	D3DMATRIX*	mat;

-	D3DVECTOR	dir, actual, pos, speed, pf;

+	Math::Matrix*	mat;

+	Math::Vector	dir, actual, pos, speed, pf;

 	Math::Point		center, dim, p2;

 	float		s, a, prog, rTime[2], lTime[2], time, rot, hr, hl;

 	float		al, ar, af;

@@ -749,13 +749,13 @@ bool CMotionHuman::EventFrame(const Event &event)
 	if ( m_bDisplayPerso && m_main->RetGamerOnlyHead() )

 	{

 		m_time += event.rTime;

-		m_object->SetLinVibration(D3DVECTOR(0.0f, -0.55f, 0.0f));

-		m_object->SetCirVibration(D3DVECTOR(0.0f, m_main->RetPersoAngle(), 0.0f));

+		m_object->SetLinVibration(Math::Vector(0.0f, -0.55f, 0.0f));

+		m_object->SetCirVibration(Math::Vector(0.0f, m_main->RetPersoAngle(), 0.0f));

 		return true;

 	}

 	if ( m_bDisplayPerso )

 	{

-		m_object->SetCirVibration(D3DVECTOR(0.0f, m_main->RetPersoAngle()+0.2f, 0.0f));

+		m_object->SetCirVibration(Math::Vector(0.0f, m_main->RetPersoAngle()+0.2f, 0.0f));

 	}

 

 	shield = m_object->RetShield();

@@ -1322,7 +1322,7 @@ bool CMotionHuman::EventFrame(const Event &event)
 				pos.x += (Math::Rand()-0.5f)*4.0f;

 				pos.z += (Math::Rand()-0.5f)*4.0f;

 				m_terrain->MoveOnFloor(pos);

-				speed = D3DVECTOR(0.0f, 0.0f, 0.0f);

+				speed = Math::Vector(0.0f, 0.0f, 0.0f);

 				dim.x = 1.2f+Math::Rand()*1.2f;

 				dim.y = dim.x;

 				m_particule->CreateParticule(pos, speed, dim, PARTICRASH, 2.0f, 0.0f, 0.0f);

@@ -1392,7 +1392,7 @@ bool CMotionHuman::EventFrame(const Event &event)
 				pos.x += (Math::Rand()-0.5f)*8.0f;

 				pos.z += (Math::Rand()-0.5f)*8.0f;

 				m_terrain->MoveOnFloor(pos);

-				speed = D3DVECTOR(0.0f, 0.0f, 0.0f);

+				speed = Math::Vector(0.0f, 0.0f, 0.0f);

 				dim.x = 2.0f+Math::Rand()*1.5f;

 				dim.y = dim.x;

 				m_particule->CreateParticule(pos, speed, dim, PARTICRASH, 2.0f, 0.0f, 0.0f);

@@ -1488,7 +1488,7 @@ bool CMotionHuman::EventFrame(const Event &event)
 		dir.z = Math::Smooth(actual.z, dir.z, time);

 		m_object->SetInclinaison(dir);

 

-		m_object->SetCirVibration(D3DVECTOR(0.0f, 0.0f, 0.0f));

+		m_object->SetCirVibration(Math::Vector(0.0f, 0.0f, 0.0f));

 	}

 	else if ( m_actionType == MHS_LOST )   // lost?

 	{

@@ -1510,7 +1510,7 @@ bool CMotionHuman::EventFrame(const Event &event)
 		SetLinVibration(dir);

 

 		mat = m_object->RetWorldMatrix(0);

-		pos = D3DVECTOR(0.5f, 3.7f, 0.0f);

+		pos = Math::Vector(0.5f, 3.7f, 0.0f);

 		pos.x += (Math::Rand()-0.5f)*1.0f;

 		pos.y += (Math::Rand()-0.5f)*1.0f;

 		pos.z += (Math::Rand()-0.5f)*1.0f;

@@ -1524,9 +1524,9 @@ bool CMotionHuman::EventFrame(const Event &event)
 	}

 	else if ( m_actionType == MHS_SATCOM )  // look at the SatCom?

 	{

-		SetCirVibration(D3DVECTOR(0.0f, 0.0f, 0.0f));

-		SetLinVibration(D3DVECTOR(0.0f, 0.0f, 0.0f));

-		SetInclinaison(D3DVECTOR(0.0f, 0.0f, 0.0f));

+		SetCirVibration(Math::Vector(0.0f, 0.0f, 0.0f));

+		SetLinVibration(Math::Vector(0.0f, 0.0f, 0.0f));

+		SetInclinaison(Math::Vector(0.0f, 0.0f, 0.0f));

 	}

 	else

 	{

diff --git a/src/object/motion/motionhuman.h b/src/object/motion/motionhuman.h
index 1fc8d57..f83bc13 100644
--- a/src/object/motion/motionhuman.h
+++ b/src/object/motion/motionhuman.h
@@ -73,7 +73,7 @@ public:
 	~CMotionHuman();

 

 	void	DeleteObject(bool bAll=false);

-	bool	Create(D3DVECTOR pos, float angle, ObjectType type, float power);

+	bool	Create(Math::Vector pos, float angle, ObjectType type, float power);

 	bool	EventProcess(const Event &event);

 	Error	SetAction(int action, float time=0.2f);

 

diff --git a/src/object/motion/motionmother.cpp b/src/object/motion/motionmother.cpp
index 7f98eca..d8d049c 100644
--- a/src/object/motion/motionmother.cpp
+++ b/src/object/motion/motionmother.cpp
@@ -80,7 +80,7 @@ void CMotionMother::DeleteObject(bool bAll)
 

 // Creates a vehicle traveling any lands on the ground.

 

-bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,

+bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type,

 						  float power)

 {

 	CModFile*	pModFile;

@@ -105,8 +105,8 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 

 	// A vehicle must have a obligatory collision

 	//with a sphere of center (0, y, 0) (see GetCrashSphere).

-	m_object->CreateCrashSphere(D3DVECTOR(0.0f, 0.0f, 0.0f), 20.0f, SOUND_BOUM, 0.20f);

-	m_object->SetGlobalSphere(D3DVECTOR(-2.0f, 10.0f, 0.0f), 25.0f);

+	m_object->CreateCrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 20.0f, SOUND_BOUM, 0.20f);

+	m_object->SetGlobalSphere(Math::Vector(-2.0f, 10.0f, 0.0f), 25.0f);

 

 	// Creates the head.

 	rank = m_engine->CreateObject();

@@ -115,7 +115,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(1, 0);

 	pModFile->ReadModel("objects\\mother2.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(1, D3DVECTOR(16.0f, 3.0f, 0.0f));

+	m_object->SetPosition(1, Math::Vector(16.0f, 3.0f, 0.0f));

 

 	// Creates a right-back leg.

 	rank = m_engine->CreateObject();

@@ -124,7 +124,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(2, 0);

 	pModFile->ReadModel("objects\\mother3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(2, D3DVECTOR(-5.0f, -1.0f, -12.0f));

+	m_object->SetPosition(2, Math::Vector(-5.0f, -1.0f, -12.0f));

 

 	// Creates a right-back foot.

 	rank = m_engine->CreateObject();

@@ -133,7 +133,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(3, 2);

 	pModFile->ReadModel("objects\\mother4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(3, D3DVECTOR(0.0f, 0.0f, -8.5f));

+	m_object->SetPosition(3, Math::Vector(0.0f, 0.0f, -8.5f));

 

 	// Creates a middle-right leg.

 	rank = m_engine->CreateObject();

@@ -142,7 +142,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(4, 0);

 	pModFile->ReadModel("objects\\mother3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(4, D3DVECTOR(3.5f, -1.0f, -12.0f));

+	m_object->SetPosition(4, Math::Vector(3.5f, -1.0f, -12.0f));

 

 	// Creates a middle-right foot.

 	rank = m_engine->CreateObject();

@@ -151,7 +151,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(5, 4);

 	pModFile->ReadModel("objects\\mother4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(5, D3DVECTOR(0.0f, 0.0f, -8.5f));

+	m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -8.5f));

 

 	// Creates a right-front leg.

 	rank = m_engine->CreateObject();

@@ -160,7 +160,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(6, 0);

 	pModFile->ReadModel("objects\\mother3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(6, D3DVECTOR(10.0f, -1.0f, -10.0f));

+	m_object->SetPosition(6, Math::Vector(10.0f, -1.0f, -10.0f));

 

 	// Creates a right-front foot.

 	rank = m_engine->CreateObject();

@@ -169,7 +169,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(7, 6);

 	pModFile->ReadModel("objects\\mother4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(7, D3DVECTOR(0.0f, 0.0f, -8.5f));

+	m_object->SetPosition(7, Math::Vector(0.0f, 0.0f, -8.5f));

 

 	// Creates a left-back leg.

 	rank = m_engine->CreateObject();

@@ -178,7 +178,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(8, 0);

 	pModFile->ReadModel("objects\\mother3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(8, D3DVECTOR(-5.0f, -1.0f, 12.0f));

+	m_object->SetPosition(8, Math::Vector(-5.0f, -1.0f, 12.0f));

 	m_object->SetAngleY(8, Math::PI);

 

 	// Creates a left-back foot.

@@ -188,7 +188,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(9, 8);

 	pModFile->ReadModel("objects\\mother4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(9, D3DVECTOR(0.0f, 0.0f, -8.5f));

+	m_object->SetPosition(9, Math::Vector(0.0f, 0.0f, -8.5f));

 

 	// Creates a middle-left leg.

 	rank = m_engine->CreateObject();

@@ -197,7 +197,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(10, 0);

 	pModFile->ReadModel("objects\\mother3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(10, D3DVECTOR(3.5f, -1.0f, 12.0f));

+	m_object->SetPosition(10, Math::Vector(3.5f, -1.0f, 12.0f));

 	m_object->SetAngleY(10, Math::PI);

 

 	// Creates a middle-left foot.

@@ -207,7 +207,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(11, 10);

 	pModFile->ReadModel("objects\\mother4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(11, D3DVECTOR(0.0f, 0.0f, -8.5f));

+	m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, -8.5f));

 

 	// Creates a left-front leg.

 	rank = m_engine->CreateObject();

@@ -216,7 +216,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(12, 0);

 	pModFile->ReadModel("objects\\mother3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(12, D3DVECTOR(10.0f, -1.0f, 10.0f));

+	m_object->SetPosition(12, Math::Vector(10.0f, -1.0f, 10.0f));

 	m_object->SetAngleY(12, Math::PI);

 

 	// Creates a left-front foot.

@@ -226,7 +226,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(13, 12);

 	pModFile->ReadModel("objects\\mother4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(13, D3DVECTOR(0.0f, 0.0f, -8.5f));

+	m_object->SetPosition(13, Math::Vector(0.0f, 0.0f, -8.5f));

 

 	// Creates the right antenna.

 	rank = m_engine->CreateObject();

@@ -235,7 +235,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(14, 1);

 	pModFile->ReadModel("objects\\mother5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(14, D3DVECTOR(6.0f, 1.0f, -2.5f));

+	m_object->SetPosition(14, Math::Vector(6.0f, 1.0f, -2.5f));

 

 	rank = m_engine->CreateObject();

 	m_engine->SetObjectType(rank, TYPEDESCENDANT);

@@ -243,7 +243,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(15, 14);

 	pModFile->ReadModel("objects\\mother6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(15, D3DVECTOR(8.0f, 0.0f, 0.0f));

+	m_object->SetPosition(15, Math::Vector(8.0f, 0.0f, 0.0f));

 

 	// Creates the left antenna.

 	rank = m_engine->CreateObject();

@@ -252,7 +252,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(16, 1);

 	pModFile->ReadModel("objects\\mother5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(16, D3DVECTOR(6.0f, 1.0f, 2.5f));

+	m_object->SetPosition(16, Math::Vector(6.0f, 1.0f, 2.5f));

 

 	rank = m_engine->CreateObject();

 	m_engine->SetObjectType(rank, TYPEDESCENDANT);

@@ -260,7 +260,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(17, 16);

 	pModFile->ReadModel("objects\\mother6.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(17, D3DVECTOR(8.0f, 0.0f, 0.0f));

+	m_object->SetPosition(17, Math::Vector(8.0f, 0.0f, 0.0f));

 

 	// Creates the right claw.

 	rank = m_engine->CreateObject();

@@ -269,7 +269,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(18, 1);

 	pModFile->ReadModel("objects\\mother7.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(18, D3DVECTOR(-4.0f, -3.5f, -8.0f));

+	m_object->SetPosition(18, Math::Vector(-4.0f, -3.5f, -8.0f));

 	m_object->SetZoomX(18, 1.2f);

 

 	// Creates the left claw.

@@ -280,7 +280,7 @@ bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\mother7.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(19, D3DVECTOR(-4.0f, -3.5f, 8.0f));

+	m_object->SetPosition(19, Math::Vector(-4.0f, -3.5f, 8.0f));

 	m_object->SetZoomX(19, 1.2f);

 

 	m_object->CreateShadowCircle(18.0f, 0.8f);

@@ -401,7 +401,7 @@ bool CMotionMother::EventProcess(const Event &event)
 

 bool CMotionMother::EventFrame(const Event &event)

 {

-	D3DVECTOR	dir;

+	Math::Vector	dir;

 	float		s, a, prog;

 	int			i, st, nd;

 	bool		bStop;

diff --git a/src/object/motion/motionmother.h b/src/object/motion/motionmother.h
index d3a6b2a..6578f91 100644
--- a/src/object/motion/motionmother.h
+++ b/src/object/motion/motionmother.h
@@ -40,7 +40,7 @@ public:
 	~CMotionMother();

 

 	void	DeleteObject(bool bAll=false);

-	bool	Create(D3DVECTOR pos, float angle, ObjectType type, float power);

+	bool	Create(Math::Vector pos, float angle, ObjectType type, float power);

 	bool	EventProcess(const Event &event);

 

 protected:

diff --git a/src/object/motion/motionspider.cpp b/src/object/motion/motionspider.cpp
index 4ac799b..5447c35 100644
--- a/src/object/motion/motionspider.cpp
+++ b/src/object/motion/motionspider.cpp
@@ -80,7 +80,7 @@ void CMotionSpider::DeleteObject(bool bAll)
 

 // Creates a vehicle traveling any lands on the ground.

 

-bool CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type,

+bool CMotionSpider::Create(Math::Vector pos, float angle, ObjectType type,

 						   float power)

 {

 	CModFile*	pModFile;

@@ -128,8 +128,8 @@ bool CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type,
 

 	// A vehicle must have a obligatory collision

 	// with a sphere of center (0, y, 0) (see GetCrashSphere).

-	m_object->CreateCrashSphere(D3DVECTOR(0.0f, -2.0f, 0.0f), 4.0f, SOUND_BOUM, 0.20f);

-	m_object->SetGlobalSphere(D3DVECTOR(-0.5f, 1.0f, 0.0f), 4.0f);

+	m_object->CreateCrashSphere(Math::Vector(0.0f, -2.0f, 0.0f), 4.0f, SOUND_BOUM, 0.20f);

+	m_object->SetGlobalSphere(Math::Vector(-0.5f, 1.0f, 0.0f), 4.0f);

 

 	// Creates the abdomen.

 	rank = m_engine->CreateObject();

@@ -138,7 +138,7 @@ bool CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(1, 0);

 	pModFile->ReadModel("objects\\spider1.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(1, D3DVECTOR(1.0f, 0.0f, 0.0f));

+	m_object->SetPosition(1, Math::Vector(1.0f, 0.0f, 0.0f));

 

 	// Creates the head.

 	rank = m_engine->CreateObject();

@@ -147,7 +147,7 @@ bool CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(2, 0);

 	pModFile->ReadModel("objects\\spider2.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(2, D3DVECTOR(1.0f, 0.0f, 0.0f));

+	m_object->SetPosition(2, Math::Vector(1.0f, 0.0f, 0.0f));

 

 	// Creates legs.

 	for ( i=0 ; i<4 ; i++ )

@@ -194,7 +194,7 @@ bool CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(35, 1);

 	pModFile->ReadModel("objects\\spider7.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(35, D3DVECTOR(0.0f, 0.0f, -0.3f));

+	m_object->SetPosition(35, Math::Vector(0.0f, 0.0f, -0.3f));

 

 	// Creates the left mandible.

 	rank = m_engine->CreateObject();

@@ -204,7 +204,7 @@ bool CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\spider7.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(36, D3DVECTOR(0.0f, 0.0f, 0.3f));

+	m_object->SetPosition(36, Math::Vector(0.0f, 0.0f, 0.3f));

 

 	m_object->CreateShadowCircle(4.0f, 0.5f);

 

@@ -389,7 +389,7 @@ bool CMotionSpider::EventProcess(const Event &event)
 

 bool CMotionSpider::EventFrame(const Event &event)

 {

-	D3DVECTOR	dir, pos, speed;

+	Math::Vector	dir, pos, speed;

 	Math::Point		dim;

 	float		s, a, prog, time;

 	float		tSt[12], tNd[12];

@@ -567,9 +567,9 @@ bool CMotionSpider::EventFrame(const Event &event)
 

 	if ( m_actionType == MSS_BURN )  // burning?

 	{

-		dir = D3DVECTOR(Math::PI, 0.0f, 0.0f);

+		dir = Math::Vector(Math::PI, 0.0f, 0.0f);

 		SetCirVibration(dir);

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetLinVibration(dir);

 		SetInclinaison(dir);

 

@@ -578,7 +578,7 @@ bool CMotionSpider::EventFrame(const Event &event)
 	}

 	else if ( m_actionType == MSS_RUIN )  // destroyed?

 	{

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetLinVibration(dir);

 		SetCirVibration(dir);

 		SetInclinaison(dir);

@@ -628,7 +628,7 @@ bool CMotionSpider::EventFrame(const Event &event)
 		dir.z = 0.0f;

 		SetCirVibration(dir);

 

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetInclinaison(dir);

 

 		if ( m_progress >= 1.0f )

@@ -657,7 +657,7 @@ bool CMotionSpider::EventFrame(const Event &event)
 			}

 		}

 

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetLinVibration(dir);

 		dir.x = sinf(m_armTimeAbs* 3.0f)*0.20f+

 				sinf(m_armTimeAbs* 6.0f)*0.20f+

@@ -672,7 +672,7 @@ bool CMotionSpider::EventFrame(const Event &event)
 				sinf(m_armTimeAbs*13.0f)*0.02f+

 				sinf(m_armTimeAbs*15.0f)*0.03f;

 		SetCirVibration(dir);

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetInclinaison(dir);

 

 		m_object->SetAngleY(1, sinf(m_armTimeAbs*5.0f)*0.05f);  // tail

@@ -719,7 +719,7 @@ bool CMotionSpider::EventFrame(const Event &event)
 		dir.z = 0.0f;

 		SetCirVibration(dir);

 

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetInclinaison(dir);

 

 		if ( m_progress >= 1.0f )

@@ -732,7 +732,7 @@ bool CMotionSpider::EventFrame(const Event &event)
 	{

 		if ( bStop )

 		{

-			dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+			dir = Math::Vector(0.0f, 0.0f, 0.0f);

 			SetInclinaison(dir);

 		}

 		else

@@ -751,7 +751,7 @@ bool CMotionSpider::EventFrame(const Event &event)
 			SetInclinaison(dir);

 		}

 

-		dir = D3DVECTOR(0.0f, 0.0f, 0.0f);

+		dir = Math::Vector(0.0f, 0.0f, 0.0f);

 		SetLinVibration(dir);

 		SetCirVibration(dir);

 

diff --git a/src/object/motion/motionspider.h b/src/object/motion/motionspider.h
index 6f18e07..3c6fa17 100644
--- a/src/object/motion/motionspider.h
+++ b/src/object/motion/motionspider.h
@@ -58,7 +58,7 @@ public:
 	~CMotionSpider();

 

 	void	DeleteObject(bool bAll=false);

-	bool	Create(D3DVECTOR pos, float angle, ObjectType type, float power);

+	bool	Create(Math::Vector pos, float angle, ObjectType type, float power);

 	bool	EventProcess(const Event &event);

 

 protected:

diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp
index 95caf3d..9a66362 100644
--- a/src/object/motion/motiontoto.cpp
+++ b/src/object/motion/motiontoto.cpp
@@ -89,7 +89,7 @@ void CMotionToto::DeleteObject(bool bAll)
 

 // Creates a vehicle traveling any lands on the ground.

 

-bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,

+bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type,

 						 float power)

 {

 	CModFile*		pModFile;

@@ -117,7 +117,7 @@ bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(1, 0);

 	pModFile->ReadModel("objects\\toto2.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(1, D3DVECTOR(1.00f, 0.17f, 0.00f));

+	m_object->SetPosition(1, Math::Vector(1.00f, 0.17f, 0.00f));

 

 	// Creates the left eye.

 	rank = m_engine->CreateObject();

@@ -127,7 +127,7 @@ bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
 	pModFile->ReadModel("objects\\toto3.mod");

 	pModFile->Mirror();

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(2, D3DVECTOR(0.85f, 1.04f, 0.25f));

+	m_object->SetPosition(2, Math::Vector(0.85f, 1.04f, 0.25f));

 	m_object->SetAngleY(2, -20.0f*Math::PI/180.0f);

 

 	// Creates the right eye.

@@ -137,7 +137,7 @@ bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(3, 0);

 	pModFile->ReadModel("objects\\toto3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(3, D3DVECTOR(0.85f, 1.04f, -0.25f));

+	m_object->SetPosition(3, Math::Vector(0.85f, 1.04f, -0.25f));

 	m_object->SetAngleY(3, 20.0f*Math::PI/180.0f);

 

 	// Creates left antenna.

@@ -147,7 +147,7 @@ bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(4, 0);

 	pModFile->ReadModel("objects\\toto4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(4, D3DVECTOR(0.0f, 1.9f, 0.3f));

+	m_object->SetPosition(4, Math::Vector(0.0f, 1.9f, 0.3f));

 	m_object->SetAngleX(4, 30.0f*Math::PI/180.0f);

 

 	rank = m_engine->CreateObject();

@@ -156,7 +156,7 @@ bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(5, 4);

 	pModFile->ReadModel("objects\\toto4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(5, D3DVECTOR(0.0f, 0.67f, 0.0f));

+	m_object->SetPosition(5, Math::Vector(0.0f, 0.67f, 0.0f));

 	m_object->SetAngleX(5, 30.0f*Math::PI/180.0f);

 

 	rank = m_engine->CreateObject();

@@ -165,7 +165,7 @@ bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(6, 5);

 	pModFile->ReadModel("objects\\toto5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(6, D3DVECTOR(0.0f, 0.70f, 0.0f));

+	m_object->SetPosition(6, Math::Vector(0.0f, 0.70f, 0.0f));

 	m_object->SetAngleX(6, 30.0f*Math::PI/180.0f);

 

 	// Creates right antenna.

@@ -175,7 +175,7 @@ bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(7, 0);

 	pModFile->ReadModel("objects\\toto4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(7, D3DVECTOR(0.0f, 1.9f, -0.3f));

+	m_object->SetPosition(7, Math::Vector(0.0f, 1.9f, -0.3f));

 	m_object->SetAngleX(7, -30.0f*Math::PI/180.0f);

 

 	rank = m_engine->CreateObject();

@@ -184,7 +184,7 @@ bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(8, 7);

 	pModFile->ReadModel("objects\\toto4.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(8, D3DVECTOR(0.0f, 0.67f, 0.0f));

+	m_object->SetPosition(8, Math::Vector(0.0f, 0.67f, 0.0f));

 	m_object->SetAngleX(8, -30.0f*Math::PI/180.0f);

 

 	rank = m_engine->CreateObject();

@@ -193,7 +193,7 @@ bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(9, 8);

 	pModFile->ReadModel("objects\\toto5.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(9, D3DVECTOR(0.0f, 0.70f, 0.0f));

+	m_object->SetPosition(9, Math::Vector(0.0f, 0.70f, 0.0f));

 	m_object->SetAngleX(9, -30.0f*Math::PI/180.0f);

 

 	m_object->SetZoom(0, 0.5f);  // is little

@@ -259,9 +259,9 @@ bool CMotionToto::EventProcess(const Event &event)
 

 bool CMotionToto::EventFrame(const Event &event)

 {

-	D3DMATRIX*		mat;

-	D3DVECTOR		eye, lookat, dir, perp, nPos, aPos, pos, speed;

-	D3DVECTOR		vibLin, vibCir, dirSpeed, aAntenna;

+	Math::Matrix*		mat;

+	Math::Vector		eye, lookat, dir, perp, nPos, aPos, pos, speed;

+	Math::Vector		vibLin, vibCir, dirSpeed, aAntenna;

 	Math::Point			dim;

 	POINT			wDim;

 	ParticuleType	type;

@@ -337,9 +337,9 @@ bool CMotionToto::EventFrame(const Event &event)
 	eye    = m_engine->RetEyePt();

 	lookat = m_engine->RetLookatPt();

 

-	vibLin   = D3DVECTOR(0.0f, 0.0f, 0.0f);

-	vibCir   = D3DVECTOR(0.0f, 0.0f, 0.0f);

-	aAntenna = D3DVECTOR(0.0f, 0.0f, 0.0f);

+	vibLin   = Math::Vector(0.0f, 0.0f, 0.0f);

+	vibCir   = Math::Vector(0.0f, 0.0f, 0.0f);

+	aAntenna = Math::Vector(0.0f, 0.0f, 0.0f);

 	aAntenna.x += 30.0f*Math::PI/180.0f;

 

 	// Calculates the new position.

@@ -456,7 +456,7 @@ bool CMotionToto::EventFrame(const Event &event)
 				if ( m_bStartAction )

 				{

 					m_bStartAction = false;

-					m_speedAction = Length(nPos, aPos)/15.0f;

+					m_speedAction = Math::Distance(nPos, aPos)/15.0f;

 					if ( m_speedAction < 20.0f )  m_speedAction = 20.0f;

 				}

 				level = m_speedAction;

@@ -464,7 +464,7 @@ bool CMotionToto::EventFrame(const Event &event)
 			if ( level > 1.0f/event.rTime )  level = 1.0f/event.rTime;

 			nPos = aPos + (nPos-aPos)*event.rTime*level;  // progression aPos -> nPos

 

-			linSpeed = Length2d(nPos, aPos)/event.rTime;

+			linSpeed = Math::DistanceProjected(nPos, aPos)/event.rTime;

 			dirSpeed = (nPos-aPos)/event.rTime;

 			nPos.y -= linSpeed*0.015f*(1.0f-progress);  // at ground level if moving fast

 		}

@@ -748,7 +748,7 @@ bool CMotionToto::EventFrame(const Event &event)
 			float t = Math::Mod(m_time, 3.5f);

 			if ( t >= 2.2f || ( t >= 1.2f && t <= 1.4f ) )  // breathe?

 			{

-				pos = D3DVECTOR(1.0f, 0.2f, 0.0f);

+				pos = Math::Vector(1.0f, 0.2f, 0.0f);

 				pos.z += (Math::Rand()-0.5f)*0.5f;

 

 				speed = pos;

@@ -766,7 +766,7 @@ bool CMotionToto::EventFrame(const Event &event)
 		}

 		else	// out of water?

 		{

-			pos = D3DVECTOR(0.0f, -0.5f, 0.0f);

+			pos = Math::Vector(0.0f, -0.5f, 0.0f);

 			pos.z += (Math::Rand()-0.5f)*0.5f;

 

 			speed = pos;

@@ -790,7 +790,7 @@ bool CMotionToto::EventFrame(const Event &event)
 			pos.y = (Math::Rand()-0.5f)*1.0f+3.5f;

 			pos.z = (Math::Rand()-0.5f)*1.0f;

 			pos   = Transform(*mat, pos);

-			speed = D3DVECTOR(0.0f, 0.0f, 0.0f);

+			speed = Math::Vector(0.0f, 0.0f, 0.0f);

 			dim.x = (Math::Rand()*0.3f+0.3f);

 			dim.y = dim.x;

 			if ( m_actionType == MT_ERROR   )  type = PARTIERROR;

@@ -814,7 +814,7 @@ bool CMotionToto::EventFrame(const Event &event)
 			pos.y = (Math::Rand()-0.5f)*1.4f+3.5f;

 			pos.z = (Math::Rand()-0.5f)*1.4f;

 			pos   = Transform(*mat, pos);

-			speed = D3DVECTOR(0.0f, 0.0f, 0.0f);

+			speed = Math::Vector(0.0f, 0.0f, 0.0f);

 			dim.x = (Math::Rand()*0.5f+0.5f);

 			dim.y = dim.x;

 			m_particule->CreateParticule(pos, speed, dim, PARTIERROR, 0.5f+Math::Rand()*0.5f, 0.0f, 1.0f, sheet);

diff --git a/src/object/motion/motiontoto.h b/src/object/motion/motiontoto.h
index 2201882..a2c46d5 100644
--- a/src/object/motion/motiontoto.h
+++ b/src/object/motion/motiontoto.h
@@ -50,7 +50,7 @@ public:
 	~CMotionToto();

 

 	void	DeleteObject(bool bAll=false);

-	bool	Create(D3DVECTOR pos, float angle, ObjectType type, float power);

+	bool	Create(Math::Vector pos, float angle, ObjectType type, float power);

 	bool	EventProcess(const Event &event);

 	Error	SetAction(int action, float time=0.2f);

 	void	SetLinkType(ObjectType type);

diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp
index 1c30514..c112900 100644
--- a/src/object/motion/motionvehicle.cpp
+++ b/src/object/motion/motionvehicle.cpp
@@ -23,6 +23,7 @@
 

 #include "common/struct.h"

 #include "math/func.h"

+#include "math/geometry.h"

 #include "graphics/d3d/d3dengine.h"

 #include "math/old/math3d.h"

 #include "common/event.h"

@@ -66,9 +67,9 @@ CMotionVehicle::CMotionVehicle(CInstanceManager* iMan, CObject* object)
 	m_armMember     = 1000.0f;

 	m_canonTime     = 0.0f;

 	m_lastTimeCanon = 0.0f;

-	m_wheelLastPos   = D3DVECTOR(0.0f, 0.0f, 0.0f);

-	m_wheelLastAngle = D3DVECTOR(0.0f, 0.0f, 0.0f);

-	m_posKey         = D3DVECTOR(0.0f, 0.0f, 0.0f);

+	m_wheelLastPos   = Math::Vector(0.0f, 0.0f, 0.0f);

+	m_wheelLastAngle = Math::Vector(0.0f, 0.0f, 0.0f);

+	m_posKey         = Math::Vector(0.0f, 0.0f, 0.0f);

 	m_bFlyFix = false;

 

 	m_bTraceDown = false;

@@ -97,7 +98,7 @@ void CMotionVehicle::DeleteObject(bool bAll)
 

 // Creates a vehicle traveling any lands on the ground.

 

-bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,

+bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type,

 							float power)

 {

 	CModFile*		pModFile;

@@ -203,27 +204,27 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		 type == OBJECT_MOBILErr ||

 		 type == OBJECT_MOBILErs )

 	{

-		m_object->CreateCrashSphere(D3DVECTOR(0.0f, 4.0f, 0.0f), 6.5f, SOUND_BOUMm, 0.45f);

-		m_object->SetGlobalSphere(D3DVECTOR(0.0f, 3.0f, 0.0f), 7.0f);

+		m_object->CreateCrashSphere(Math::Vector(0.0f, 4.0f, 0.0f), 6.5f, SOUND_BOUMm, 0.45f);

+		m_object->SetGlobalSphere(Math::Vector(0.0f, 3.0f, 0.0f), 7.0f);

 	}

 	else if ( type == OBJECT_MOBILEsa )

 	{

-		m_object->CreateCrashSphere(D3DVECTOR(0.0f, 3.0f, 0.0f), 4.5f, SOUND_BOUMm, 0.45f);

-		m_object->SetGlobalSphere(D3DVECTOR(0.0f, 3.0f, 0.0f), 6.0f);

+		m_object->CreateCrashSphere(Math::Vector(0.0f, 3.0f, 0.0f), 4.5f, SOUND_BOUMm, 0.45f);

+		m_object->SetGlobalSphere(Math::Vector(0.0f, 3.0f, 0.0f), 6.0f);

 	}

 	else if ( type == OBJECT_MOBILEdr )

 	{

-		m_object->CreateCrashSphere(D3DVECTOR(0.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f);

-		m_object->SetGlobalSphere(D3DVECTOR(0.0f, 3.0f, 0.0f), 7.0f);

+		m_object->CreateCrashSphere(Math::Vector(0.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f);

+		m_object->SetGlobalSphere(Math::Vector(0.0f, 3.0f, 0.0f), 7.0f);

 	}

 	else if ( type == OBJECT_APOLLO2 )

 	{

-		m_object->CreateCrashSphere(D3DVECTOR(0.0f, 0.0f, 0.0f), 8.0f, SOUND_BOUMm, 0.45f);

+		m_object->CreateCrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 8.0f, SOUND_BOUMm, 0.45f);

 	}

 	else

 	{

-		m_object->CreateCrashSphere(D3DVECTOR(0.0f, 3.0f, 0.0f), 4.5f, SOUND_BOUMm, 0.45f);

-		m_object->SetGlobalSphere(D3DVECTOR(0.0f, 4.0f, 0.0f), 6.0f);

+		m_object->CreateCrashSphere(Math::Vector(0.0f, 3.0f, 0.0f), 4.5f, SOUND_BOUMm, 0.45f);

+		m_object->SetGlobalSphere(Math::Vector(0.0f, 4.0f, 0.0f), 6.0f);

 	}

 

 	if ( type == OBJECT_MOBILEfa ||

@@ -238,7 +239,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\lem2.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(1, D3DVECTOR(0.0f, 5.3f, 0.0f));

+		m_object->SetPosition(1, Math::Vector(0.0f, 5.3f, 0.0f));

 		m_object->SetAngleZ(1, ARM_NEUTRAL_ANGLE1);

 

 		// Creates the forearm.

@@ -248,7 +249,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(2, 1);

 		pModFile->ReadModel("objects\\lem3.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(2, D3DVECTOR(5.0f, 0.0f, 0.0f));

+		m_object->SetPosition(2, Math::Vector(5.0f, 0.0f, 0.0f));

 		m_object->SetAngleZ(2, ARM_NEUTRAL_ANGLE2);

 

 		// Creates the hand.

@@ -258,7 +259,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(3, 2);

 		pModFile->ReadModel("objects\\lem4.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(3, D3DVECTOR(3.5f, 0.0f, 0.0f));

+		m_object->SetPosition(3, Math::Vector(3.5f, 0.0f, 0.0f));

 		m_object->SetAngleZ(3, ARM_NEUTRAL_ANGLE3);

 		m_object->SetAngleX(3, Math::PI/2.0f);

 

@@ -269,7 +270,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(4, 3);

 		pModFile->ReadModel("objects\\lem5.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(4, D3DVECTOR(1.5f, 0.0f, 0.0f));

+		m_object->SetPosition(4, Math::Vector(1.5f, 0.0f, 0.0f));

 		m_object->SetAngleZ(4, -Math::PI*0.10f);

 

 		// Creates the remote clamp.

@@ -279,7 +280,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(5, 3);

 		pModFile->ReadModel("objects\\lem6.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(5, D3DVECTOR(1.5f, 0.0f, 0.0f));

+		m_object->SetPosition(5, Math::Vector(1.5f, 0.0f, 0.0f));

 		m_object->SetAngleZ(5, Math::PI*0.10f);

 	}

 

@@ -295,7 +296,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\lem2.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(1, D3DVECTOR(0.0f, 5.3f, 0.0f));

+		m_object->SetPosition(1, Math::Vector(0.0f, 5.3f, 0.0f));

 		m_object->SetAngleZ(1, 110.0f*Math::PI/180.0f);

 

 		// Creates the forearm.

@@ -305,7 +306,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(2, 1);

 		pModFile->ReadModel("objects\\lem3.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(2, D3DVECTOR(5.0f, 0.0f, 0.0f));

+		m_object->SetPosition(2, Math::Vector(5.0f, 0.0f, 0.0f));

 		m_object->SetAngleZ(2, -110.0f*Math::PI/180.0f);

 

 		// Creates the sensor.

@@ -315,7 +316,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(3, 2);

 		pModFile->ReadModel("objects\\lem4s.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(3, D3DVECTOR(3.5f, 0.0f, 0.0f));

+		m_object->SetPosition(3, Math::Vector(3.5f, 0.0f, 0.0f));

 		m_object->SetAngleZ(3, -65.0f*Math::PI/180.0f);

 	}

 

@@ -331,8 +332,8 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\canon.mod");

 		pModFile->CreateEngineObject(rank);

-//?		m_object->SetPosition(1, D3DVECTOR(0.0f, 5.3f, 0.0f));

-		m_object->SetPosition(1, D3DVECTOR(0.0f, 5.3f, 0.0f));

+//?		m_object->SetPosition(1, Math::Vector(0.0f, 5.3f, 0.0f));

+		m_object->SetPosition(1, Math::Vector(0.0f, 5.3f, 0.0f));

 		m_object->SetAngleZ(1, 0.0f);

 	}

 

@@ -348,7 +349,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\canoni1.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(1, D3DVECTOR(0.0f, 5.3f, 0.0f));

+		m_object->SetPosition(1, Math::Vector(0.0f, 5.3f, 0.0f));

 		m_object->SetAngleZ(1, 0.0f);

 

 		rank = m_engine->CreateObject();

@@ -357,7 +358,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(2, 1);

 		pModFile->ReadModel("objects\\canoni2.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(2, D3DVECTOR(0.0f, 2.5f, 0.0f));

+		m_object->SetPosition(2, Math::Vector(0.0f, 2.5f, 0.0f));

 		m_object->SetAngleZ(2, 0.0f);

 	}

 

@@ -374,7 +375,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(6, 0);

 		pModFile->ReadModel("objects\\lem2w.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(6, D3DVECTOR(-3.0f, 1.0f, -3.0f));

+		m_object->SetPosition(6, Math::Vector(-3.0f, 1.0f, -3.0f));

 

 		// Creates the left-back wheel.

 		rank = m_engine->CreateObject();

@@ -383,7 +384,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(7, 0);

 		pModFile->ReadModel("objects\\lem2w.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(7, D3DVECTOR(-3.0f, 1.0f, 3.0f));

+		m_object->SetPosition(7, Math::Vector(-3.0f, 1.0f, 3.0f));

 		m_object->SetAngleY(7, Math::PI);

 

 		// Creates the right-front wheel.

@@ -393,7 +394,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(8, 0);

 		pModFile->ReadModel("objects\\lem2w.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(8, D3DVECTOR(2.0f, 1.0f, -3.0f));

+		m_object->SetPosition(8, Math::Vector(2.0f, 1.0f, -3.0f));

 

 		// Creates the left-front wheel.

 		rank = m_engine->CreateObject();

@@ -402,7 +403,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(9, 0);

 		pModFile->ReadModel("objects\\lem2w.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(9, D3DVECTOR(2.0f, 1.0f, 3.0f));

+		m_object->SetPosition(9, Math::Vector(2.0f, 1.0f, 3.0f));

 		m_object->SetAngleY(9, Math::PI);

 	}

 

@@ -415,7 +416,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(6, 0);

 		pModFile->ReadModel("objects\\lem2w.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(6, D3DVECTOR(-2.0f, 1.0f, -3.0f));

+		m_object->SetPosition(6, Math::Vector(-2.0f, 1.0f, -3.0f));

 

 		// Creates the left-back wheel.

 		rank = m_engine->CreateObject();

@@ -424,7 +425,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(7, 0);

 		pModFile->ReadModel("objects\\lem2w.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(7, D3DVECTOR(-2.0f, 1.0f, 3.0f));

+		m_object->SetPosition(7, Math::Vector(-2.0f, 1.0f, 3.0f));

 		m_object->SetAngleY(7, Math::PI);

 

 		// Creates the right-front wheel.

@@ -434,7 +435,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(8, 0);

 		pModFile->ReadModel("objects\\lem2w.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(8, D3DVECTOR(3.0f, 1.0f, -3.0f));

+		m_object->SetPosition(8, Math::Vector(3.0f, 1.0f, -3.0f));

 

 		// Creates the left-front wheel.

 		rank = m_engine->CreateObject();

@@ -443,7 +444,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(9, 0);

 		pModFile->ReadModel("objects\\lem2w.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(9, D3DVECTOR(3.0f, 1.0f, 3.0f));

+		m_object->SetPosition(9, Math::Vector(3.0f, 1.0f, 3.0f));

 		m_object->SetAngleY(9, Math::PI);

 	}

 

@@ -459,7 +460,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(6, 0);

 		pModFile->ReadModel("objects\\lem2t.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(6, D3DVECTOR(0.0f, 2.0f, -3.0f));

+		m_object->SetPosition(6, Math::Vector(0.0f, 2.0f, -3.0f));

 

 		// Creates the left caterpillar.

 		rank = m_engine->CreateObject();

@@ -468,7 +469,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(7, 0);

 		pModFile->ReadModel("objects\\lem3t.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(7, D3DVECTOR(0.0f, 2.0f, 3.0f));

+		m_object->SetPosition(7, Math::Vector(0.0f, 2.0f, 3.0f));

 	}

 

 	if ( type == OBJECT_MOBILErt ||

@@ -483,7 +484,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(6, 0);

 		pModFile->ReadModel("objects\\roller2.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(6, D3DVECTOR(0.0f, 2.0f, -3.0f));

+		m_object->SetPosition(6, Math::Vector(0.0f, 2.0f, -3.0f));

 

 		// Creates the left caterpillar.

 		rank = m_engine->CreateObject();

@@ -492,7 +493,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(7, 0);

 		pModFile->ReadModel("objects\\roller3.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(7, D3DVECTOR(0.0f, 2.0f, 3.0f));

+		m_object->SetPosition(7, Math::Vector(0.0f, 2.0f, 3.0f));

 	}

 

 	if ( type == OBJECT_MOBILEsa )  // underwater caterpillars?

@@ -504,7 +505,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(6, 0);

 		pModFile->ReadModel("objects\\subm4.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(6, D3DVECTOR(0.0f, 1.0f, -3.0f));

+		m_object->SetPosition(6, Math::Vector(0.0f, 1.0f, -3.0f));

 

 		// Creates the left caterpillar.

 		rank = m_engine->CreateObject();

@@ -513,7 +514,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(7, 0);

 		pModFile->ReadModel("objects\\subm5.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(7, D3DVECTOR(0.0f, 1.0f, 3.0f));

+		m_object->SetPosition(7, Math::Vector(0.0f, 1.0f, 3.0f));

 	}

 

 	if ( type == OBJECT_MOBILEdr )  // caterpillars?

@@ -525,7 +526,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(6, 0);

 		pModFile->ReadModel("objects\\drawer2.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(6, D3DVECTOR(0.0f, 1.0f, -3.0f));

+		m_object->SetPosition(6, Math::Vector(0.0f, 1.0f, -3.0f));

 

 		// Creates the left caterpillar.

 		rank = m_engine->CreateObject();

@@ -534,7 +535,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(7, 0);

 		pModFile->ReadModel("objects\\drawer3.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(7, D3DVECTOR(0.0f, 1.0f, 3.0f));

+		m_object->SetPosition(7, Math::Vector(0.0f, 1.0f, 3.0f));

 	}

 

 	if ( type == OBJECT_MOBILEfa ||

@@ -550,7 +551,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(6, 0);

 		pModFile->ReadModel("objects\\lem2f.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(6, D3DVECTOR(1.7f, 3.0f, 0.0f));

+		m_object->SetPosition(6, Math::Vector(1.7f, 3.0f, 0.0f));

 

 		// Creates the right-back foot.

 		rank = m_engine->CreateObject();

@@ -559,7 +560,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(7, 0);

 		pModFile->ReadModel("objects\\lem2f.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(7, D3DVECTOR(-1.8f, 3.0f, -1.5f));

+		m_object->SetPosition(7, Math::Vector(-1.8f, 3.0f, -1.5f));

 		m_object->SetAngleY(7, 120.0f*Math::PI/180.0f);

 

 		// Creates the left-back foot.

@@ -569,7 +570,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(8, 0);

 		pModFile->ReadModel("objects\\lem2f.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(8, D3DVECTOR(-1.8f, 3.0f, 1.5f));

+		m_object->SetPosition(8, Math::Vector(-1.8f, 3.0f, 1.5f));

 		m_object->SetAngleY(8, -120.0f*Math::PI/180.0f);

 	}

 

@@ -641,7 +642,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\roller2t.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(1, D3DVECTOR(0.0f, 0.0f, 0.0f));

+		m_object->SetPosition(1, Math::Vector(0.0f, 0.0f, 0.0f));

 		m_object->SetAngleZ(1, 0.0f);

 

 		// Creates the pestle.

@@ -651,7 +652,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(2, 0);

 		pModFile->ReadModel("objects\\roller3t.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(2, D3DVECTOR(9.0f, 4.0f, 0.0f));

+		m_object->SetPosition(2, Math::Vector(9.0f, 4.0f, 0.0f));

 		m_object->SetAngleZ(2, 0.0f);

 	}

 

@@ -664,7 +665,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\roller2c.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(1, D3DVECTOR(3.0f, 4.6f, 0.0f));

+		m_object->SetPosition(1, Math::Vector(3.0f, 4.6f, 0.0f));

 		m_object->SetAngleZ(1, Math::PI/8.0f);

 

 		// Creates the cannon.

@@ -674,7 +675,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(2, 0);

 		pModFile->ReadModel("objects\\roller3p.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(2, D3DVECTOR(7.0f, 6.5f, 0.0f));

+		m_object->SetPosition(2, Math::Vector(7.0f, 6.5f, 0.0f));

 		m_object->SetAngleZ(2, 0.0f);

 	}

 

@@ -687,7 +688,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\recover1.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(1, D3DVECTOR(2.0f, 5.0f, 0.0f));

+		m_object->SetPosition(1, Math::Vector(2.0f, 5.0f, 0.0f));

 

 		// Creates the right arm.

 		rank = m_engine->CreateObject();

@@ -696,7 +697,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(2, 1);

 		pModFile->ReadModel("objects\\recover2.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(2, D3DVECTOR(0.1f, 0.0f, -5.0f));

+		m_object->SetPosition(2, Math::Vector(0.1f, 0.0f, -5.0f));

 		m_object->SetAngleZ(2, 126.0f*Math::PI/180.0f);

 

 		// Creates the right forearm.

@@ -706,7 +707,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(3, 2);

 		pModFile->ReadModel("objects\\recover3.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(3, D3DVECTOR(5.0f, 0.0f, -0.5f));

+		m_object->SetPosition(3, Math::Vector(5.0f, 0.0f, -0.5f));

 		m_object->SetAngleZ(3, -144.0f*Math::PI/180.0f);

 

 		// Creates the left arm.

@@ -717,7 +718,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		pModFile->ReadModel("objects\\recover2.mod");

 		pModFile->Mirror();

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(4, D3DVECTOR(0.1f, 0.0f, 5.0f));

+		m_object->SetPosition(4, Math::Vector(0.1f, 0.0f, 5.0f));

 		m_object->SetAngleZ(4, 126.0f*Math::PI/180.0f);

 

 		// Creates the left forearm.

@@ -728,7 +729,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		pModFile->ReadModel("objects\\recover3.mod");

 		pModFile->Mirror();

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(5, D3DVECTOR(5.0f, 0.0f, 0.5f));

+		m_object->SetPosition(5, Math::Vector(5.0f, 0.0f, 0.5f));

 		m_object->SetAngleZ(5, -144.0f*Math::PI/180.0f);

 	}

 

@@ -741,7 +742,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\roller2s.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(1, D3DVECTOR(0.0f, 0.0f, 0.0f));

+		m_object->SetPosition(1, Math::Vector(0.0f, 0.0f, 0.0f));

 		m_object->SetAngleZ(1, 0.0f);

 

 		// Creates the intermediate piston.

@@ -751,7 +752,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(2, 1);

 		pModFile->ReadModel("objects\\roller3s.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(2, D3DVECTOR(7.0f, 4.5f, 0.0f));

+		m_object->SetPosition(2, Math::Vector(7.0f, 4.5f, 0.0f));

 		m_object->SetAngleZ(2, 0.0f);

 

 		// Creates the piston with the sphere.

@@ -761,7 +762,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(3, 2);

 		pModFile->ReadModel("objects\\roller4s.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(3, D3DVECTOR(0.0f, 1.0f, 0.0f));

+		m_object->SetPosition(3, Math::Vector(0.0f, 1.0f, 0.0f));

 		m_object->SetAngleZ(3, 0.0f);

 	}

 

@@ -774,7 +775,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\subm2.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(1, D3DVECTOR(4.2f, 3.0f, 0.0f));

+		m_object->SetPosition(1, Math::Vector(4.2f, 3.0f, 0.0f));

 

 		// Creates the right tong.

 		rank = m_engine->CreateObject();

@@ -783,7 +784,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(2, 1);

 		pModFile->ReadModel("objects\\subm3.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(2, D3DVECTOR(0.5f, 0.0f, -1.5f));

+		m_object->SetPosition(2, Math::Vector(0.5f, 0.0f, -1.5f));

 

 		// Creates the left tong.

 		rank = m_engine->CreateObject();

@@ -793,7 +794,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		pModFile->ReadModel("objects\\subm3.mod");

 		pModFile->Mirror();

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(3, D3DVECTOR(0.5f, 0.0f, 1.5f));

+		m_object->SetPosition(3, Math::Vector(0.5f, 0.0f, 1.5f));

 	}

 

 	if ( type == OBJECT_MOBILEdr )

@@ -805,7 +806,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\drawer4.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(1, D3DVECTOR(-3.0f, 3.0f, 0.0f));

+		m_object->SetPosition(1, Math::Vector(-3.0f, 3.0f, 0.0f));

 

 		// Creates the key.

 		if ( m_object->RetToy() )

@@ -816,7 +817,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 			m_object->SetObjectParent(2, 0);

 			pModFile->ReadModel("objects\\drawer5.mod");

 			pModFile->CreateEngineObject(rank);

-			m_posKey = D3DVECTOR(3.0f, 5.7f, 0.0f);

+			m_posKey = Math::Vector(3.0f, 5.7f, 0.0f);

 			m_object->SetPosition(2, m_posKey);

 			m_object->SetAngleY(2, 90.0f*Math::PI/180.0f);

 		}

@@ -831,7 +832,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 			sprintf(name, "objects\\drawer%d.mod", 10+i);

 			pModFile->ReadModel(name);

 			pModFile->CreateEngineObject(rank);

-			m_object->SetPosition(10+i, D3DVECTOR(0.0f, 0.0f, 0.0f));

+			m_object->SetPosition(10+i, Math::Vector(0.0f, 0.0f, 0.0f));

 			m_object->SetAngleY(10+i, 45.0f*Math::PI/180.0f*i);

 		}

 	}

@@ -847,7 +848,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 			m_object->SetObjectParent(2, 0);

 			pModFile->ReadModel("objects\\drawer5.mod");

 			pModFile->CreateEngineObject(rank);

-			m_posKey = D3DVECTOR(0.2f, 4.1f, 0.0f);

+			m_posKey = Math::Vector(0.2f, 4.1f, 0.0f);

 			m_object->SetPosition(2, m_posKey);

 			m_object->SetAngleY(2, 90.0f*Math::PI/180.0f);

 		}

@@ -862,7 +863,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(1, 0);

 		pModFile->ReadModel("objects\\apolloj2.mod");  // antenna

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(1, D3DVECTOR(5.5f, 8.8f, 2.0f));

+		m_object->SetPosition(1, Math::Vector(5.5f, 8.8f, 2.0f));

 		m_object->SetAngleY(1, -120.0f*Math::PI/180.0f);

 		m_object->SetAngleZ(1,   45.0f*Math::PI/180.0f);

 

@@ -872,7 +873,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(2, 0);

 		pModFile->ReadModel("objects\\apolloj3.mod");  // camera

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(2, D3DVECTOR(5.5f, 2.8f, -2.0f));

+		m_object->SetPosition(2, Math::Vector(5.5f, 2.8f, -2.0f));

 		m_object->SetAngleY(2, 30.0f*Math::PI/180.0f);

 

 		// Creates the wheels.

@@ -882,7 +883,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(6, 0);

 		pModFile->ReadModel("objects\\apolloj4.mod");  // wheel

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(6, D3DVECTOR(-5.75f, 1.65f, -5.0f));

+		m_object->SetPosition(6, Math::Vector(-5.75f, 1.65f, -5.0f));

 

 		rank = m_engine->CreateObject();

 		m_engine->SetObjectType(rank, TYPEDESCENDANT);

@@ -890,7 +891,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(7, 0);

 		pModFile->ReadModel("objects\\apolloj4.mod");  // wheel

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(7, D3DVECTOR(-5.75f, 1.65f, 5.0f));

+		m_object->SetPosition(7, Math::Vector(-5.75f, 1.65f, 5.0f));

 

 		rank = m_engine->CreateObject();

 		m_engine->SetObjectType(rank, TYPEDESCENDANT);

@@ -898,7 +899,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(8, 0);

 		pModFile->ReadModel("objects\\apolloj4.mod");  // wheel

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(8, D3DVECTOR(5.75f, 1.65f, -5.0f));

+		m_object->SetPosition(8, Math::Vector(5.75f, 1.65f, -5.0f));

 

 		rank = m_engine->CreateObject();

 		m_engine->SetObjectType(rank, TYPEDESCENDANT);

@@ -906,7 +907,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(9, 0);

 		pModFile->ReadModel("objects\\apolloj4.mod");  // wheel

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(9, D3DVECTOR(5.75f, 1.65f, 5.00f));

+		m_object->SetPosition(9, Math::Vector(5.75f, 1.65f, 5.00f));

 

 		// Creates mud guards.

 		rank = m_engine->CreateObject();

@@ -915,7 +916,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(10, 0);

 		pModFile->ReadModel("objects\\apolloj6.mod");  // wheel

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(10, D3DVECTOR(-5.75f, 1.65f, -5.0f));

+		m_object->SetPosition(10, Math::Vector(-5.75f, 1.65f, -5.0f));

 

 		rank = m_engine->CreateObject();

 		m_engine->SetObjectType(rank, TYPEDESCENDANT);

@@ -923,7 +924,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(11, 0);

 		pModFile->ReadModel("objects\\apolloj6.mod");  // wheel

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(11, D3DVECTOR(-5.75f, 1.65f, 5.0f));

+		m_object->SetPosition(11, Math::Vector(-5.75f, 1.65f, 5.0f));

 

 		rank = m_engine->CreateObject();

 		m_engine->SetObjectType(rank, TYPEDESCENDANT);

@@ -931,7 +932,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(12, 0);

 		pModFile->ReadModel("objects\\apolloj5.mod");  // wheel

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(12, D3DVECTOR(5.75f, 1.65f, -5.0f));

+		m_object->SetPosition(12, Math::Vector(5.75f, 1.65f, -5.0f));

 

 		rank = m_engine->CreateObject();

 		m_engine->SetObjectType(rank, TYPEDESCENDANT);

@@ -939,7 +940,7 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(13, 0);

 		pModFile->ReadModel("objects\\apolloj5.mod");  // wheel

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(13, D3DVECTOR(5.75f, 1.65f, 5.00f));

+		m_object->SetPosition(13, Math::Vector(5.75f, 1.65f, 5.00f));

 	}

 

 #if 1

@@ -1054,8 +1055,8 @@ bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
 		pModFile->CreateEngineObject(rank);

 

 		pPower->SetPosition(0, m_object->RetCharacter()->posPower);

-		pPower->CreateCrashSphere(D3DVECTOR(0.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f);

-		pPower->SetGlobalSphere(D3DVECTOR(0.0f, 1.0f, 0.0f), 1.5f);

+		pPower->CreateCrashSphere(Math::Vector(0.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f);

+		pPower->SetGlobalSphere(Math::Vector(0.0f, 1.0f, 0.0f), 1.5f);

 

 		pPower->SetTruck(m_object);

 		m_object->SetPower(pPower);

@@ -1093,7 +1094,7 @@ void CMotionVehicle::CreatePhysics(ObjectType type)
 		character->wheelBack  = 4.0f;

 		character->wheelLeft  = 4.0f;

 		character->wheelRight = 4.0f;

-		character->posPower   = D3DVECTOR(-3.2f, 3.0f, 0.0f);

+		character->posPower   = Math::Vector(-3.2f, 3.0f, 0.0f);

 

 		m_physics->SetLinMotionX(MO_ADVSPEED, 20.0f);

 		m_physics->SetLinMotionX(MO_RECSPEED, 10.0f);

@@ -1121,7 +1122,7 @@ void CMotionVehicle::CreatePhysics(ObjectType type)
 		character->wheelBack  = 3.0f;

 		character->wheelLeft  = 4.0f;

 		character->wheelRight = 4.0f;

-		character->posPower   = D3DVECTOR(-3.2f, 3.0f, 0.0f);

+		character->posPower   = Math::Vector(-3.2f, 3.0f, 0.0f);

 

 		m_physics->SetLinMotionX(MO_ADVSPEED, 20.0f);

 		m_physics->SetLinMotionX(MO_RECSPEED, 10.0f);

@@ -1152,7 +1153,7 @@ void CMotionVehicle::CreatePhysics(ObjectType type)
 		character->wheelBack  = 4.0f;

 		character->wheelLeft  = 4.8f;

 		character->wheelRight = 4.8f;

-		character->posPower   = D3DVECTOR(-3.2f, 3.0f, 0.0f);

+		character->posPower   = Math::Vector(-3.2f, 3.0f, 0.0f);

 

 		m_physics->SetLinMotionX(MO_ADVSPEED, 15.0f);

 		m_physics->SetLinMotionX(MO_RECSPEED,  8.0f);

@@ -1183,7 +1184,7 @@ void CMotionVehicle::CreatePhysics(ObjectType type)
 		character->wheelBack  = 4.0f;

 		character->wheelLeft  = 5.0f;

 		character->wheelRight = 5.0f;

-		character->posPower   = D3DVECTOR(-3.2f, 3.0f, 0.0f);

+		character->posPower   = Math::Vector(-3.2f, 3.0f, 0.0f);

 

 		m_physics->SetLinMotionX(MO_ADVSPEED, 15.0f);

 		m_physics->SetLinMotionX(MO_RECSPEED,  8.0f);

@@ -1216,7 +1217,7 @@ void CMotionVehicle::CreatePhysics(ObjectType type)
 		character->wheelBack  = 4.0f;

 		character->wheelLeft  = 4.5f;

 		character->wheelRight = 4.5f;

-		character->posPower   = D3DVECTOR(-3.2f, 3.0f, 0.0f);

+		character->posPower   = Math::Vector(-3.2f, 3.0f, 0.0f);

 

 		m_physics->SetLinMotionX(MO_ADVSPEED, 50.0f);

 		m_physics->SetLinMotionX(MO_RECSPEED, 50.0f);

@@ -1252,7 +1253,7 @@ void CMotionVehicle::CreatePhysics(ObjectType type)
 		character->wheelBack  = 5.0f;

 		character->wheelLeft  = 6.0f;

 		character->wheelRight = 6.0f;

-		character->posPower   = D3DVECTOR(-5.8f, 4.0f, 0.0f);

+		character->posPower   = Math::Vector(-5.8f, 4.0f, 0.0f);

 

 		m_physics->SetLinMotionX(MO_ADVSPEED, 10.0f);

 		m_physics->SetLinMotionX(MO_RECSPEED,  5.0f);

@@ -1280,7 +1281,7 @@ void CMotionVehicle::CreatePhysics(ObjectType type)
 		character->wheelBack  = 4.0f;

 		character->wheelLeft  = 4.0f;

 		character->wheelRight = 4.0f;

-		character->posPower   = D3DVECTOR(-5.0f, 3.0f, 0.0f);

+		character->posPower   = Math::Vector(-5.0f, 3.0f, 0.0f);

 

 		m_physics->SetLinMotionX(MO_ADVSPEED, 15.0f);

 		m_physics->SetLinMotionX(MO_RECSPEED, 10.0f);

@@ -1308,7 +1309,7 @@ void CMotionVehicle::CreatePhysics(ObjectType type)
 		character->wheelBack  = 4.0f;

 		character->wheelLeft  = 4.0f;

 		character->wheelRight = 4.0f;

-		character->posPower   = D3DVECTOR(-5.0f, 3.0f, 0.0f);

+		character->posPower   = Math::Vector(-5.0f, 3.0f, 0.0f);

 

 		m_physics->SetLinMotionX(MO_ADVSPEED, 15.0f);

 		m_physics->SetLinMotionX(MO_RECSPEED, 10.0f);

@@ -1379,9 +1380,9 @@ bool CMotionVehicle::EventProcess(const Event &event)
 

 bool CMotionVehicle::EventFrame(const Event &event)

 {

-	D3DMATRIX*	mat;

+	Math::Matrix*	mat;

 	Character*	character;

-	D3DVECTOR	pos, angle, floor;

+	Math::Vector	pos, angle, floor;

 	ObjectType	type;

 	float		s, a, speedBL, speedBR, speedFL, speedFR, h, a1, a2;

 	float		back, front, dist, radius, limit[2];

@@ -1482,7 +1483,7 @@ bool CMotionVehicle::EventFrame(const Event &event)
 				radius =  1.0f;

 			}

 

-			if ( Length(pos, m_engine->RetEyePt()) < 50.0f )  // suspension?

+			if ( Math::Distance(pos, m_engine->RetEyePt()) < 50.0f )  // suspension?

 			{

 				character = m_object->RetCharacter();

 				mat = m_object->RetWorldMatrix(0);

@@ -1490,7 +1491,7 @@ bool CMotionVehicle::EventFrame(const Event &event)
 				pos.x = -character->wheelBack;  // right back wheel

 				pos.z = -character->wheelRight;

 				pos.y =  0.0f;

-				pos = Transform(*mat, pos);

+				pos = Math::Transform(*mat, pos);

 				h = m_terrain->RetFloorHeight(pos);

 				if ( h >  0.5f )  h =  0.5f;

 				if ( h < -0.5f )  h = -0.5f;

@@ -1503,7 +1504,7 @@ bool CMotionVehicle::EventFrame(const Event &event)
 				pos.x = -character->wheelBack;  // left back wheel

 				pos.z =  character->wheelLeft;

 				pos.y =  0.0f;

-				pos = Transform(*mat, pos);

+				pos = Math::Transform(*mat, pos);

 				h = m_terrain->RetFloorHeight(pos);

 				if ( h >  0.5f )  h =  0.5f;

 				if ( h < -0.5f )  h = -0.5f;

@@ -1516,7 +1517,7 @@ bool CMotionVehicle::EventFrame(const Event &event)
 				pos.x =  character->wheelFront;  // right front wheel

 				pos.z = -character->wheelRight;

 				pos.y =  0.0f;

-				pos = Transform(*mat, pos);

+				pos = Math::Transform(*mat, pos);

 				h = m_terrain->RetFloorHeight(pos);

 				if ( h >  0.5f )  h =  0.5f;

 				if ( h < -0.5f )  h = -0.5f;

@@ -1529,7 +1530,7 @@ bool CMotionVehicle::EventFrame(const Event &event)
 				pos.x =  character->wheelFront;  // left front wheel

 				pos.z =  character->wheelLeft;

 				pos.y =  0.0f;

-				pos = Transform(*mat, pos);

+				pos = Math::Transform(*mat, pos);

 				h = m_terrain->RetFloorHeight(pos);

 				if ( h >  0.5f )  h =  0.5f;

 				if ( h < -0.5f )  h = -0.5f;

@@ -1541,17 +1542,17 @@ bool CMotionVehicle::EventFrame(const Event &event)
 			}

 			else

 			{

-				m_object->SetPosition(6, D3DVECTOR(back,  radius, -dist));

-				m_object->SetPosition(7, D3DVECTOR(back,  radius,  dist));

-				m_object->SetPosition(8, D3DVECTOR(front, radius, -dist));

-				m_object->SetPosition(9, D3DVECTOR(front, radius,  dist));

+				m_object->SetPosition(6, Math::Vector(back,  radius, -dist));

+				m_object->SetPosition(7, Math::Vector(back,  radius,  dist));

+				m_object->SetPosition(8, Math::Vector(front, radius, -dist));

+				m_object->SetPosition(9, Math::Vector(front, radius,  dist));

 

 				if ( type == OBJECT_APOLLO2 )

 				{

-					m_object->SetPosition(10, D3DVECTOR(back,  radius, -dist));

-					m_object->SetPosition(11, D3DVECTOR(back,  radius,  dist));

-					m_object->SetPosition(12, D3DVECTOR(front, radius, -dist));

-					m_object->SetPosition(13, D3DVECTOR(front, radius,  dist));

+					m_object->SetPosition(10, Math::Vector(back,  radius, -dist));

+					m_object->SetPosition(11, Math::Vector(back,  radius,  dist));

+					m_object->SetPosition(12, Math::Vector(front, radius, -dist));

+					m_object->SetPosition(13, Math::Vector(front, radius,  dist));

 				}

 			}

 		}

@@ -1612,7 +1613,7 @@ bool CMotionVehicle::EventFrame(const Event &event)
 				limit[1] = -10.0f*Math::PI/180.0f;

 			}

 

-			if ( Length(pos, m_engine->RetEyePt()) < 50.0f )  // suspension?

+			if ( Math::Distance(pos, m_engine->RetEyePt()) < 50.0f )  // suspension?

 			{

 				character = m_object->RetCharacter();

 				mat = m_object->RetWorldMatrix(0);

@@ -1707,8 +1708,8 @@ bool CMotionVehicle::EventFrame(const Event &event)
 

 bool CMotionVehicle::EventFrameFly(const Event &event)

 {

-	D3DMATRIX*	mat;

-	D3DVECTOR	pos, angle, paw[3];

+	Math::Matrix*	mat;

+	Math::Vector	pos, angle, paw[3];

 	float		hope[3], actual, final, h, a;

 	int			i;

 

@@ -1728,9 +1729,9 @@ bool CMotionVehicle::EventFrameFly(const Event &event)
 	if ( m_physics->RetLand() )  // on the ground?

 	{

 		mat = m_object->RetWorldMatrix(0);

-		paw[0] = Transform(*mat, D3DVECTOR( 4.2f, 0.0f,  0.0f));  // front

-		paw[1] = Transform(*mat, D3DVECTOR(-3.0f, 0.0f, -3.7f));  // right back

-		paw[2] = Transform(*mat, D3DVECTOR(-3.0f, 0.0f,  3.7f));  // left back

+		paw[0] = Transform(*mat, Math::Vector( 4.2f, 0.0f,  0.0f));  // front

+		paw[1] = Transform(*mat, Math::Vector(-3.0f, 0.0f, -3.7f));  // right back

+		paw[2] = Transform(*mat, Math::Vector(-3.0f, 0.0f,  3.7f));  // left back

 

 		for ( i=0 ; i<3 ; i++ )

 		{

@@ -1767,7 +1768,7 @@ bool CMotionVehicle::EventFrameFly(const Event &event)
 

 bool CMotionVehicle::EventFrameInsect(const Event &event)

 {

-	D3DVECTOR	dir;

+	Math::Vector	dir;

 	float		s, a, prog, time;

 	int			i, st, nd, action;

 	bool		bStop, bOnBoard;

@@ -1920,7 +1921,7 @@ bool CMotionVehicle::EventFrameInsect(const Event &event)
 bool CMotionVehicle::EventFrameCanoni(const Event &event)

 {

 	CObject*	power;

-	D3DVECTOR	pos, speed;

+	Math::Vector	pos, speed;

 	Math::Point		dim;

 	float		zoom, angle, energy, factor;

 	bool		bOnBoard = false;

diff --git a/src/object/motion/motionvehicle.h b/src/object/motion/motionvehicle.h
index b9ac0c9..8bc4dd2 100644
--- a/src/object/motion/motionvehicle.h
+++ b/src/object/motion/motionvehicle.h
@@ -40,7 +40,7 @@ public:
 	~CMotionVehicle();

 

 	void		DeleteObject(bool bAll=false);

-	bool		Create(D3DVECTOR pos, float angle, ObjectType type, float power);

+	bool		Create(Math::Vector pos, float angle, ObjectType type, float power);

 	bool		EventProcess(const Event &event);

 

 	bool		RetTraceDown();

@@ -68,9 +68,9 @@ protected:
 	float		m_armMember;

 	float		m_canonTime;

 	float		m_lastTimeCanon;

-	D3DVECTOR	m_wheelLastPos;

-	D3DVECTOR	m_wheelLastAngle;

-	D3DVECTOR	m_posKey;

+	Math::Vector	m_wheelLastPos;

+	Math::Vector	m_wheelLastAngle;

+	Math::Vector	m_posKey;

 	bool		m_bFlyFix;

 	bool		m_bTraceDown;

 	int			m_traceColor;

diff --git a/src/object/motion/motionworm.cpp b/src/object/motion/motionworm.cpp
index ab3f946..0918a0f 100644
--- a/src/object/motion/motionworm.cpp
+++ b/src/object/motion/motionworm.cpp
@@ -87,7 +87,7 @@ void CMotionWorm::DeleteObject(bool bAll)
 

 // Creates a vehicle traveling any lands on the ground.

 

-bool CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type,

+bool CMotionWorm::Create(Math::Vector pos, float angle, ObjectType type,

 						 float power)

 {

 	CModFile*	pModFile;

@@ -110,8 +110,8 @@ bool CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetAngleY(0, angle);

 

 	// A vehicle must have a obligatory collision with a sphere of center (0, y, 0) (see GetCrashSphere).

-	m_object->CreateCrashSphere(D3DVECTOR(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUM, 0.20f);

-	m_object->SetGlobalSphere(D3DVECTOR(0.0f, 0.0f, 0.0f), 5.0f);

+	m_object->CreateCrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUM, 0.20f);

+	m_object->SetGlobalSphere(Math::Vector(0.0f, 0.0f, 0.0f), 5.0f);

 

 	px = 1.0f+WORM_PART/2;

 

@@ -122,7 +122,7 @@ bool CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(1, 0);

 	pModFile->ReadModel("objects\\worm1.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(1, D3DVECTOR(px, 0.0f, 0.0f));

+	m_object->SetPosition(1, Math::Vector(px, 0.0f, 0.0f));

 	px -= 1.0f;

 

 	// Creates the body.

@@ -134,7 +134,7 @@ bool CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type,
 		m_object->SetObjectParent(2+i, 0);

 		pModFile->ReadModel("objects\\worm2.mod");

 		pModFile->CreateEngineObject(rank);

-		m_object->SetPosition(2+i, D3DVECTOR(px, 0.0f, 0.0f));

+		m_object->SetPosition(2+i, Math::Vector(px, 0.0f, 0.0f));

 		px -= 1.0f;

 	}

 

@@ -145,7 +145,7 @@ bool CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type,
 	m_object->SetObjectParent(2+WORM_PART, 0);

 	pModFile->ReadModel("objects\\worm3.mod");

 	pModFile->CreateEngineObject(rank);

-	m_object->SetPosition(2+WORM_PART, D3DVECTOR(px, 0.0f, 0.0f));

+	m_object->SetPosition(2+WORM_PART, Math::Vector(px, 0.0f, 0.0f));

 

 	m_object->CreateShadowCircle(0.0f, 1.0f, D3DSHADOWWORM);

 

@@ -246,8 +246,8 @@ bool CMotionWorm::EventProcess(const Event &event)
 

 bool CMotionWorm::EventFrame(const Event &event)

 {

-	D3DMATRIX*	mat;

-	D3DVECTOR	pos, p, angle, speed;

+	Math::Matrix*	mat;

+	Math::Vector	pos, p, angle, speed;

 	Math::Point		center, pp, dim;

 	float		height[WORM_PART+2];

 	float		floor, a, s, px, curve, phase, h, zoom, radius;

@@ -346,7 +346,7 @@ bool CMotionWorm::EventFrame(const Event &event)
 			pos.y += -height[i];

 			pos.x += (Math::Rand()-0.5f)*4.0f;

 			pos.z += (Math::Rand()-0.5f)*4.0f;

-			speed = D3DVECTOR(0.0f, 0.0f, 0.0f);

+			speed = Math::Vector(0.0f, 0.0f, 0.0f);

 			dim.x = Math::Rand()*2.0f+1.5f;

 			dim.y = dim.x;

 			m_particule->CreateParticule(pos, speed, dim, PARTICRASH, 2.0f);

@@ -360,7 +360,7 @@ bool CMotionWorm::EventFrame(const Event &event)
 		pos  = m_object->RetPosition(i+2);

 		pos -= m_object->RetPosition(i+1);

 

-		angle.z = -Math::RotateAngle(Length(pos.x, pos.z), pos.y);

+		angle.z = -Math::RotateAngle(Math::Point(pos.x, pos.z).Length(), pos.y);

 		angle.y = Math::PI-Math::RotateAngle(pos.x, pos.z);

 		angle.x = 0.0f;

 		m_object->SetAngle(i+1, angle);

diff --git a/src/object/motion/motionworm.h b/src/object/motion/motionworm.h
index 6dca520..687435e 100644
--- a/src/object/motion/motionworm.h
+++ b/src/object/motion/motionworm.h
@@ -40,7 +40,7 @@ public:
 	~CMotionWorm();

 

 	void	DeleteObject(bool bAll=false);

-	bool	Create(D3DVECTOR pos, float angle, ObjectType type, float power);

+	bool	Create(Math::Vector pos, float angle, ObjectType type, float power);

 	bool	EventProcess(const Event &event);

 

 	bool	SetParam(int rank, float value);