diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2024-08-28 17:35:38 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2024-09-20 16:08:46 +0200 |
| commit | 093f90ce1dfc7f5b5369357eecb239ac8db81eea (patch) | |
| tree | 1451edf10a4bdb730ba79ddd845bd20f98bfe9db | |
| parent | d34cf9c575fef03c6505939fa77ebedabfae413a (diff) | |
d
| -rw-r--r-- | src/chunk-collision.cpp | 2 | ||||
| -rw-r--r-- | src/chunk-walls.cpp | 1 | ||||
| -rw-r--r-- | src/chunk.hpp | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/chunk-collision.cpp b/src/chunk-collision.cpp index 78e11047..6b266543 100644 --- a/src/chunk-collision.cpp +++ b/src/chunk-collision.cpp @@ -101,7 +101,7 @@ start: } // namespace #if 1 -bool chunk::find_hole_in_bbox(CutResult<float>::rect& hole, Chunk_RTree& rtree, Vector2 min, Vector2 max) +bool chunk::find_hole_in_bbox(CutResult<float>::rect& hole, const Chunk_RTree& rtree, Vector2 min, Vector2 max) { bool ret = true; rtree.Search(min.data(), max.data(), [&](uint64_t data, const Chunk_RTree::Rect& r) { diff --git a/src/chunk-walls.cpp b/src/chunk-walls.cpp index 14249671..35998c63 100644 --- a/src/chunk-walls.cpp +++ b/src/chunk-walls.cpp @@ -5,7 +5,6 @@ #include "shaders/shader.hpp" #include <cr/ArrayViewStl.h> #include <cr/GrowableArray.h> -#include <cr/Pair.h> #include <cr/Optional.h> #include <algorithm> #include <ranges> diff --git a/src/chunk.hpp b/src/chunk.hpp index 335d3440..f49a9653 100644 --- a/src/chunk.hpp +++ b/src/chunk.hpp @@ -4,7 +4,6 @@ #include "local-coords.hpp" #include "src/RTree-fwd.h" #include "global-coords.hpp" -#include "wall-defs.hpp" #include "search-pred.hpp" #include "hole-cut.hpp" #include <array> @@ -98,7 +97,7 @@ public: [[nodiscard]] bool can_place_object(const object_proto& proto, local_coords pos); [[nodiscard]] bool find_hole_in_bbox(CutResult<float>::rect& hole, Vector2 min, Vector2 max); - [[nodiscard]] static bool find_hole_in_bbox(CutResult<float>::rect& hole, Chunk_RTree& rtree, Vector2 min, Vector2 max); + [[nodiscard]] static bool find_hole_in_bbox(CutResult<float>::rect& hole, const Chunk_RTree& rtree, Vector2 min, Vector2 max); void on_teardown(); bool is_teardown() const; |