summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--serialize/wall-atlas.cpp4
-rw-r--r--src/wall-atlas.cpp92
-rw-r--r--src/wall-atlas.hpp8
3 files changed, 75 insertions, 29 deletions
diff --git a/serialize/wall-atlas.cpp b/serialize/wall-atlas.cpp
index 3749be64..f9e718bc 100644
--- a/serialize/wall-atlas.cpp
+++ b/serialize/wall-atlas.cpp
@@ -98,7 +98,7 @@ Direction read_direction_metadata(const json& jroot, Direction_ dir)
Direction val;
- for (auto [s_, memfn, tag] : Direction::members)
+ for (auto [s_, memfn, tag] : Direction::groups)
{
std::string_view s = s_;
if (!jdir.contains(s))
@@ -170,7 +170,7 @@ void write_group_metadata(json& jgroup, const Group& val)
void write_direction_metadata(json& jdir, const Direction& dir)
{
- for (auto [s_, memfn, tag] : Direction::members)
+ for (auto [s_, memfn, tag] : Direction::groups)
{
std::string_view s = s_;
const auto& group = dir.*memfn;
diff --git a/src/wall-atlas.cpp b/src/wall-atlas.cpp
index 402d5d66..c2f05c4f 100644
--- a/src/wall-atlas.cpp
+++ b/src/wall-atlas.cpp
@@ -1,6 +1,8 @@
#include "wall-atlas.hpp"
-#include "compat/assert.hpp"
+#include "compat/exception.hpp"
+#include "src/tile-defs.hpp"
#include <utility>
+#include <Corrade/Containers/StridedArrayView.h>
#include <Magnum/ImageView.h>
#include <Magnum/GL/TextureFormat.h>
@@ -13,7 +15,66 @@ namespace Wall {
wall_atlas::wall_atlas() noexcept = default;
wall_atlas::~wall_atlas() noexcept = default;
-wall_atlas::wall_atlas(Info info, const ImageView2D& image,
+void wall_atlas::validate(const wall_atlas& a, const ImageView2D& img) noexcept(false)
+{
+ const auto pixels = img.pixels();
+ const auto size = pixels.size();
+ const auto width = size[1], height = size[0];
+
+ fm_soft_assert(width * height > 0);
+
+ for (const auto& frame : a.raw_frame_array())
+ {
+ fm_soft_assert(frame.offset < Vector2ui{(unsigned)width, (unsigned)height});
+ // todo check frame offset + size
+ }
+
+ const auto frame_count = a.raw_frame_array().size();
+ bool got_group = false;
+
+ for (auto [_str, _group, tag] : Direction::groups)
+ {
+ const auto* dir = a.direction((size_t)tag);
+ if (!dir)
+ continue;
+ const auto* g = a.group(dir, tag);
+ if (!g)
+ continue;
+ got_group = true;
+ fm_soft_assert(g->count > 0 == g->index < (uint32_t)-1);
+ if (g->count > 0)
+ {
+ fm_soft_assert(g->index < frame_count);
+ fm_soft_assert(g->index + g->count <= frame_count);
+ }
+ }
+ fm_soft_assert(got_group);
+}
+
+Vector2i wall_atlas::expected_size(int depth, Tag group)
+{
+ static_assert(iTILE_SIZE2.x() == iTILE_SIZE2.y());
+ constexpr int half_tile = iTILE_SIZE2.x()/2;
+ CORRADE_ASSUME(group < Tag::COUNT);
+ using enum Tag;
+ switch (group)
+ {
+ case overlay:
+ case wall:
+ return { iTILE_SIZE.x(), iTILE_SIZE.z() };
+ case top:
+ case side:
+ return { depth, iTILE_SIZE.z() };
+ case corner_L:
+ return { half_tile, iTILE_SIZE.z() };
+ case corner_R:
+ return { iTILE_SIZE2.x() - half_tile, iTILE_SIZE.z() };
+ default:
+ fm_assert(false);
+ }
+}
+
+wall_atlas::wall_atlas(Info info, const ImageView2D& img,
Array<Frame> frames,
Array<Direction> directions,
std::array<DirArrayIndex, 4> direction_to_DirArrayIndex)
@@ -21,31 +82,14 @@ wall_atlas::wall_atlas(Info info, const ImageView2D& image,
_info{ std::move(info) },
_direction_to_Direction_array_index{ direction_to_DirArrayIndex }
{
- const auto frame_count = frames.size();
- for (const Direction& dir : directions)
- {
- for (auto [_str, _group, tag] : Direction::members)
- {
- const auto* g = group(dir, tag);
- if (!g)
- continue;
- fm_assert(g->count > 0 == g->index < (uint32_t)-1);
- if (g->count > 0)
- {
- fm_assert(g->index < frame_count);
- fm_assert(g->index + g->count <= frame_count);
- }
- }
- }
-
_texture.setLabel(_info.name)
.setWrapping(GL::SamplerWrapping::ClampToEdge)
.setMagnificationFilter(GL::SamplerFilter::Nearest)
.setMinificationFilter(GL::SamplerFilter::Linear)
.setMaxAnisotropy(1) // todo?
.setBorderColor(Color4{1, 0, 0, 1})
- .setStorage(1, GL::textureFormat(image.format()), image.size())
- .setSubImage(0, {}, image);
+ .setStorage(1, GL::textureFormat(img.format()), img.size())
+ .setSubImage(0, {}, img);
}
auto wall_atlas::get_Direction(Direction_ num) const -> Direction*
@@ -77,7 +121,7 @@ auto wall_atlas::group(size_t dir, Tag tag) const -> const Group*
return {};
const auto& set = *set_;
- const auto memfn = set.members[(size_t)tag].member;
+ const auto memfn = set.groups[(size_t)tag].member;
const Group& ret = set.*memfn;
if (ret.is_empty())
return {};
@@ -87,7 +131,7 @@ auto wall_atlas::group(size_t dir, Tag tag) const -> const Group*
auto wall_atlas::group(const Direction& dir, Tag tag) const -> const Group*
{
fm_assert(tag < Tag::COUNT);
- const auto memfn = dir.members[(size_t)tag].member;
+ const auto memfn = dir.groups[(size_t)tag].member;
const Group& ret = dir.*memfn;
if (ret.is_empty())
return {};
@@ -127,7 +171,7 @@ namespace floormat::Wall {
bool Direction::is_empty() const noexcept
{
- for (auto [str, member, tag] : Direction::members)
+ for (auto [str, member, tag] : Direction::groups)
if (const auto& val = this->*member; !val.is_empty())
return false;
return true;
diff --git a/src/wall-atlas.hpp b/src/wall-atlas.hpp
index 65b15183..d7ae5a46 100644
--- a/src/wall-atlas.hpp
+++ b/src/wall-atlas.hpp
@@ -50,7 +50,7 @@ struct Direction
Group wall, overlay, side, top;
Group corner_L, corner_R;
- static constexpr inline member_tuple members[] = {
+ static constexpr inline member_tuple groups[] = {
{ "wall"_s, &Direction::wall, Tag::wall },
{ "overlay"_s, &Direction::overlay, Tag::overlay },
{ "side"_s, &Direction::side, Tag::side },
@@ -58,7 +58,7 @@ struct Direction
{ "corner-L"_s, &Direction::corner_L, Tag::corner_L, },
{ "corner-R"_s, &Direction::corner_R, Tag::corner_R, },
};
- static_assert(arraySize(members) == (size_t)Tag::COUNT);
+ static_assert(arraySize(groups) == (size_t)Tag::COUNT);
bool operator==(const Direction&) const noexcept;
};
@@ -104,7 +104,7 @@ public:
fm_DECLARE_DELETED_MOVE_ASSIGNMENT(wall_atlas);
wall_atlas() noexcept;
~wall_atlas() noexcept;
- wall_atlas(Info info, const ImageView2D& image,
+ wall_atlas(Info info, const ImageView2D& img,
Array<Frame> frames, Array<Direction> directions,
std::array<DirArrayIndex, 4> direction_to_DirArrayIndex);
StringView name() const;
@@ -120,6 +120,8 @@ public:
GL::Texture2D& texture();
static size_t enum_to_index(enum rotation x);
+ static void validate(const wall_atlas& a, const ImageView2D& img) noexcept(false);
+ static Vector2i expected_size(int depth, Tag group);
struct dir_tuple
{
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-27 09:56:54 +0000