From dc9659a9bf11e151098aed94ce5f6382f2dcca0d Mon Sep 17 00:00:00 2001 From: Craigory V Coppola Date: Wed, 26 Jun 2019 22:19:52 -0500 Subject: [PATCH] AStar get_closest_point/get_closest_position_in_segment enabled consideration --- core/math/a_star.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp index 7ce38245059..b61119d8df4 100644 --- a/core/math/a_star.cpp +++ b/core/math/a_star.cpp @@ -216,6 +216,8 @@ int AStar::get_closest_point(const Vector3 &p_point) const { for (const Map::Element *E = points.front(); E; E = E->next()) { + if (!E->get()->enabled) + continue; //Disabled points should not be considered real_t d = p_point.distance_squared_to(E->get()->pos); if (closest_id < 0 || d < closest_dist) { closest_dist = d; @@ -234,6 +236,10 @@ Vector3 AStar::get_closest_position_in_segment(const Vector3 &p_point) const { for (const Set::Element *E = segments.front(); E; E = E->next()) { + if (!(E->get().from_point->enabled && E->get().to_point->enabled)) { + continue; + } + Vector3 segment[2] = { E->get().from_point->pos, E->get().to_point->pos,