From 616deca57a5084b52085e1cabea7eac130d812bd Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 5 Feb 2025 05:20:16 +0100 Subject: add commented-out parts to hardcoded constants This is for rendering procedural holes. --- src/chunk-walls.cpp | 2 +- src/wall-atlas.hpp | 2 +- src/wall-defs.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chunk-walls.cpp b/src/chunk-walls.cpp index 3e708ee5..7d0bd29b 100644 --- a/src/chunk-walls.cpp +++ b/src/chunk-walls.cpp @@ -414,7 +414,7 @@ GL::Mesh chunk::make_wall_mesh() { const auto coord = global_coords{_coord, local_coords{k}}; - static_assert(Wall::Group_COUNT == 4); + static_assert(Wall::Group_COUNT == /* 5 */ 4); static_assert((int)Direction_::COUNT == 2); if (auto* A_nʹ = W.atlases[k*2 + 0].get()) diff --git a/src/wall-atlas.hpp b/src/wall-atlas.hpp index 230c4e4f..20dd2a84 100644 --- a/src/wall-atlas.hpp +++ b/src/wall-atlas.hpp @@ -59,7 +59,7 @@ struct Direction { "top"_s, &Direction::top, Group_::top }, { "corner"_s, &Direction::corner, Group_::corner }, }; - static_assert(array_size(groups) == (size_t)Group_::COUNT); + static_assert(array_size(groups) + /*pillar 1 */ 0 == (size_t)Group_::COUNT); }; struct Info diff --git a/src/wall-defs.hpp b/src/wall-defs.hpp index a19d560b..9f88853c 100644 --- a/src/wall-defs.hpp +++ b/src/wall-defs.hpp @@ -3,7 +3,7 @@ namespace floormat::Wall { -enum class Group_ : uint8_t { wall, side, top, corner, COUNT }; +enum class Group_ : uint8_t { wall, side, top, corner, /*pillar,*/ COUNT }; enum class Direction_ : uint8_t { N, W, COUNT }; -- cgit v1.2.3