summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-11-22 10:35:38 +0100
committerStanislaw Halik <sthalik@misaki.pl>2023-11-22 10:35:38 +0100
commitf871a548396b055a453276e85a979fa4eaed4875 (patch)
treed6217881f1b4b5c9f86001102ac32ba708fc29a6
parent3828d39a2e2cfb31282fbd59199596a8fc9f02a3 (diff)
dddd
-rw-r--r--serialize/wall-atlas.cpp10
-rw-r--r--src/wall-atlas.hpp6
2 files changed, 6 insertions, 10 deletions
diff --git a/serialize/wall-atlas.cpp b/serialize/wall-atlas.cpp
index b1a66db0..2d8dd7a4 100644
--- a/serialize/wall-atlas.cpp
+++ b/serialize/wall-atlas.cpp
@@ -63,10 +63,8 @@ wall_atlas_def wall_atlas_def::deserialize(StringView filename)
return atlas;
}
-void wall_atlas_def::serialize(StringView filename,
- const Info& header, ArrayView<const Frame> frames,
- ArrayView<const Direction> direction_array,
- std::array<DirArrayIndex, 4> direction_map)
+void wall_atlas_def::serialize(StringView filename, const Info& header, ArrayView<const Frame> frames,
+ ArrayView<const Direction> dir_array, std::array<DirArrayIndex, 4> dir_map)
{
auto jroot = json{};
@@ -74,8 +72,8 @@ void wall_atlas_def::serialize(StringView filename,
write_all_frames(jroot, frames);
for (const auto [name_, dir] : wall_atlas::directions)
- if (auto idx = direction_map[(size_t)dir])
- if (const auto& dir = direction_array[idx.val])
+ if (auto idx = dir_map[(size_t)dir])
+ if (const auto& dir = dir_array[idx.val])
{
std::string_view name = {name_.data(), name_.size()};
write_direction_metadata(jroot[name], dir);
diff --git a/src/wall-atlas.hpp b/src/wall-atlas.hpp
index 4f429d6d..da00cfe1 100644
--- a/src/wall-atlas.hpp
+++ b/src/wall-atlas.hpp
@@ -102,10 +102,8 @@ public:
static wall_atlas_def deserialize(StringView filename);
void serialize(StringView filename) const;
- static void serialize(StringView filename,
- const Info& header, ArrayView<const Frame> frames,
- ArrayView<const Direction> direction_array,
- std::array<DirArrayIndex, 4> direction_map);
+ static void serialize(StringView filename, const Info& header, ArrayView<const Frame> frames,
+ ArrayView<const Direction> dir_array, std::array<DirArrayIndex, 4> dir_map);
};
class wall_atlas final