summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-02-24 05:21:28 +0100
committerStanislaw Halik <sthalik@misaki.pl>2024-02-24 05:21:28 +0100
commitd440fc5e6c82312bc07da211ac9489b756307c9d (patch)
tree4ec339ca7fb2dc250f859a9b40bcb7aadf389be8
parentdb09342af865ac5df7d4c35f25115ed39fbd0ddd (diff)
clean up more bbox usages
-rw-r--r--editor/tests/region-test.cpp5
-rw-r--r--src/astar.hpp1
-rw-r--r--src/dijkstra.cpp2
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<typename T> using bbox = typename path_search::bbox<T>;
+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<typename T> using bbox = path_search::bbox<T>;
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<typename T> using bbox = path_search::bbox<T>;
using visited = astar::visited;
+using detail_astar::bbox;
using detail_astar::div_size;
using detail_astar::div_factor;
using detail_astar::min_size;