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/graphics/common/model.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/graphics/common/model.h') diff --git a/src/graphics/common/model.h b/src/graphics/common/model.h index 385f4e1..74914f0 100644 --- a/src/graphics/common/model.h +++ b/src/graphics/common/model.h @@ -51,20 +51,20 @@ protected: bool EventFrame(const Event &event); bool GetVertex(int rank, D3DVERTEX2 &vertex); bool SetVertex(int rank, D3DVERTEX2 &vertex); - D3DVECTOR RetSelectCDG(); - D3DVECTOR RetSelectNormal(); + Math::Vector RetSelectCDG(); + Math::Vector RetSelectNormal(); void SmoothSelect(); void PlaneSelect(); void ColorSelect(); void StateSelect(); - void MoveSelect(D3DVECTOR move); - void OperSelect(D3DVECTOR move, char oper); + void MoveSelect(Math::Vector move); + void OperSelect(Math::Vector move, char oper); void ReadScript(char *filename); - void BBoxCompute(D3DVECTOR &min, D3DVECTOR &max); + void BBoxCompute(Math::Vector &min, Math::Vector &max); bool IsMappingSelectPlausible(D3DMaping D3Dmode); void MappingSelect(int mode, int rotate, bool bMirrorX, bool bMirrorY, Math::Point ti, Math::Point ts, char *texName); void MappingSelectSpherical(int mode, int rotate, bool bMirrorX, bool bMirrorY, Math::Point ti, Math::Point ts, char *texName); - D3DVECTOR RetMappingCenter(D3DVECTOR pos, D3DVECTOR min); + Math::Vector RetMappingCenter(Math::Vector pos, Math::Vector min); void MappingSelectCylindrical(int mode, int rotate, bool bMirrorX, bool bMirrorY, Math::Point ti, Math::Point ts, char *texName); void MappingSelectFace(int mode, int rotate, bool bMirrorX, bool bMirrorY, Math::Point ti, Math::Point ts, char *texName); void MappingSelect2(int texNum2, int subdiv, int offsetU, int offsetV, bool bMirrorX, bool bMirrorY); -- cgit v1.2.3-1-g7c22