casraf/redot-engine
1
0
Fork 0
mirror of https://github.com/chenasraf/redot-engine.git synced 2026-05-18 01:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add maximum traversals to astargrid2d

Browse Source
This commit is contained in:
Veradictus
2024-10-16 14:48:35 -06:00
committed by RadenTheFolf
parent e5ab9262b1
commit bfdef83fbc
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/math/a_star_grid_2d.cpp
View File

@@ -179,6 +179,14 @@ bool AStarGrid2D::is_jumping_enabled() const {
return jumping_enabled;
}
int64_t AStarGrid2D::get_max_traversals() const {
return max_traversals;
}
void AStarGrid2D::set_max_traversals(int64_t p_max_traversals) {
max_traversals = p_max_traversals;
}
void AStarGrid2D::set_diagonal_mode(DiagonalMode p_diagonal_mode) {
ERR_FAIL_INDEX((int)p_diagonal_mode, (int)DIAGONAL_MODE_MAX);
diagonal_mode = p_diagonal_mode;
@@ -461,6 +469,7 @@ bool AStarGrid2D::_solve(Point *p_begin_point, Point *p_end_point) {
}
bool found_route = false;
int64_t traversal_count = 0;
LocalVector<Point *> open_list;
SortArray<Point *, SortPoints> sorter;
@@ -485,6 +494,14 @@ bool AStarGrid2D::_solve(Point *p_begin_point, Point *p_end_point) {
break;
}
// If we have a limit on traversals, increment and stop once we reach the threshold.
if (max_traversals > 0 && traversal_count >= max_traversals) {
break;
}
// Increment traversals for each node we process.
traversal_count++;
sorter.pop_heap(0, open_list.size(), open_list.ptr()); // Remove the current point from the open list.
open_list.remove_at(open_list.size() - 1);
p->closed_pass = pass; // Mark the point as closed.
@@ -685,6 +702,8 @@ void AStarGrid2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("update"), &AStarGrid2D::update);
ClassDB::bind_method(D_METHOD("set_jumping_enabled", "enabled"), &AStarGrid2D::set_jumping_enabled);
ClassDB::bind_method(D_METHOD("is_jumping_enabled"), &AStarGrid2D::is_jumping_enabled);
ClassDB::bind_method(D_METHOD("set_max_traversals", "max_traversals"), &AStarGrid2D::set_max_traversals);
ClassDB::bind_method(D_METHOD("get_max_traversals"), &AStarGrid2D::get_max_traversals);
ClassDB::bind_method(D_METHOD("set_diagonal_mode", "mode"), &AStarGrid2D::set_diagonal_mode);
ClassDB::bind_method(D_METHOD("get_diagonal_mode"), &AStarGrid2D::get_diagonal_mode);
ClassDB::bind_method(D_METHOD("set_default_compute_heuristic", "heuristic"), &AStarGrid2D::set_default_compute_heuristic);
@@ -713,6 +732,7 @@ void AStarGrid2D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "cell_shape", PROPERTY_HINT_ENUM, "Square,IsometricRight,IsometricDown"), "set_cell_shape", "get_cell_shape");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "jumping_enabled"), "set_jumping_enabled", "is_jumping_enabled");
ADD_PROPERTY(PropertyInfo(Variant::INT, "max_traversals", PROPERTY_HINT_RANGE, "0,65536,0"), "set_max_traversals", "get_max_traversals");
ADD_PROPERTY(PropertyInfo(Variant::INT, "default_compute_heuristic", PROPERTY_HINT_ENUM, "Euclidean,Manhattan,Octile,Chebyshev"), "set_default_compute_heuristic", "get_default_compute_heuristic");
ADD_PROPERTY(PropertyInfo(Variant::INT, "default_estimate_heuristic", PROPERTY_HINT_ENUM, "Euclidean,Manhattan,Octile,Chebyshev"), "set_default_estimate_heuristic", "get_default_estimate_heuristic");
ADD_PROPERTY(PropertyInfo(Variant::INT, "diagonal_mode", PROPERTY_HINT_ENUM, "Never,Always,At Least One Walkable,Only If No Obstacles"), "set_diagonal_mode", "get_diagonal_mode");

4
core/math/a_star_grid_2d.h
View File

@@ -73,6 +73,7 @@ private:
CellShape cell_shape = CELL_SHAPE_SQUARE;
bool jumping_enabled = false;
int64_t max_traversals = 0;
DiagonalMode diagonal_mode = DIAGONAL_MODE_ALWAYS;
Heuristic default_compute_heuristic = HEURISTIC_EUCLIDEAN;
Heuristic default_estimate_heuristic = HEURISTIC_EUCLIDEAN;
@@ -190,6 +191,9 @@ public:
void set_jumping_enabled(bool p_enabled);
bool is_jumping_enabled() const;
void set_max_traversals(int64_t p_max_traversals);
int64_t get_max_traversals() const;
void set_diagonal_mode(DiagonalMode p_diagonal_mode);
DiagonalMode get_diagonal_mode() const;

3
doc/classes/AStarGrid2D.xml
View File

@@ -180,6 +180,9 @@
Enables or disables jumping to skip up the intermediate points and speeds up the searching algorithm.
[b]Note:[/b] Currently, toggling it on disables the consideration of weight scaling in pathfinding.
</member>
<member name="max_traversals" type="int" setter="set_max_traversals" getter="get_max_traversals" default="0">
The maximum number of points to traverse before giving up. If set to [code]0[/code], the search will continue until the end point is reached or the whole grid is traversed.
</member>
<member name="offset" type="Vector2" setter="set_offset" getter="get_offset" default="Vector2(0, 0)">
The offset of the grid which will be applied to calculate the resulting point position returned by [method get_point_path]. If changed, [method update] needs to be called before finding the next path.
</member>