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/auto/autoportico.cpp | |
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/auto/autoportico.cpp')
-rw-r--r-- | src/object/auto/autoportico.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp index cedb1d7..388bfcc 100644 --- a/src/object/auto/autoportico.cpp +++ b/src/object/auto/autoportico.cpp @@ -123,7 +123,7 @@ void CAutoPortico::Init() void CAutoPortico::Start(int param)
{
- D3DVECTOR pos;
+ Math::Vector pos;
pos = m_object->RetPosition(0);
m_finalPos = pos;
@@ -131,7 +131,7 @@ void CAutoPortico::Start(int param) m_object->SetPosition(0, pos);
m_finalPos.z += PORTICO_TIME_OPEN*5.3f;
- m_object->SetPosition(1, D3DVECTOR(0.0f, PORTICO_POSa, 0.0f));
+ m_object->SetPosition(1, Math::Vector(0.0f, PORTICO_POSa, 0.0f));
m_object->SetAngleY(2, PORTICO_ANGLE1a);
m_object->SetAngleY(3, PORTICO_ANGLE2a);
m_object->SetAngleY(4, PORTICO_ANGLE3a);
@@ -152,7 +152,7 @@ void CAutoPortico::Start(int param) bool CAutoPortico::EventProcess(const Event &event)
{
CObject* pObj;
- D3DVECTOR pos;
+ Math::Vector pos;
float angle;
CAuto::EventProcess(event);
@@ -372,7 +372,7 @@ bool CAutoPortico::Abort() CObject* pObj;
m_object->SetPosition(0, m_finalPos);
- m_object->SetPosition(1, D3DVECTOR(0.0f, PORTICO_POSb, 0.0f));
+ m_object->SetPosition(1, Math::Vector(0.0f, PORTICO_POSb, 0.0f));
m_object->SetAngleY(2, PORTICO_ANGLE1b);
m_object->SetAngleY(3, PORTICO_ANGLE2b);
m_object->SetAngleY(4, PORTICO_ANGLE3b);
|