diff options
Diffstat (limited to 'src/tile-defs.hpp')
| -rw-r--r-- | src/tile-defs.hpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/tile-defs.hpp b/src/tile-defs.hpp index b260fe8a..072935a8 100644 --- a/src/tile-defs.hpp +++ b/src/tile-defs.hpp @@ -5,17 +5,16 @@ namespace floormat { constexpr inline unsigned char TILE_MAX_DIM = 16; -constexpr inline size_t TILE_COUNT = TILE_MAX_DIM*TILE_MAX_DIM; +constexpr inline size_t TILE_COUNT = size_t{TILE_MAX_DIM}*size_t{TILE_MAX_DIM}; -constexpr inline auto TILE_MAX_DIM20d = Magnum::Math::Vector3<double> { TILE_MAX_DIM, TILE_MAX_DIM, 0 }; -constexpr inline auto iTILE_SIZE = Magnum::Math::Vector3<Int> { 64, 64, 64 }; -constexpr inline auto iTILE_SIZE2 = Magnum::Math::Vector2<Int> { iTILE_SIZE[0], iTILE_SIZE[1] }; -constexpr inline auto sTILE_SIZE2 = Magnum::Math::Vector2<Short> { (Short)iTILE_SIZE[0], (Short)iTILE_SIZE[1] }; -constexpr inline auto usTILE_SIZE2 = Magnum::Math::Vector2<UnsignedShort> { (UnsignedShort)iTILE_SIZE[0], (UnsignedShort)iTILE_SIZE[1] }; -constexpr inline auto TILE_SIZE = Magnum::Math::Vector3<float> { iTILE_SIZE }; -constexpr inline auto dTILE_SIZE = Magnum::Math::Vector3<double> { iTILE_SIZE }; -constexpr inline auto TILE_SIZE2 = Magnum::Math::Vector2<float> { iTILE_SIZE2 }; -constexpr inline auto dTILE_SIZE2 = Magnum::Math::Vector2<double> { TILE_SIZE2 }; -constexpr inline auto TILE_SIZE20 = Magnum::Math::Vector3<float> { (float)iTILE_SIZE[0], (float)iTILE_SIZE[1], 0 }; +constexpr inline auto TILE_MAX_DIM20d = Magnum::Math::Vector3<double> { TILE_MAX_DIM, TILE_MAX_DIM, 0 }; +constexpr inline auto iTILE_SIZE = Magnum::Math::Vector3<Int> { 64, 64, 64 }; +constexpr inline auto uiTILE_SIZE = Magnum::Math::Vector3<UnsignedInt> { iTILE_SIZE }; +constexpr inline auto bTILE_SIZE = Magnum::Math::Vector3<Byte> { iTILE_SIZE }; +constexpr inline auto iTILE_SIZE2 = Magnum::Math::Vector2<Int> { iTILE_SIZE[0], iTILE_SIZE[1] }; +constexpr inline auto TILE_SIZE = Magnum::Math::Vector3<float> { iTILE_SIZE }; +constexpr inline auto dTILE_SIZE = Magnum::Math::Vector3<double> { iTILE_SIZE }; +constexpr inline auto TILE_SIZE2 = Magnum::Math::Vector2<float> { iTILE_SIZE2 }; +constexpr inline auto TILE_SIZE20 = Magnum::Math::Vector3<float> { (float)iTILE_SIZE[0], (float)iTILE_SIZE[1], 0 }; } // namespace floormat |