diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2024-02-07 23:38:31 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2024-02-08 08:43:49 +0100 |
| commit | a6514d1a95d0f84f0935866215463ef6aed23e19 (patch) | |
| tree | 639075646b1ea42a3cd4a76ae59af7dda0c4b14a /test | |
| parent | 4575194adb4615deeca174044a872093c3664ad4 (diff) | |
loader: work toward removing duplicate atlas code
Diffstat (limited to 'test')
| -rw-r--r-- | test/dijkstra.cpp | 2 | ||||
| -rw-r--r-- | test/json.cpp | 2 | ||||
| -rw-r--r-- | test/loader.cpp | 3 | ||||
| -rw-r--r-- | test/path-search.cpp | 2 | ||||
| -rw-r--r-- | test/raycast.cpp | 2 | ||||
| -rw-r--r-- | test/wall-atlas2.cpp | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/test/dijkstra.cpp b/test/dijkstra.cpp index 8a702a52..6b2eafd4 100644 --- a/test/dijkstra.cpp +++ b/test/dijkstra.cpp @@ -1,7 +1,7 @@ #include "app.hpp" #include "src/path-search.hpp" #include "loader/loader.hpp" -#include "loader/wall-info.hpp" +#include "loader/wall-cell.hpp" #include <Magnum/Math/Functions.h> namespace floormat { diff --git a/test/json.cpp b/test/json.cpp index d94489ee..aac6fdee 100644 --- a/test/json.cpp +++ b/test/json.cpp @@ -11,7 +11,7 @@ #include "src/chunk.hpp" #include "src/world.hpp" #include "loader/loader.hpp" -#include "loader/wall-info.hpp" +#include "loader/wall-cell.hpp" #include <memory> #include <Corrade/Containers/StringView.h> #include <Corrade/Utility/Path.h> diff --git a/test/loader.cpp b/test/loader.cpp index 3b04459a..c517d00a 100644 --- a/test/loader.cpp +++ b/test/loader.cpp @@ -1,7 +1,7 @@ #include "app.hpp" #include "compat/assert.hpp" #include "loader/loader.hpp" -#include "loader/wall-info.hpp" +#include "loader/wall-cell.hpp" #include "src/ground-atlas.hpp" namespace floormat { @@ -53,6 +53,7 @@ void test_app::test_loader() (void)loader.get_wall_atlas(name); for (const auto& x : loader.ground_atlas_list()) + if (x.name != loader.INVALID) // todo! (void)loader.ground_atlas(x.name); fm_assert(loader.ground_atlas("texel")->pass_mode() == pass_mode::blocked); fm_assert(loader.ground_atlas("metal1")->pass_mode() == pass_mode::pass); diff --git a/test/path-search.cpp b/test/path-search.cpp index 5a1dc825..f602a8b9 100644 --- a/test/path-search.cpp +++ b/test/path-search.cpp @@ -2,7 +2,7 @@ #include "compat/assert.hpp" #include "compat/function2.hpp" #include "loader/loader.hpp" -#include "loader/wall-info.hpp" +#include "loader/wall-cell.hpp" #include "src/world.hpp" #include "src/scenery.hpp" #include "src/path-search.hpp" diff --git a/test/raycast.cpp b/test/raycast.cpp index cb76333f..6e3880cd 100644 --- a/test/raycast.cpp +++ b/test/raycast.cpp @@ -3,7 +3,7 @@ #include "src/raycast-diag.hpp" #include "src/world.hpp" #include "loader/loader.hpp" -#include "loader/wall-info.hpp" +#include "loader/wall-cell.hpp" #include <Magnum/Math/Functions.h> namespace floormat { diff --git a/test/wall-atlas2.cpp b/test/wall-atlas2.cpp index 4e86885b..8387d656 100644 --- a/test/wall-atlas2.cpp +++ b/test/wall-atlas2.cpp @@ -3,7 +3,7 @@ #include "src/tile-constants.hpp" #include "src/wall-atlas.hpp" #include "loader/loader.hpp" -#include "loader/wall-info.hpp" +#include "loader/wall-cell.hpp" namespace floormat { |