diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-19 20:11:47 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-19 20:11:47 +0200 |
commit | 9f784e81f81651bed087902f9f3afee113e56148 (patch) | |
tree | ae89f6dabe2443b39aba292673027d197fc120e6 /src/object/motion/motion.h | |
parent | b8027ce9a7f050b95846a668a02f5801331e127f (diff) | |
download | colobot-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/object/motion/motion.h')
-rw-r--r-- | src/object/motion/motion.h | 20 |
1 files changed, 10 insertions, 10 deletions
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
};
|