From d440fc5e6c82312bc07da211ac9489b756307c9d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 24 Feb 2024 05:21:28 +0100 Subject: clean up more bbox usages --- editor/tests/region-test.cpp | 5 +++-- src/astar.hpp | 1 - src/dijkstra.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/editor/tests/region-test.cpp b/editor/tests/region-test.cpp index b7aca098..6c0fea07 100644 --- a/editor/tests/region-test.cpp +++ b/editor/tests/region-test.cpp @@ -1,8 +1,9 @@ #include "../tests-private.hpp" #include "src/tile-constants.hpp" #include "src/chunk.hpp" -#include "src/path-search.hpp" +#include "src/path-search-bbox.hpp" #include "src/object.hpp" +#include "src/world.hpp" #include "../app.hpp" #include "../imgui-raii.hpp" #include "floormat/main.hpp" @@ -20,7 +21,7 @@ namespace { using namespace floormat::imgui; using detail_astar::div_factor; using detail_astar::div_size; -template using bbox = typename path_search::bbox; +using detail_astar::bbox; static_assert((iTILE_SIZE2 % div_size).isZero()); constexpr auto div_count = iTILE_SIZE2 * TILE_MAX_DIM / div_size; diff --git a/src/astar.hpp b/src/astar.hpp index 78e5b070..bc2ecd6f 100644 --- a/src/astar.hpp +++ b/src/astar.hpp @@ -47,7 +47,6 @@ public: }; using pred = path_search::pred; - template using bbox = path_search::bbox; fm_DECLARE_DELETED_COPY_ASSIGNMENT(astar); diff --git a/src/dijkstra.cpp b/src/dijkstra.cpp index 4ec71248..11c85d01 100644 --- a/src/dijkstra.cpp +++ b/src/dijkstra.cpp @@ -15,8 +15,8 @@ namespace floormat { -template using bbox = path_search::bbox; using visited = astar::visited; +using detail_astar::bbox; using detail_astar::div_size; using detail_astar::div_factor; using detail_astar::min_size; -- cgit v1.2.3