maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added bool to allow astar points to be connected in one direction only

Browse source 
(cherry picked from commit 2262a59ab3)
This commit is contained in:
Fabian Mathews 2017-05-19 20:46:45 +09:30 committed by Rémi Verschelde
parent c2c1d2076c
commit f0beb36652
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/math/a_star.cpp
View file

@ -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);

2
core/math/a_star.h
View file

@ -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;