diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2024-01-11 13:54:53 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2024-01-11 14:11:47 +0100 |
| commit | 7867213a01fcabb1f05b1836c2ca59dc3bb2132f (patch) | |
| tree | 44af754bed0278c8bf3435df6278bd291c3043e5 /test | |
| parent | 74cf06b6b217eff32a547cf73f051f27e6b80919 (diff) | |
rename tile_atlas -> ground_atlas
Diffstat (limited to 'test')
| -rw-r--r-- | test/json.cpp | 12 | ||||
| -rw-r--r-- | test/loader.cpp | 8 | ||||
| -rw-r--r-- | test/serializer.cpp | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/test/json.cpp b/test/json.cpp index b0ab9f0f..3d7a5f0f 100644 --- a/test/json.cpp +++ b/test/json.cpp @@ -1,10 +1,10 @@ #include "app.hpp" #include "serialize/tile.hpp" -#include "serialize/tile-atlas.hpp" +#include "serialize/ground-atlas.hpp" #include "serialize/magnum-vector.hpp" #include "serialize/json-helper.hpp" #include "compat/assert.hpp" -#include "src/tile-atlas.hpp" +#include "src/ground-atlas.hpp" #include "src/tile.hpp" #include "src/tile-iterator.hpp" #include "src/chunk.hpp" @@ -18,9 +18,9 @@ namespace floormat { #if 0 static chunk make_test_chunk() { - auto metal1 = loader.tile_atlas("metal1", {2, 2}, pass_mode::pass), - metal2 = loader.tile_atlas("metal2", {2, 2}, pass_mode::blocked), - tiles = loader.tile_atlas("tiles", {8, 5}, pass_mode::pass); + auto metal1 = loader.ground_atlas("metal1", {2, 2}, pass_mode::pass), + metal2 = loader.ground_atlas("metal2", {2, 2}, pass_mode::blocked), + tiles = loader.ground_atlas("tiles", {8, 5}, pass_mode::pass); constexpr auto N = TILE_MAX_DIM; world w; chunk c{w, {}}; @@ -41,7 +41,7 @@ void test_app::test_json() // NOLINT(readability-convert-member-functions-to-sta fm_assert(Path::exists(Path::join(loader.TEMP_PATH, "CMakeCache.txt"))); const auto output_dir = Path::join(loader.TEMP_PATH, "test/."_s); { - auto atlas = loader.tile_atlas("metal1", {2, 2}, pass_mode::pass); + auto atlas = loader.ground_atlas("metal1", { 2, 2 }, pass_mode::pass); json_helper::to_json(atlas, Path::join(output_dir, "atlas.json")); } { diff --git a/test/loader.cpp b/test/loader.cpp index b45d4f0e..88fa2b32 100644 --- a/test/loader.cpp +++ b/test/loader.cpp @@ -1,16 +1,16 @@ #include "app.hpp" #include "compat/assert.hpp" #include "loader/loader.hpp" -#include "src/tile-atlas.hpp" +#include "src/ground-atlas.hpp" #include "loader/wall-info.hpp" namespace floormat { void test_app::test_loader() { - (void)loader.tile_atlases("floor.json"); - fm_assert(loader.tile_atlas("texel")->pass_mode() == pass_mode::blocked); - fm_assert(loader.tile_atlas("metal1")->pass_mode() == pass_mode::pass); + (void)loader.ground_atlases("floor.json"); + fm_assert(loader.ground_atlas("texel")->pass_mode() == pass_mode::blocked); + fm_assert(loader.ground_atlas("metal1")->pass_mode() == pass_mode::pass); loader.sceneries(); for (StringView name : loader.anim_atlas_list()) loader.anim_atlas(name); diff --git a/test/serializer.cpp b/test/serializer.cpp index bf31e7f5..c768023e 100644 --- a/test/serializer.cpp +++ b/test/serializer.cpp @@ -4,7 +4,7 @@ #include "src/scenery.hpp" #include "src/critter.hpp" #include "src/light.hpp" -#include "src/tile-atlas.hpp" +#include "src/ground-atlas.hpp" #include "src/anim-atlas.hpp" #include "src/tile-iterator.hpp" #include <Corrade/Utility/Path.h> @@ -18,7 +18,7 @@ chunk& test_app::make_test_chunk(world& w, chunk_coords_ ch) chunk& c = w[ch]; c.mark_modified(); auto metal2 = loader.wall_atlas("empty", false); - auto tiles = loader.tile_atlas("tiles", {8, 5}, pass_mode::pass); + auto tiles = loader.ground_atlas("tiles", { 8, 5 }, pass_mode::pass); constexpr auto N = TILE_MAX_DIM; for (auto [x, k, pt] : c) x.ground() = { tiles, variant_t(k % tiles->num_tiles()) }; |
