summaryrefslogtreecommitdiffstats
path: root/src/graphics/common/pyro.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-06-19 20:11:47 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-06-19 20:11:47 +0200
commit9f784e81f81651bed087902f9f3afee113e56148 (patch)
treeae89f6dabe2443b39aba292673027d197fc120e6 /src/graphics/common/pyro.h
parentb8027ce9a7f050b95846a668a02f5801331e127f (diff)
downloadcolobot-9f784e81f81651bed087902f9f3afee113e56148.tar.gz
colobot-9f784e81f81651bed087902f9f3afee113e56148.tar.bz2
colobot-9f784e81f81651bed087902f9f3afee113e56148.zip
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
Diffstat (limited to 'src/graphics/common/pyro.h')
-rw-r--r--src/graphics/common/pyro.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/graphics/common/pyro.h b/src/graphics/common/pyro.h
index d898a94..9f35438 100644
--- a/src/graphics/common/pyro.h
+++ b/src/graphics/common/pyro.h
@@ -70,10 +70,10 @@ enum PyroType
struct PyroBurnPart
{
int part;
- D3DVECTOR initialPos;
- D3DVECTOR finalPos;
- D3DVECTOR initialAngle;
- D3DVECTOR finalAngle;
+ Math::Vector initialPos;
+ Math::Vector finalPos;
+ Math::Vector initialAngle;
+ Math::Vector finalAngle;
};
struct PyroLightOper
@@ -99,7 +99,7 @@ public:
protected:
void DisplayError(PyroType type, CObject* pObj);
- bool CreateLight(D3DVECTOR pos, float height);
+ bool CreateLight(Math::Vector pos, float height);
void DeleteObject(bool bPrimary, bool bSecondary);
void CreateTriangle(CObject* pObj, ObjectType oType, int part);
@@ -108,7 +108,7 @@ protected:
void ExploTerminate();
void BurnStart();
- void BurnAddPart(int part, D3DVECTOR pos, D3DVECTOR angle);
+ void BurnAddPart(int part, Math::Vector pos, Math::Vector angle);
void BurnProgress();
bool BurnIsKeepPart(int part);
void BurnTerminate();
@@ -134,8 +134,8 @@ protected:
CRobotMain* m_main;
CSound* m_sound;
- D3DVECTOR m_pos; // center of the effect
- D3DVECTOR m_posPower; // center of the battery
+ Math::Vector m_pos; // center of the effect
+ Math::Vector m_posPower; // center of the battery
bool m_bPower; // battery exists?
PyroType m_type;
float m_force;
@@ -164,7 +164,7 @@ protected:
bool m_bFallEnding;
int m_crashSphereUsed; // number of spheres used
- D3DVECTOR m_crashSpherePos[50];
+ Math::Vector m_crashSpherePos[50];
float m_crashSphereRadius[50];
};