summaryrefslogtreecommitdiffstats
path: root/src/app/d3dapp.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/app/d3dapp.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/app/d3dapp.h')
-rw-r--r--src/app/d3dapp.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/app/d3dapp.h b/src/app/d3dapp.h
index db18f5d..2171057 100644
--- a/src/app/d3dapp.h
+++ b/src/app/d3dapp.h
@@ -22,6 +22,7 @@
#define D3D_OVERLOADS
#include <d3d.h>
+#include "math/vector.h"
#include "graphics/d3d/d3dengine.h"
#include "graphics/d3d/d3dframe.h"
#include "graphics/d3d/d3denum.h"
@@ -152,8 +153,8 @@ public:
CSound* m_pSound;
int m_keyState;
- D3DVECTOR m_axeKey;
- D3DVECTOR m_axeJoy;
+ Math::Vector m_axeKey;
+ Math::Vector m_axeJoy;
bool m_bJoyButton[32];
Math::Point m_mousePos;
DWORD m_mshMouseWheel;