From 9f784e81f81651bed087902f9f3afee113e56148 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Tue, 19 Jun 2012 20:11:47 +0200 Subject: 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 --- src/app/d3dapp.cpp | 9 +++++---- src/app/d3dapp.h | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/app') diff --git a/src/app/d3dapp.cpp b/src/app/d3dapp.cpp index ed88d6b..4f29584 100644 --- a/src/app/d3dapp.cpp +++ b/src/app/d3dapp.cpp @@ -135,8 +135,8 @@ CD3DApplication::CD3DApplication() m_pddsDepthBuffer = 0; m_keyState = 0; - m_axeKey = D3DVECTOR(0.0f, 0.0f, 0.0f); - m_axeJoy = D3DVECTOR(0.0f, 0.0f, 0.0f); + m_axeKey = Math::Vector(0.0f, 0.0f, 0.0f); + m_axeJoy = Math::Vector(0.0f, 0.0f, 0.0f); m_vidMemTotal = 0; m_bActive = false; @@ -496,6 +496,7 @@ HRESULT CD3DApplication::Create( HINSTANCE hInst, TCHAR* strCmdLine ) { m_pDeviceInfo->bWindowed = !bFull; } + m_pDeviceInfo->bWindowed = true; // Create the 3D engine. if( (m_pD3DEngine = new CD3DEngine(m_iMan, this)) == NULL ) @@ -978,8 +979,8 @@ BOOL CALLBACK AboutProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM ) void CD3DApplication::FlushPressKey() { m_keyState = 0; - m_axeKey = D3DVECTOR(0.0f, 0.0f, 0.0f); - m_axeJoy = D3DVECTOR(0.0f, 0.0f, 0.0f); + m_axeKey = Math::Vector(0.0f, 0.0f, 0.0f); + m_axeJoy = Math::Vector(0.0f, 0.0f, 0.0f); } // Resets the default keys. 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 +#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; -- cgit v1.2.3-1-g7c22