From f0beb366521e01bd9668104077b700c9d6a385e9 Mon Sep 17 00:00:00 2001 From: Fabian Mathews Date: Fri, 19 May 2017 20:46:45 +0930 Subject: [PATCH] Added bool to allow astar points to be connected in one direction only (cherry picked from commit 2262a59ab3d9ee6c3aef4f898a2b96ad2cac68f6) --- core/math/a_star.cpp | 8 +++++--- core/math/a_star.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp index ee8e22db0a..c056b1c1c3 100644 --- a/core/math/a_star.cpp +++ b/core/math/a_star.cpp @@ -86,7 +86,7 @@ void AStar::remove_point(int p_id) { points.erase(p_id); } -void AStar::connect_points(int p_id, int p_with_id) { +void AStar::connect_points(int p_id, int p_with_id, bool bidirectional) { ERR_FAIL_COND(!points.has(p_id)); ERR_FAIL_COND(!points.has(p_with_id)); @@ -95,7 +95,9 @@ void AStar::connect_points(int p_id, int p_with_id) { Point *a = points[p_id]; Point *b = points[p_with_id]; a->neighbours.push_back(b); - b->neighbours.push_back(a); + + if (bidirectional) + b->neighbours.push_back(a); Segment s(p_id, p_with_id); if (s.from == p_id) { @@ -401,7 +403,7 @@ void AStar::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_point_weight_scale", "id"), &AStar::get_point_weight_scale); ObjectTypeDB::bind_method(_MD("remove_point", "id"), &AStar::remove_point); - ObjectTypeDB::bind_method(_MD("connect_points", "id", "to_id"), &AStar::connect_points); + ObjectTypeDB::bind_method(_MD("connect_points", "id", "to_id"), &AStar::connect_points, DEFVAL(true)); ObjectTypeDB::bind_method(_MD("disconnect_points", "id", "to_id"), &AStar::disconnect_points); ObjectTypeDB::bind_method(_MD("are_points_connected", "id", "to_id"), &AStar::are_points_connected); diff --git a/core/math/a_star.h b/core/math/a_star.h index 2e92364b0d..665698b7e3 100644 --- a/core/math/a_star.h +++ b/core/math/a_star.h @@ -105,7 +105,7 @@ public: float get_point_weight_scale(int p_id) const; void remove_point(int p_id); - void connect_points(int p_id, int p_with_id); + void connect_points(int p_id, int p_with_id, bool bidirectional = true); void disconnect_points(int p_id, int p_with_id); bool are_points_connected(int p_id, int p_with_id) const;