aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/map_extractor/System.cpp38
-rw-r--r--src/tools/mmaps_generator/IntermediateValues.cpp10
-rw-r--r--src/tools/mmaps_generator/IntermediateValues.h10
-rw-r--r--src/tools/mmaps_generator/MapBuilder.cpp2
-rw-r--r--src/tools/mmaps_generator/MapBuilder.h4
-rw-r--r--src/tools/mmaps_generator/PathCommon.h4
-rw-r--r--src/tools/mmaps_generator/PathGenerator.cpp2
-rw-r--r--src/tools/mmaps_generator/TerrainBuilder.cpp8
-rw-r--r--src/tools/mmaps_generator/TerrainBuilder.h8
-rw-r--r--src/tools/vmap4_assembler/TileAssembler.cpp4
-rw-r--r--src/tools/vmap4_extractor/model.cpp14
-rw-r--r--src/tools/vmap4_extractor/vec3d.h92
-rw-r--r--src/tools/vmap4_extractor/vmapexport.cpp8
-rw-r--r--src/tools/vmap4_extractor/wmo.cpp2
-rw-r--r--src/tools/vmap4_extractor/wmo.h2
15 files changed, 104 insertions, 104 deletions
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index 37372b18d20..2378e1d72c2 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -187,7 +187,7 @@ void HandleArgs(int argc, char* arg[])
break;
case 'f':
if (c + 1 < argc) // all ok
- CONF_allow_float_to_int = atoi(arg[c++ + 1])!=0;
+ CONF_allow_float_to_int = atoi(arg[c++ + 1]) != 0;
else
Usage(arg[0]);
break;
@@ -853,12 +853,12 @@ bool ConvertADT(ChunkedFile& adt, std::string const& mapName, std::string const&
float diff = maxHeight - minHeight;
if (diff < CONF_float_to_int8_limit) // As uint8 (max accuracy = CONF_float_to_int8_limit/256)
{
- heightHeader.flags|=MAP_HEIGHT_AS_INT8;
+ heightHeader.flags |= MAP_HEIGHT_AS_INT8;
step = selectUInt8StepStore(diff);
}
- else if (diff<CONF_float_to_int16_limit) // As uint16 (max accuracy = CONF_float_to_int16_limit/65536)
+ else if (diff < CONF_float_to_int16_limit) // As uint16 (max accuracy = CONF_float_to_int16_limit/65536)
{
- heightHeader.flags|=MAP_HEIGHT_AS_INT16;
+ heightHeader.flags |= MAP_HEIGHT_AS_INT16;
step = selectUInt16StepStore(diff);
}
}
@@ -996,30 +996,30 @@ bool ConvertADT(ChunkedFile& adt, std::string const& mapName, std::string const&
return false;
}
- outFile.write(reinterpret_cast<const char*>(&map), sizeof(map));
+ outFile.write(reinterpret_cast<char const*>(&map), sizeof(map));
// Store area data
- outFile.write(reinterpret_cast<const char*>(&areaHeader), sizeof(areaHeader));
+ outFile.write(reinterpret_cast<char const*>(&areaHeader), sizeof(areaHeader));
if (!(areaHeader.flags & MAP_AREA_NO_AREA))
- outFile.write(reinterpret_cast<const char*>(area_ids), sizeof(area_ids));
+ outFile.write(reinterpret_cast<char const*>(area_ids), sizeof(area_ids));
// Store height data
- outFile.write(reinterpret_cast<const char*>(&heightHeader), sizeof(heightHeader));
+ outFile.write(reinterpret_cast<char const*>(&heightHeader), sizeof(heightHeader));
if (!(heightHeader.flags & MAP_HEIGHT_NO_HEIGHT))
{
if (heightHeader.flags & MAP_HEIGHT_AS_INT16)
{
- outFile.write(reinterpret_cast<const char*>(uint16_V9), sizeof(uint16_V9));
- outFile.write(reinterpret_cast<const char*>(uint16_V8), sizeof(uint16_V8));
+ outFile.write(reinterpret_cast<char const*>(uint16_V9), sizeof(uint16_V9));
+ outFile.write(reinterpret_cast<char const*>(uint16_V8), sizeof(uint16_V8));
}
else if (heightHeader.flags & MAP_HEIGHT_AS_INT8)
{
- outFile.write(reinterpret_cast<const char*>(uint8_V9), sizeof(uint8_V9));
- outFile.write(reinterpret_cast<const char*>(uint8_V8), sizeof(uint8_V8));
+ outFile.write(reinterpret_cast<char const*>(uint8_V9), sizeof(uint8_V9));
+ outFile.write(reinterpret_cast<char const*>(uint8_V8), sizeof(uint8_V8));
}
else
{
- outFile.write(reinterpret_cast<const char*>(V9), sizeof(V9));
- outFile.write(reinterpret_cast<const char*>(V8), sizeof(V8));
+ outFile.write(reinterpret_cast<char const*>(V9), sizeof(V9));
+ outFile.write(reinterpret_cast<char const*>(V8), sizeof(V8));
}
}
@@ -1032,23 +1032,23 @@ bool ConvertADT(ChunkedFile& adt, std::string const& mapName, std::string const&
// Store liquid data if need
if (map.liquidMapOffset)
{
- outFile.write(reinterpret_cast<const char*>(&liquidHeader), sizeof(liquidHeader));
+ outFile.write(reinterpret_cast<char const*>(&liquidHeader), sizeof(liquidHeader));
if (!(liquidHeader.flags & MAP_LIQUID_NO_TYPE))
{
- outFile.write(reinterpret_cast<const char*>(liquid_entry), sizeof(liquid_entry));
- outFile.write(reinterpret_cast<const char*>(liquid_flags), sizeof(liquid_flags));
+ outFile.write(reinterpret_cast<char const*>(liquid_entry), sizeof(liquid_entry));
+ outFile.write(reinterpret_cast<char const*>(liquid_flags), sizeof(liquid_flags));
}
if (!(liquidHeader.flags & MAP_LIQUID_NO_HEIGHT))
{
for (int y = 0; y < liquidHeader.height; y++)
- outFile.write(reinterpret_cast<const char*>(&liquid_height[y + liquidHeader.offsetY][liquidHeader.offsetX]), sizeof(float) * liquidHeader.width);
+ outFile.write(reinterpret_cast<char const*>(&liquid_height[y + liquidHeader.offsetY][liquidHeader.offsetX]), sizeof(float) * liquidHeader.width);
}
}
// store hole data
if (hasHoles)
- outFile.write(reinterpret_cast<const char*>(holes), map.holesSize);
+ outFile.write(reinterpret_cast<char const*>(holes), map.holesSize);
outFile.close();
diff --git a/src/tools/mmaps_generator/IntermediateValues.cpp b/src/tools/mmaps_generator/IntermediateValues.cpp
index c7bebda1953..0240ee66017 100644
--- a/src/tools/mmaps_generator/IntermediateValues.cpp
+++ b/src/tools/mmaps_generator/IntermediateValues.cpp
@@ -68,7 +68,7 @@ namespace MMAP
#undef DEBUG_WRITE
}
- void IntermediateValues::debugWrite(FILE* file, const rcHeightfield* mesh)
+ void IntermediateValues::debugWrite(FILE* file, rcHeightfield const* mesh)
{
if (!file || !mesh)
return;
@@ -106,7 +106,7 @@ namespace MMAP
}
}
- void IntermediateValues::debugWrite(FILE* file, const rcCompactHeightfield* chf)
+ void IntermediateValues::debugWrite(FILE* file, rcCompactHeightfield const* chf)
{
if (!file | !chf)
return;
@@ -145,7 +145,7 @@ namespace MMAP
fwrite(chf->areas, sizeof(unsigned char), chf->spanCount, file);
}
- void IntermediateValues::debugWrite(FILE* file, const rcContourSet* cs)
+ void IntermediateValues::debugWrite(FILE* file, rcContourSet const* cs)
{
if (!file || !cs)
return;
@@ -166,7 +166,7 @@ namespace MMAP
}
}
- void IntermediateValues::debugWrite(FILE* file, const rcPolyMesh* mesh)
+ void IntermediateValues::debugWrite(FILE* file, rcPolyMesh const* mesh)
{
if (!file || !mesh)
return;
@@ -185,7 +185,7 @@ namespace MMAP
fwrite(mesh->regs, sizeof(unsigned short), mesh->npolys, file);
}
- void IntermediateValues::debugWrite(FILE* file, const rcPolyMeshDetail* mesh)
+ void IntermediateValues::debugWrite(FILE* file, rcPolyMeshDetail const* mesh)
{
if (!file || !mesh)
return;
diff --git a/src/tools/mmaps_generator/IntermediateValues.h b/src/tools/mmaps_generator/IntermediateValues.h
index 4a8b59ba3c8..0772dfef402 100644
--- a/src/tools/mmaps_generator/IntermediateValues.h
+++ b/src/tools/mmaps_generator/IntermediateValues.h
@@ -40,11 +40,11 @@ namespace MMAP
void writeIV(uint32 mapID, uint32 tileX, uint32 tileY);
- void debugWrite(FILE* file, const rcHeightfield* mesh);
- void debugWrite(FILE* file, const rcCompactHeightfield* chf);
- void debugWrite(FILE* file, const rcContourSet* cs);
- void debugWrite(FILE* file, const rcPolyMesh* mesh);
- void debugWrite(FILE* file, const rcPolyMeshDetail* mesh);
+ void debugWrite(FILE* file, rcHeightfield const* mesh);
+ void debugWrite(FILE* file, rcCompactHeightfield const* chf);
+ void debugWrite(FILE* file, rcContourSet const* cs);
+ void debugWrite(FILE* file, rcPolyMesh const* mesh);
+ void debugWrite(FILE* file, rcPolyMeshDetail const* mesh);
void generateObjFile(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData);
};
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index 5908dc1f0a0..eef134e909d 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -32,7 +32,7 @@ namespace MMAP
{
MapBuilder::MapBuilder(float maxWalkableAngle, bool skipLiquid,
bool skipContinents, bool skipJunkMaps, bool skipBattlegrounds,
- bool debugOutput, bool bigBaseUnit, int mapid, const char* offMeshFilePath) :
+ bool debugOutput, bool bigBaseUnit, int mapid, char const* offMeshFilePath) :
m_terrainBuilder (nullptr),
m_debugOutput (debugOutput),
m_offMeshFilePath (offMeshFilePath),
diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h
index 0786ee5b9d3..a5bacdc1bc4 100644
--- a/src/tools/mmaps_generator/MapBuilder.h
+++ b/src/tools/mmaps_generator/MapBuilder.h
@@ -83,7 +83,7 @@ namespace MMAP
bool debugOutput = false,
bool bigBaseUnit = false,
int mapid = -1,
- const char* offMeshFilePath = nullptr);
+ char const* offMeshFilePath = nullptr);
~MapBuilder();
@@ -133,7 +133,7 @@ namespace MMAP
bool m_debugOutput;
- const char* m_offMeshFilePath;
+ char const* m_offMeshFilePath;
bool m_skipContinents;
bool m_skipJunkMaps;
bool m_skipBattlegrounds;
diff --git a/src/tools/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h
index 8f8f2af1d54..2a951323d22 100644
--- a/src/tools/mmaps_generator/PathCommon.h
+++ b/src/tools/mmaps_generator/PathCommon.h
@@ -30,13 +30,13 @@
#include <Windows.h>
#endif
-#ifndef WIN32
+#ifndef _WIN32
#include <cerrno>
#endif
namespace MMAP
{
- inline bool matchWildcardFilter(const char* filter, const char* str)
+ inline bool matchWildcardFilter(char const* filter, char const* str)
{
if (!filter || !str)
return false;
diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp
index 9e2a0b2a0e7..0873885d114 100644
--- a/src/tools/mmaps_generator/PathGenerator.cpp
+++ b/src/tools/mmaps_generator/PathGenerator.cpp
@@ -268,7 +268,7 @@ bool handleArgs(int argc, char** argv,
return true;
}
-int finish(const char* message, int returnValue)
+int finish(char const* message, int returnValue)
{
printf("%s", message);
getchar(); // Wait for user input
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index d13955a03ff..fda251e8402 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
@@ -679,10 +679,10 @@ namespace MMAP
// transform data
float scale = instance.iScale;
- G3D::Matrix3 rotation = G3D::Matrix3::fromEulerAnglesXYZ(G3D::pi()*instance.iRot.z/-180.f, G3D::pi()*instance.iRot.x/-180.f, G3D::pi()*instance.iRot.y/-180.f);
+ G3D::Matrix3 rotation = G3D::Matrix3::fromEulerAnglesXYZ(G3D::pi()*instance.iRot.z / -180.f, G3D::pi() * instance.iRot.x / -180.f, G3D::pi() * instance.iRot.y / -180.f);
G3D::Vector3 position = instance.iPos;
- position.x -= 32*GRID_SIZE;
- position.y -= 32*GRID_SIZE;
+ position.x -= 32 * GRID_SIZE;
+ position.y -= 32 * GRID_SIZE;
for (std::vector<GroupModel>::iterator it = groupModels.begin(); it != groupModels.end(); ++it)
{
@@ -886,7 +886,7 @@ namespace MMAP
}
/**************************************************************************/
- void TerrainBuilder::loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData, const char* offMeshFilePath)
+ void TerrainBuilder::loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData, char const* offMeshFilePath)
{
// no meshfile input given?
if (offMeshFilePath == nullptr)
diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
index d3e71b1db9f..54f48098e09 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.h
+++ b/src/tools/mmaps_generator/TerrainBuilder.h
@@ -82,9 +82,9 @@ namespace MMAP
void loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData);
bool loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData);
- void loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData, const char* offMeshFilePath);
+ void loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, char const* offMeshFilePath);
- bool usesLiquids() { return !m_skipLiquid; }
+ bool usesLiquids() const { return !m_skipLiquid; }
// vert and triangle methods
static void transform(std::vector<G3D::Vector3> &original, std::vector<G3D::Vector3> &transformed,
@@ -122,8 +122,8 @@ namespace MMAP
uint8 getLiquidType(int square, const uint8 liquid_type[16][16]);
// hide parameterless and copy constructor
- TerrainBuilder();
- TerrainBuilder(const TerrainBuilder &tb);
+ TerrainBuilder() = delete;
+ TerrainBuilder(TerrainBuilder const& tb) = delete;
};
}
diff --git a/src/tools/vmap4_assembler/TileAssembler.cpp b/src/tools/vmap4_assembler/TileAssembler.cpp
index b2ae3e8a6a2..a29cb3a516d 100644
--- a/src/tools/vmap4_assembler/TileAssembler.cpp
+++ b/src/tools/vmap4_assembler/TileAssembler.cpp
@@ -32,12 +32,12 @@ using std::pair;
template<> struct BoundsTrait<VMAP::ModelSpawn*>
{
- static void getBounds(const VMAP::ModelSpawn* const &obj, G3D::AABox& out) { out = obj->getBounds(); }
+ static void getBounds(VMAP::ModelSpawn const* const& obj, G3D::AABox& out) { out = obj->getBounds(); }
};
namespace VMAP
{
- Vector3 ModelPosition::transform(const Vector3& pIn) const
+ Vector3 ModelPosition::transform(Vector3 const& pIn) const
{
Vector3 out = pIn * iScale;
out = iRotation * out;
diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp
index fb46d7691a3..690571703b5 100644
--- a/src/tools/vmap4_extractor/model.cpp
+++ b/src/tools/vmap4_extractor/model.cpp
@@ -84,11 +84,11 @@ bool Model::open()
bool Model::ConvertToVMAPModel(const char * outfilename)
{
- int N[12] = {0,0,0,0,0,0,0,0,0,0,0,0};
- FILE* output=fopen(outfilename, "wb");
+ int N[12] = { };
+ FILE* output = fopen(outfilename, "wb");
if (!output)
{
- printf("Can't create the output file '%s'\n",outfilename);
+ printf("Can't create the output file '%s'\n", outfilename);
return false;
}
fwrite(VMAP::RAW_VMAP_MAGIC, 8, 1, output);
@@ -107,7 +107,7 @@ bool Model::ConvertToVMAPModel(const char * outfilename)
fwrite(&branches, sizeof(branches), 1, output);
uint32 nIndexes = header.nBoundingTriangles;
fwrite(&nIndexes, sizeof(uint32), 1, output);
- fwrite("INDX",4, 1, output);
+ fwrite("INDX", 4, 1, output);
wsize = sizeof(uint32) + sizeof(unsigned short) * nIndexes;
fwrite(&wsize, sizeof(int), 1, output);
fwrite(&nIndexes, sizeof(uint32), 1, output);
@@ -129,7 +129,7 @@ bool Model::ConvertToVMAPModel(const char * outfilename)
wsize = sizeof(int) + sizeof(float) * 3 * nVertices;
fwrite(&wsize, sizeof(int), 1, output);
fwrite(&nVertices, sizeof(int), 1, output);
- if (nVertices >0)
+ if (nVertices > 0)
{
for (uint32 vpos = 0; vpos < nVertices; ++vpos)
{
@@ -138,7 +138,7 @@ bool Model::ConvertToVMAPModel(const char * outfilename)
vertices[vpos].z = tmp;
}
- fwrite(vertices, sizeof(float)*3, nVertices, output);
+ fwrite(vertices, sizeof(float) * 3, nVertices, output);
}
fclose(output);
@@ -162,7 +162,7 @@ void Doodad::Extract(ADT::MDDF const& doodadDef, char const* ModelInstName, uint
fseek(input, 8, SEEK_SET); // get the correct no of vertices
int nVertices;
- int count = fread(&nVertices, sizeof (int), 1, input);
+ int count = fread(&nVertices, sizeof(int), 1, input);
fclose(input);
if (count != 1 || nVertices == 0)
diff --git a/src/tools/vmap4_extractor/vec3d.h b/src/tools/vmap4_extractor/vec3d.h
index 8bb822d9d4c..9f80c2e6acf 100644
--- a/src/tools/vmap4_extractor/vec3d.h
+++ b/src/tools/vmap4_extractor/vec3d.h
@@ -24,49 +24,49 @@
class Vec3D
{
public:
- float x,y,z;
+ float x, y, z;
- Vec3D(float x0 = 0.0f, float y0 = 0.0f, float z0 = 0.0f) : x(x0), y(y0), z(z0) {}
+ Vec3D(float x0 = 0.0f, float y0 = 0.0f, float z0 = 0.0f) : x(x0), y(y0), z(z0) { }
- Vec3D(const Vec3D& v) = default;
+ Vec3D(Vec3D const& v) = default;
- Vec3D& operator= (const Vec3D &v) = default;
+ Vec3D& operator=(Vec3D const& v) = default;
- Vec3D operator+ (const Vec3D &v) const
+ Vec3D operator+(Vec3D const& v) const
{
- Vec3D r(x+v.x,y+v.y,z+v.z);
+ Vec3D r(x + v.x, y + v.y, z + v.z);
return r;
}
- Vec3D operator- (const Vec3D &v) const
+ Vec3D operator-(Vec3D const& v) const
{
- Vec3D r(x-v.x,y-v.y,z-v.z);
+ Vec3D r(x - v.x, y - v.y, z - v.z);
return r;
}
- float operator* (const Vec3D &v) const
+ float operator*(Vec3D const& v) const
{
- return x*v.x + y*v.y + z*v.z;
+ return x * v.x + y * v.y + z * v.z;
}
- Vec3D operator* (float d) const
+ Vec3D operator*(float d) const
{
- Vec3D r(x*d,y*d,z*d);
+ Vec3D r(x * d, y * d, z * d);
return r;
}
- friend Vec3D operator* (float d, const Vec3D& v)
+ friend Vec3D operator*(float d, Vec3D const& v)
{
return v * d;
}
- Vec3D operator% (const Vec3D &v) const
+ Vec3D operator%(Vec3D const& v) const
{
- Vec3D r(y*v.z-z*v.y, z*v.x-x*v.z, x*v.y-y*v.x);
+ Vec3D r(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x);
return r;
}
- Vec3D& operator+= (const Vec3D &v)
+ Vec3D& operator+=(Vec3D const& v)
{
x += v.x;
y += v.y;
@@ -74,7 +74,7 @@ public:
return *this;
}
- Vec3D& operator-= (const Vec3D &v)
+ Vec3D& operator-=(Vec3D const& v)
{
x -= v.x;
y -= v.y;
@@ -82,7 +82,7 @@ public:
return *this;
}
- Vec3D& operator*= (float d)
+ Vec3D& operator*=(float d)
{
x *= d;
y *= d;
@@ -92,21 +92,21 @@ public:
float lengthSquared() const
{
- return x*x+y*y+z*z;
+ return x * x + y * y + z * z;
}
float length() const
{
- return std::sqrt(x*x+y*y+z*z);
+ return std::sqrt(lengthSquared());
}
Vec3D& normalize()
{
- this->operator*= (1.0f/length());
+ *this *= (1.0f / length());
return *this;
}
- Vec3D operator~ () const
+ Vec3D operator~() const
{
Vec3D r(*this);
r.normalize();
@@ -119,7 +119,7 @@ public:
return in;
}
- friend std::ostream& operator<<(std::ostream& out, const Vec3D& v)
+ friend std::ostream& operator<<(std::ostream& out, Vec3D const& v)
{
out << v.x << " " << v.y << " " << v.z;
return out;
@@ -148,57 +148,57 @@ public:
class Vec2D
{
public:
- float x,y;
+ float x, y;
- Vec2D(float x0 = 0.0f, float y0 = 0.0f) : x(x0), y(y0) {}
+ Vec2D(float x0 = 0.0f, float y0 = 0.0f) : x(x0), y(y0) { }
- Vec2D(const Vec2D& v) = default;
+ Vec2D(Vec2D const& v) = default;
- Vec2D& operator= (const Vec2D &v) = default;
+ Vec2D& operator=(Vec2D const& v) = default;
- Vec2D operator+ (const Vec2D &v) const
+ Vec2D operator+(Vec2D const& v) const
{
- Vec2D r(x+v.x,y+v.y);
+ Vec2D r(x + v.x, y + v.y);
return r;
}
- Vec2D operator- (const Vec2D &v) const
+ Vec2D operator-(Vec2D const& v) const
{
- Vec2D r(x-v.x,y-v.y);
+ Vec2D r(x - v.x, y - v.y);
return r;
}
- float operator* (const Vec2D &v) const
+ float operator*(Vec2D const& v) const
{
- return x*v.x + y*v.y;
+ return x * v.x + y * v.y;
}
- Vec2D operator* (float d) const
+ Vec2D operator*(float d) const
{
- Vec2D r(x*d,y*d);
+ Vec2D r(x * d, y * d);
return r;
}
- friend Vec2D operator* (float d, const Vec2D& v)
+ friend Vec2D operator*(float d, Vec2D const& v)
{
return v * d;
}
- Vec2D& operator+= (const Vec2D &v)
+ Vec2D& operator+=(Vec2D const& v)
{
x += v.x;
y += v.y;
return *this;
}
- Vec2D& operator-= (const Vec2D &v)
+ Vec2D& operator-=(Vec2D const& v)
{
x -= v.x;
y -= v.y;
return *this;
}
- Vec2D& operator*= (float d)
+ Vec2D& operator*=(float d)
{
x *= d;
y *= d;
@@ -207,28 +207,27 @@ public:
float lengthSquared() const
{
- return x*x+y*y;
+ return x * x + y * y;
}
float length() const
{
- return std::sqrt(x*x+y*y);
+ return std::sqrt(lengthSquared());
}
Vec2D& normalize()
{
- this->operator*= (1.0f/length());
+ *this *= (1.0f / length());
return *this;
}
- Vec2D operator~ () const
+ Vec2D operator~() const
{
Vec2D r(*this);
r.normalize();
return r;
}
-
friend std::istream& operator>>(std::istream& in, Vec2D& v)
{
in >> v.x >> v.y;
@@ -241,9 +240,10 @@ public:
}
};
-inline void rotate(float x0, float y0, float *x, float *y, float angle)
+inline void rotate(float x0, float y0, float* x, float* y, float angle)
{
- float xa = *x - x0, ya = *y - y0;
+ float xa = *x - x0;
+ float ya = *y - y0;
*x = xa*cosf(angle) - ya*sinf(angle) + x0;
*y = xa*sinf(angle) + ya*cosf(angle) + y0;
}
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index 6ad05e45f82..f633347f387 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -65,7 +65,7 @@ std::unordered_map<std::string, WMODoodadData> WmoDoodads;
// Constants
-const char* szWorkDirWmo = "./Buildings";
+char const* szWorkDirWmo = "./Buildings";
#define CASC_LOCALES_COUNT 17
char const* CascLocaleNames[CASC_LOCALES_COUNT] =
@@ -111,7 +111,7 @@ bool OpenCascStorage(int locale)
return true;
}
- catch (boost::filesystem::filesystem_error& error)
+ catch (boost::filesystem::filesystem_error const& error)
{
printf("error opening casc storage : %s\n", error.what());
return false;
@@ -145,7 +145,7 @@ uint32 GenerateUniqueObjectId(uint32 clientId, uint16 clientDoodadId)
}
// Local testing functions
-bool FileExists(const char* file)
+bool FileExists(char const* file)
{
if (FILE* n = fopen(file, "rb"))
{
@@ -426,7 +426,7 @@ int main(int argc, char ** argv)
}
}
- printf("Extract %s. Beginning work ....\n\n", versionString);
+ printf("Extract %s. Beginning work ....\n", versionString);
//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
// Create the working directory
if (mkdir(szWorkDirWmo
diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp
index 5c060c9dafd..3cffab838d7 100644
--- a/src/tools/vmap4_extractor/wmo.cpp
+++ b/src/tools/vmap4_extractor/wmo.cpp
@@ -584,7 +584,7 @@ void MapObject::Extract(ADT::MODF const& mapObjDef, char const* WmoInstName, boo
fseek(input, 8, SEEK_SET); // get the correct no of vertices
int nVertices;
- int count = fread(&nVertices, sizeof (int), 1, input);
+ int count = fread(&nVertices, sizeof(int), 1, input);
fclose(input);
if (count != 1 || nVertices == 0)
diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
index 9751b1fa2cb..a2dc39a2e81 100644
--- a/src/tools/vmap4_extractor/wmo.h
+++ b/src/tools/vmap4_extractor/wmo.h
@@ -64,7 +64,7 @@ namespace WMO
}
/* for whatever reason a certain company just can't stick to one coordinate system... */
-static inline Vec3D fixCoords(const Vec3D &v){ return Vec3D(v.z, v.x, v.y); }
+static inline Vec3D fixCoords(Vec3D const& v){ return Vec3D(v.z, v.x, v.y); }
struct WMODoodadData
{