diff options
Diffstat (limited to 'src/wall-atlas.hpp')
| -rw-r--r-- | src/wall-atlas.hpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/wall-atlas.hpp b/src/wall-atlas.hpp index f3b659a4..1a30adbe 100644 --- a/src/wall-atlas.hpp +++ b/src/wall-atlas.hpp @@ -2,6 +2,7 @@ #include "compat/defs.hpp" #include "src/rotation.hpp" #include "src/pass-mode.hpp" +#include "wall-defs.hpp" #include <array> #include <bitset> #include <vector> @@ -27,7 +28,7 @@ struct Group Vector2ui pixel_size; Color4 tint_mult{1,1,1,1}; Color3 tint_add; - uint8_t from_rotation = (uint8_t)-1; // applies only to images + uint8_t from_rotation = (uint8_t)-1; // applies only to images; todo remove it? bool mirrored : 1 = false, default_tint : 1 = true, is_defined : 1 = false; @@ -37,10 +38,6 @@ struct Group bool operator==(const Group&) const noexcept; }; -enum class Group_ : uint8_t { wall, overlay, side, top, corner_L, corner_R, COUNT }; - -enum class Direction_ : uint8_t { N, E, S, W, COUNT }; - struct Direction { using memfn_ptr = Group Direction::*; @@ -87,9 +84,6 @@ struct DirArrayIndex { namespace floormat { -constexpr inline auto Direction_COUNT = (size_t)Wall::Direction_::COUNT; -constexpr inline auto Group_COUNT = (size_t)Wall::Group_::COUNT; - struct wall_atlas_def final { bool operator==(const wall_atlas_def&) const noexcept; |