summaryrefslogtreecommitdiffhomepage
path: root/src/wall-atlas.hpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-01-16 11:20:21 +0100
committerStanislaw Halik <sthalik@misaki.pl>2024-01-16 11:20:21 +0100
commitba069ff6c82f427d910a94c3f5e3dc06306c1ecc (patch)
treed7ace6944e73ffa0b36f84100abdce626b623c17 /src/wall-atlas.hpp
parent30d4c8e5c26aa89a64998ef1da350d4d80359237 (diff)
c
Diffstat (limited to 'src/wall-atlas.hpp')
-rw-r--r--src/wall-atlas.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wall-atlas.hpp b/src/wall-atlas.hpp
index 82301187..14e2ce55 100644
--- a/src/wall-atlas.hpp
+++ b/src/wall-atlas.hpp
@@ -5,7 +5,7 @@
#include "wall-defs.hpp"
#include <array>
#include <bitset>
-#include <vector>
+#include <Corrade/Containers/Array.h>
#include <Corrade/Containers/String.h>
#include <Magnum/Math/Vector2.h>
#include <Magnum/Math/Color.h>
@@ -85,7 +85,7 @@ struct DirArrayIndex {
bool operator==(const DirArrayIndex&) const noexcept;
};
-void resolve_wall_rotations(std::vector<Wall::Direction>& dirs, const std::array<DirArrayIndex, Direction_COUNT>& map) noexcept(false);
+void resolve_wall_rotations(Array<Wall::Direction>& dirs, const std::array<DirArrayIndex, Direction_COUNT>& map) noexcept(false);
} // namespace floormat::Wall
@@ -96,8 +96,8 @@ struct wall_atlas_def final
bool operator==(const wall_atlas_def&) const noexcept;
Wall::Info header;
- std::vector<Wall::Frame> frames;
- std::vector<Wall::Direction> direction_array;
+ Array<Wall::Frame> frames;
+ Array<Wall::Direction> direction_array;
std::array<Wall::DirArrayIndex, Wall::Direction_COUNT> direction_map;
std::bitset<Wall::Direction_COUNT> direction_mask{0};
@@ -118,8 +118,8 @@ class wall_atlas final
using Group_ = Wall::Group_;
using DirArrayIndex = Wall::DirArrayIndex;
- std::vector<Direction> _dir_array;
- std::vector<Frame> _frame_array;
+ Array<Direction> _dir_array;
+ Array<Frame> _frame_array;
Info _info;
String _path;
Vector2ui _image_size;