mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Standardize Coords and TileCoords objects

This commit is contained in:
Tulio Leao 2019-12-20 08:29:42 -03:00
parent 3be7d824ac
commit 780e3265d1
2 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2/actions/SetCheatAction.hpp
View File

@ -26,6 +26,7 @@
#include "../world/Banner.h"
#include "../world/Climate.h"
#include "../world/Footpath.h"
#include "../world/Location.hpp"
#include "../world/Map.h"
#include "../world/Park.h"
#include "../world/Scenery.h"

68
src/openrct2/world/Location.hpp
View File

@ -149,27 +149,38 @@ struct CoordsXY
{
return { floor2(x, 32), floor2(y, 32) };
}
bool isNull() const
{
return x == COORDS_NULL;
};
};
struct TileCoordsXY
{
int32_t x = 0;
int32_t y = 0;
TileCoordsXY() = default;
constexpr TileCoordsXY(int32_t x_, int32_t y_)
: x(x_)
, y(y_)
{
}
explicit TileCoordsXY(CoordsXY c)
: x(c.x / 32)
, y(c.y / 32)
{
}
TileCoordsXY& operator+=(const TileCoordsXY rhs)
{
x += rhs.x;
y += rhs.y;
return *this;
}
TileCoordsXY& operator-=(const TileCoordsXY rhs)
{
x -= rhs.x;
@ -209,7 +220,10 @@ struct TileCoordsXY
return rotatedCoords;
}
int32_t x = 0, y = 0;
bool isNull() const
{
return x == COORDS_NULL;
};
};
struct CoordsXYZ : public CoordsXY
@ -250,27 +264,29 @@ struct CoordsXYZ : public CoordsXY
}
};
struct TileCoordsXYZ
struct TileCoordsXYZ : public TileCoordsXY
{
int32_t z = 0;
TileCoordsXYZ() = default;
TileCoordsXYZ(int32_t x_, int32_t y_, int32_t z_)
: x(x_)
, y(y_)
constexpr TileCoordsXYZ(int32_t x_, int32_t y_, int32_t z_)
: TileCoordsXY(x_, y_)
, z(z_)
{
}
explicit TileCoordsXYZ(CoordsXY c, int32_t z_)
: x(c.x / 32)
, y(c.y / 32)
TileCoordsXYZ(CoordsXY c, int32_t z_)
: TileCoordsXY(c)
, z(z_)
{
}
explicit TileCoordsXYZ(CoordsXYZ c)
: x(c.x / 32)
, y(c.y / 32)
: TileCoordsXY(c)
, z(c.z / 8)
{
}
TileCoordsXYZ& operator+=(const TileCoordsXY rhs)
{
x += rhs.x;
@ -284,10 +300,12 @@ struct TileCoordsXYZ
y -= rhs.y;
return *this;
}
bool operator==(const TileCoordsXYZ& other) const
{
return x == other.x && y == other.y && z == other.z;
}
bool operator!=(const TileCoordsXYZ& other) const
{
return !(*this == other);
@ -297,8 +315,6 @@ struct TileCoordsXYZ
{
return { x * 32, y * 32, z * 8 };
}
int32_t x = 0, y = 0, z = 0;
};
/**
@ -384,22 +400,30 @@ struct CoordsXYZD : public CoordsXYZ
{
return !(*this == other);
}
bool isNull() const
{
return x == COORDS_NULL;
};
};
struct TileCoordsXYZD
struct TileCoordsXYZD : public TileCoordsXYZ
{
int32_t x, y, z;
Direction direction;
bool isNull() const
TileCoordsXYZD() = default;
constexpr TileCoordsXYZD(int32_t x_, int32_t y_, int32_t z_, Direction d_)
: TileCoordsXYZ(x_, y_, z_)
, direction(d_)
{
return x == COORDS_NULL;
};
}
TileCoordsXYZD(CoordsXY c_, int32_t z_, Direction d_)
: TileCoordsXYZ(c_, z_)
, direction(d_)
{
}
TileCoordsXYZD(CoordsXYZ c_, Direction d_)
: TileCoordsXYZ(c_)
, direction(d_)
{
}
CoordsXYZD ToCoordsXYZD() const
{