asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8829 from supagu/astar-bidirectional

Browse source 
Added bool to allow astar points to be connected in one direction only
This commit is contained in:
Rémi Verschelde 2017-05-20 09:49:28 +02:00 committed by GitHub
commit c7650c363b
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() {
ClassDB::bind_method(D_METHOD("get_point_weight_scale", "id"), &AStar::get_point_weight_scale);
ClassDB::bind_method(D_METHOD("remove_point", "id"), &AStar::remove_point);
ClassDB::bind_method(D_METHOD("connect_points", "id", "to_id"), &AStar::connect_points);
ClassDB::bind_method(D_METHOD("connect_points", "id", "to_id"), &AStar::connect_points, DEFVAL(true));
ClassDB::bind_method(D_METHOD("disconnect_points", "id", "to_id"), &AStar::disconnect_points);
ClassDB::bind_method(D_METHOD("are_points_connected", "id", "to_id"), &AStar::are_points_connected);

2
core/math/a_star.h
View file

@ -105,7 +105,7 @@ public:
real_t 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;