nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-30 09:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Tools): restyle tools with astyle (#3705)

Browse Source
This commit is contained in:
Kargatum
2020-11-18 09:49:56 +07:00
committed by GitHub
parent 4457e85079
commit 85927685f2
30 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/mesh_extractor/DoodadHandler.cpp
View File

@@ -104,7 +104,7 @@ void DoodadHandler::InsertModelGeometry(const DoodadDefinition& def, Model* mode
for (std::vector<Vector3>::iterator itr = model->Vertices.begin(); itr != model->Vertices.end(); ++itr)
Vertices.push_back(Utils::TransformDoodadVertex(def, *itr)); // Vertices have to be converted based on the information from the DoodadDefinition struct
for (std::vector<Triangle<uint16> >::iterator itr = model->Triangles.begin(); itr != model->Triangles.end(); ++itr)
for (std::vector<Triangle<uint16>>::iterator itr = model->Triangles.begin(); itr != model->Triangles.end(); ++itr)
Triangles.push_back(Triangle<uint32>(Constants::TRIANGLE_TYPE_DOODAD, itr->V0 + vertOffset, itr->V1 + vertOffset, itr->V2 + vertOffset));
}

2
src/tools/mesh_extractor/DoodadHandler.h
View File

@@ -50,7 +50,7 @@ public:
~DoodadHandler();
std::vector<Vector3> Vertices;
std::vector<Triangle<uint32> > Triangles;
std::vector<Triangle<uint32>> Triangles;
bool IsSane() { return _definitions && _paths; }

8
src/tools/mesh_extractor/Geometry.cpp
View File

@@ -70,13 +70,13 @@ void Geometry::CalculateMinMaxHeight( float& min, float& max )
}
}
void Geometry::AddData( std::vector<Vector3>& verts, std::vector<Triangle<uint32> >& tris )
void Geometry::AddData( std::vector<Vector3>& verts, std::vector<Triangle<uint32>>& tris )
{
uint32 vertOffset = Vertices.size();
for (std::vector<Vector3>::iterator itr = verts.begin(); itr != verts.end(); ++itr)
Vertices.push_back(Transform ? Utils::ToRecast(*itr) : *itr);
for (std::vector<Triangle<uint32> >::iterator itr = tris.begin(); itr != tris.end(); ++itr)
for (std::vector<Triangle<uint32>>::iterator itr = tris.begin(); itr != tris.end(); ++itr)
Triangles.push_back(Triangle<uint32>(itr->Type, itr->V0 + vertOffset, itr->V1 + vertOffset, itr->V2 + vertOffset));
}
@@ -119,9 +119,9 @@ void Geometry::AddAdt( ADT* adt )
{
for (std::vector<MapChunk*>::iterator itr = adt->MapChunks.begin(); itr != adt->MapChunks.end(); ++itr)
{
std::vector<Triangle<uint32> > tmp;
std::vector<Triangle<uint32>> tmp;
tmp.reserve((*itr)->Triangles.size());
for (std::vector<Triangle<uint8> >::iterator itr2 = (*itr)->Triangles.begin(); itr2 != (*itr)->Triangles.end(); ++itr2)
for (std::vector<Triangle<uint8>>::iterator itr2 = (*itr)->Triangles.begin(); itr2 != (*itr)->Triangles.end(); ++itr2)
tmp.push_back(Triangle<uint32>(itr2->Type, itr2->V0, itr2->V1, itr2->V2));
AddData((*itr)->Vertices, tmp);
}

4
src/tools/mesh_extractor/Geometry.h
View File

@@ -18,12 +18,12 @@ public:
void CalculateBoundingBox(float*& min, float*& max);
void CalculateMinMaxHeight(float& min, float& max);
void AddData(std::vector<Vector3>& verts, std::vector<Triangle<uint32> >& tris);
void AddData(std::vector<Vector3>& verts, std::vector<Triangle<uint32>>& tris);
void AddAdt(ADT* adt);
void GetRawData(float*& verts, int*& tris, uint8*& areas);
std::vector<Vector3> Vertices;
std::vector<Triangle<uint32> > Triangles;
std::vector<Triangle<uint32>> Triangles;
bool Transform;
};
#endif

2
src/tools/mesh_extractor/LiquidHandler.h
View File

@@ -19,7 +19,7 @@ public:
ADT* Source;
std::vector<Vector3> Vertices;
std::vector<Triangle<uint32> > Triangles;
std::vector<Triangle<uint32>> Triangles;
std::vector<MCNKLiquidData> MCNKData;
private:
void HandleNewLiquid();

2
src/tools/mesh_extractor/MPQ.cpp
View File

@@ -53,7 +53,7 @@ MPQFile::MPQFile(const char* filename):
mpq_archive* mpq_a = (*i)->mpq_a;
uint32_t filenum;
if(libmpq__file_number(mpq_a, filename, &filenum))
if (libmpq__file_number(mpq_a, filename, &filenum))
continue;
libmpq__off_t transferred;
libmpq__file_unpacked_size(mpq_a, filenum, &size);

2
src/tools/mesh_extractor/MPQ.h
View File

@@ -30,7 +30,7 @@ public:
void GetFileListTo(std::vector<std::string>& filelist)
{
uint32_t filenum;
if(libmpq__file_number(mpq_a, "(listfile)", &filenum)) return;
if (libmpq__file_number(mpq_a, "(listfile)", &filenum)) return;
libmpq__off_t size, transferred;
libmpq__file_unpacked_size(mpq_a, filenum, &size);

2
src/tools/mesh_extractor/MPQManager.cpp
View File

@@ -91,7 +91,7 @@ FILE* MPQManager::GetFileFrom(const std::string& path, MPQArchive* file )
mpq_archive* mpq_a = file->mpq_a;
uint32_t filenum;
if(libmpq__file_number(mpq_a, path.c_str(), &filenum))
if (libmpq__file_number(mpq_a, path.c_str(), &filenum))
return nullptr;
libmpq__off_t transferred;

2
src/tools/mesh_extractor/MapChunk.h
View File

@@ -24,7 +24,7 @@ public:
Chunk* Source;
MapChunkHeader Header;
std::vector<Vector3> Vertices;
std::vector<Triangle<uint8> > Triangles;
std::vector<Triangle<uint8>> Triangles;
int32 Index;
};
#endif

4
src/tools/mesh_extractor/MeshExtractor.cpp
View File

@@ -157,7 +157,7 @@ void ExtractGameobjectModels()
if (numTris > 0)
{
uint32 i = 0;
for (std::vector<Triangle<uint16> >::iterator itr2 = model.Triangles.begin(); itr2 != model.Triangles.end(); ++itr2, ++i)
for (std::vector<Triangle<uint16>>::iterator itr2 = model.Triangles.begin(); itr2 != model.Triangles.end(); ++itr2, ++i)
{
indices[i * 3 + 0] = itr2->V0;
indices[i * 3 + 1] = itr2->V1;
@@ -229,7 +229,7 @@ void ExtractGameobjectModels()
uint32 mobaBatch = itr2->MOBALength / 12;
uint32* MobaEx = new uint32[mobaBatch * 4];
for(uint32 i = 8; i < itr2->MOBALength; i += 12)
for (uint32 i = 8; i < itr2->MOBALength; i += 12)
MobaEx[k++] = itr2->MOBA[i];
int mobaSizeGrp = mobaBatch * 4 + 4;

2
src/tools/mesh_extractor/Model.h
View File

@@ -21,7 +21,7 @@ public:
ModelHeader Header;
std::vector<Vector3> Vertices;
std::vector<Vector3> Normals;
std::vector<Triangle<uint16> > Triangles;
std::vector<Triangle<uint16>> Triangles;
bool IsCollidable;
FILE* Stream;
bool IsBad;

6
src/tools/mesh_extractor/Utils.cpp
View File

@@ -165,7 +165,7 @@ float Utils::Distance( float x, float y )
std::string Utils::Replace( std::string str, const std::string& oldStr, const std::string& newStr )
{
size_t pos = 0;
while((pos = str.find(oldStr, pos)) != std::string::npos)
while ((pos = str.find(oldStr, pos)) != std::string::npos)
{
str.replace(pos, oldStr.length(), newStr);
pos += newStr.length();
@@ -223,7 +223,7 @@ std::string Utils::GetExtension( std::string path )
std::string::size_type idx = path.rfind('.');
std::string extension = "";
if(idx != std::string::npos)
if (idx != std::string::npos)
extension = path.substr(idx + 1);
return extension;
}
@@ -525,7 +525,7 @@ char* Utils::GetPlainName(const char* FileName)
{
char* temp;
if((temp = (char*)strrchr(FileName, '\\')) != nullptr)
if ((temp = (char*)strrchr(FileName, '\\')) != nullptr)
FileName = temp + 1;
return (char*)FileName;
}

2
src/tools/mesh_extractor/WorldModelGroup.h
View File

@@ -21,7 +21,7 @@ public:
std::vector<uint8> TriangleFlags;
std::vector<uint8> TriangleMaterials;
std::vector<Triangle<uint16> > Triangles;
std::vector<Triangle<uint16>> Triangles;
std::vector<Vector3> Vertices;
std::vector<Vector3> Normals;
// @ToDo: Research.

4
src/tools/mesh_extractor/WorldModelHandler.cpp
View File

@@ -85,7 +85,7 @@ void WorldModelHandler::ProcessInternal( MapChunk* mcnk )
fseek(stream, mcnk->Source->Offset, SEEK_SET);
}
void WorldModelHandler::InsertModelGeometry( std::vector<Vector3>& verts, std::vector<Triangle<uint32> >& tris, const WorldModelDefinition& def, WorldModelRoot* root, bool translate )
void WorldModelHandler::InsertModelGeometry( std::vector<Vector3>& verts, std::vector<Triangle<uint32>>& tris, const WorldModelDefinition& def, WorldModelRoot* root, bool translate )
{
for (std::vector<WorldModelGroup>::iterator group = root->Groups.begin(); group != root->Groups.end(); ++group)
{
@@ -136,7 +136,7 @@ void WorldModelHandler::InsertModelGeometry( std::vector<Vector3>& verts, std::v
Vector3 v = Utils::TransformDoodadVertex(def, Utils::TransformWmoDoodad(*instance, def, *itr2, false), translate);
verts.push_back(translate ? v : Utils::ToRecast(v));
}
for (std::vector<Triangle<uint16> >::iterator itr2 = model->Triangles.begin(); itr2 != model->Triangles.end(); ++itr2)
for (std::vector<Triangle<uint16>>::iterator itr2 = model->Triangles.begin(); itr2 != model->Triangles.end(); ++itr2)
tris.push_back(Triangle<uint32>(Constants::TRIANGLE_TYPE_WMO, itr2->V0 + vertOffset, itr2->V1 + vertOffset, itr2->V2 + vertOffset));
}

4
src/tools/mesh_extractor/WorldModelHandler.h
View File

@@ -38,9 +38,9 @@ public:
~WorldModelHandler();
std::vector<Vector3> Vertices;
std::vector<Triangle<uint32> > Triangles;
std::vector<Triangle<uint32>> Triangles;
bool IsSane() { return _definitions && _paths; }
static void InsertModelGeometry(std::vector<Vector3>& verts, std::vector<Triangle<uint32> >& tris, const WorldModelDefinition& def, WorldModelRoot* root, bool translate = true);
static void InsertModelGeometry(std::vector<Vector3>& verts, std::vector<Triangle<uint32>>& tris, const WorldModelDefinition& def, WorldModelRoot* root, bool translate = true);
protected:
void ProcessInternal(MapChunk* data);
private: