diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-30 15:38:03 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-30 15:38:03 +0100 |
commit | d63e1276d602b0172f2d32abe85ec718a7bc7912 (patch) | |
tree | 2d67fc0e76880b57f20333ddf48aff283bdfa8ab /src | |
parent | 14b304d4f726aeaf5f48fdac4cd9ce8aad66c5c9 (diff) |
Tools/MeshExtractor: tabs2spaces
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/mesh_extractor/ChunkedData.cpp | 12 | ||||
-rw-r--r-- | src/tools/mesh_extractor/ChunkedData.h | 2 | ||||
-rw-r--r-- | src/tools/mesh_extractor/DoodadHandler.cpp | 4 | ||||
-rw-r--r-- | src/tools/mesh_extractor/DoodadHandler.h | 2 | ||||
-rw-r--r-- | src/tools/mesh_extractor/MeshExtractor.cpp | 2 | ||||
-rw-r--r-- | src/tools/mesh_extractor/TileBuilder.cpp | 30 | ||||
-rw-r--r-- | src/tools/mesh_extractor/TileBuilder.h | 2 | ||||
-rw-r--r-- | src/tools/mesh_extractor/WorldModelHandler.cpp | 4 | ||||
-rw-r--r-- | src/tools/mesh_extractor/WorldModelHandler.h | 2 |
9 files changed, 30 insertions, 30 deletions
diff --git a/src/tools/mesh_extractor/ChunkedData.cpp b/src/tools/mesh_extractor/ChunkedData.cpp index 4c59217ed33..725a6f45637 100644 --- a/src/tools/mesh_extractor/ChunkedData.cpp +++ b/src/tools/mesh_extractor/ChunkedData.cpp @@ -64,10 +64,10 @@ Chunk* ChunkedData::GetChunkByName( std::string name ) ChunkedData::~ChunkedData() { - for (std::vector<Chunk*>::iterator itr = Chunks.begin(); itr != Chunks.end(); ++itr) - delete *itr; - - Chunks.clear(); - if (Stream) - fclose(Stream); + for (std::vector<Chunk*>::iterator itr = Chunks.begin(); itr != Chunks.end(); ++itr) + delete *itr; + + Chunks.clear(); + if (Stream) + fclose(Stream); } diff --git a/src/tools/mesh_extractor/ChunkedData.h b/src/tools/mesh_extractor/ChunkedData.h index d36d0868859..e23648c845e 100644 --- a/src/tools/mesh_extractor/ChunkedData.h +++ b/src/tools/mesh_extractor/ChunkedData.h @@ -9,7 +9,7 @@ class ChunkedData public: ChunkedData(FILE* stream, uint32 maxLength, uint32 chunksHint = 300); ChunkedData(std::string file, uint32 chunksHint = 300); - ~ChunkedData(); + ~ChunkedData(); int GetFirstIndex(std::string name); Chunk* GetChunkByName(std::string name); diff --git a/src/tools/mesh_extractor/DoodadHandler.cpp b/src/tools/mesh_extractor/DoodadHandler.cpp index 6604aebe73a..363f07b4578 100644 --- a/src/tools/mesh_extractor/DoodadHandler.cpp +++ b/src/tools/mesh_extractor/DoodadHandler.cpp @@ -102,6 +102,6 @@ void DoodadHandler::InsertModelGeometry(const DoodadDefinition& def, Model* mode DoodadHandler::~DoodadHandler() { - delete _definitions; - delete _paths; + delete _definitions; + delete _paths; } diff --git a/src/tools/mesh_extractor/DoodadHandler.h b/src/tools/mesh_extractor/DoodadHandler.h index 2e00696f7e5..a212b032d1d 100644 --- a/src/tools/mesh_extractor/DoodadHandler.h +++ b/src/tools/mesh_extractor/DoodadHandler.h @@ -32,7 +32,7 @@ class DoodadHandler : public ObjectDataHandler { public: DoodadHandler(ADT* adt); - ~DoodadHandler(); + ~DoodadHandler(); std::vector<Vector3> Vertices; std::vector<Triangle<uint32> > Triangles; diff --git a/src/tools/mesh_extractor/MeshExtractor.cpp b/src/tools/mesh_extractor/MeshExtractor.cpp index 2884b998ac8..3dde9ac36f5 100644 --- a/src/tools/mesh_extractor/MeshExtractor.cpp +++ b/src/tools/mesh_extractor/MeshExtractor.cpp @@ -89,6 +89,6 @@ int main(int argc, char* argv[]) } ExtractAllMaps(mapIds, threads); - return 0; + return 0; } diff --git a/src/tools/mesh_extractor/TileBuilder.cpp b/src/tools/mesh_extractor/TileBuilder.cpp index 83137258710..e3694541be8 100644 --- a/src/tools/mesh_extractor/TileBuilder.cpp +++ b/src/tools/mesh_extractor/TileBuilder.cpp @@ -217,19 +217,19 @@ uint8* TileBuilder::Build() uint8* navData; printf("[%02i,%02i] Creating the navmesh!\n", X, Y); bool result = dtCreateNavMeshData(¶ms, &navData, &navDataSize); - - // Free some memory - rcFreePolyMesh(pmesh); - rcFreePolyMeshDetail(dmesh); - delete tilebMax; - delete tilebMin; - delete areas; - delete triangles; - delete vertices; - delete bbMax; - delete bbMin; - - if (result) + + // Free some memory + rcFreePolyMesh(pmesh); + rcFreePolyMeshDetail(dmesh); + delete tilebMax; + delete tilebMin; + delete areas; + delete triangles; + delete vertices; + delete bbMax; + delete bbMin; + + if (result) { printf("[%02i,%02i] NavMesh created, size %i!\n", X, Y, navDataSize); DataSize = navDataSize; @@ -241,6 +241,6 @@ uint8* TileBuilder::Build() TileBuilder::~TileBuilder() { - delete Context; - delete _Geometry; + delete Context; + delete _Geometry; } diff --git a/src/tools/mesh_extractor/TileBuilder.h b/src/tools/mesh_extractor/TileBuilder.h index e56b926e5a5..2ec45811676 100644 --- a/src/tools/mesh_extractor/TileBuilder.h +++ b/src/tools/mesh_extractor/TileBuilder.h @@ -11,7 +11,7 @@ class TileBuilder { public: TileBuilder(std::string world, int x, int y, uint32 mapId); - ~TileBuilder(); + ~TileBuilder(); void CalculateTileBounds(float*& bmin, float*& bmax); uint8* Build(); diff --git a/src/tools/mesh_extractor/WorldModelHandler.cpp b/src/tools/mesh_extractor/WorldModelHandler.cpp index edad6d1b6d8..a0977c398c4 100644 --- a/src/tools/mesh_extractor/WorldModelHandler.cpp +++ b/src/tools/mesh_extractor/WorldModelHandler.cpp @@ -193,6 +193,6 @@ void WorldModelHandler::ReadModelPaths() WorldModelHandler::~WorldModelHandler() { - delete _definitions; - delete _paths; + delete _definitions; + delete _paths; } diff --git a/src/tools/mesh_extractor/WorldModelHandler.h b/src/tools/mesh_extractor/WorldModelHandler.h index df5e3764eb5..cccedfa60fb 100644 --- a/src/tools/mesh_extractor/WorldModelHandler.h +++ b/src/tools/mesh_extractor/WorldModelHandler.h @@ -29,7 +29,7 @@ class WorldModelHandler : public ObjectDataHandler { public: WorldModelHandler(ADT* adt); - ~WorldModelHandler(); + ~WorldModelHandler(); std::vector<Vector3> Vertices; std::vector<Triangle<uint32> > Triangles; |