diff options
author | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
---|---|---|
committer | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
commit | 26b5e033ffde3d161382fc9addbfa99738379641 (patch) | |
tree | a344f369ca32945f787a02dee35c3dbe342bed7e /src/shared/vmap/TileAssembler.h | |
parent | f21f47005dcb6b76e1abc9f35fbcd03eed191bff (diff) |
*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget
--HG--
branch : trunk
Diffstat (limited to 'src/shared/vmap/TileAssembler.h')
-rw-r--r-- | src/shared/vmap/TileAssembler.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/shared/vmap/TileAssembler.h b/src/shared/vmap/TileAssembler.h index d2183794a9e..27cddbc2c1c 100644 --- a/src/shared/vmap/TileAssembler.h +++ b/src/shared/vmap/TileAssembler.h @@ -17,19 +17,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #ifndef _TILEASSEMBLER_H_ #define _TILEASSEMBLER_H_ - // load our modified version first !! #include "AABSPTree.h" - #include <G3D/Vector3.h> - #include "CoordModelMapping.h" #include "SubModel.h" #include "ModelContainer.h" - namespace VMAP { /** @@ -37,7 +32,6 @@ namespace VMAP To start the conversion call convertWorld(). */ //=============================================== - class ModelPosition { private: @@ -50,18 +44,15 @@ namespace VMAP float iScale; void init() { - // Swap x and y the raw data uses the axis differently ixMatrix = G3D::Matrix3::fromAxisAngle(G3D::Vector3::unitY(),-(G3D::pi()*iDir.x/180.0)); iyMatrix = G3D::Matrix3::fromAxisAngle(G3D::Vector3::unitX(),-(G3D::pi()*iDir.y/180.0)); izMatrix = G3D::Matrix3::fromAxisAngle(G3D::Vector3::unitZ(),-(G3D::pi()*iDir.z/180.0)); - } G3D::Vector3 transform(const G3D::Vector3& pIn) const; void moveToBasePos(const G3D::Vector3& pBasePos) { iPos -= pBasePos; } }; //=============================================== - class TileAssembler { private: @@ -71,17 +62,13 @@ namespace VMAP bool (*iFilterMethod)(char *pName); G3D::Table<std::string, unsigned int > iUniqueNameIds; unsigned int iCurrentUniqueNameId; - public: TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName); virtual ~TileAssembler(); - bool fillModelContainerArray(const std::string& pDirFileName, unsigned int pMapId, int pXPos, int pYPos, G3D::Array<ModelContainer*>& pMC); ModelContainer* processNames(const G3D::Array<std::string>& pPosFileNames, const char* pDestFileName); - void init(); bool convertWorld(); - bool fillModelIntoTree(G3D::AABSPTree<SubModel *> *pMainTree, const G3D::Vector3& pBasePos, std::string& pPosFilename, std::string& pModelFilename); void getModelPosition(std::string& pPosString, ModelPosition& pModelPosition); bool readRawFile(std::string& pModelFilename, ModelPosition& pModelPosition, G3D::AABSPTree<SubModel *> *pMainTree); |