Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-23 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

NavMap::get_path Fix not resetting least_cost_id

Browse Source
This commit is contained in:
kleonc 2022-04-14 17:15:39 +02:00 committed by Relintai
parent 58b8271bf4
commit 4c27d02012
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/navigation/nav_map.cpp
View File

@ -158,10 +158,10 @@ Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p
while (found_route == false) { while (found_route == false) {
{ {
gd::NavigationPoly *least_cost_poly = &navigation_polys[least_cost_id];
// Takes the current least_cost_poly neighbors and compute the traveled_distance of each // Takes the current least_cost_poly neighbors and compute the traveled_distance of each
for (size_t i = 0; i < navigation_polys[least_cost_id].poly->edges.size(); i++) { for (size_t i = 0; i < navigation_polys[least_cost_id].poly->edges.size(); i++) {
gd::NavigationPoly *least_cost_poly = &navigation_polys[least_cost_id];
const gd::Edge &edge = least_cost_poly->poly->edges[i]; const gd::Edge &edge = least_cost_poly->poly->edges[i];
if (!edge.other_polygon) if (!edge.other_polygon)
continue; continue;
@ -243,6 +243,7 @@ Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p
navigation_polys.push_back(np); navigation_polys.push_back(np);
open_list.clear(); open_list.clear();
open_list.push_back(0); open_list.push_back(0);
least_cost_id = 0;
reachable_end = NULL; reachable_end = NULL;
@ -267,6 +268,8 @@ Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p
} }
} }
ERR_BREAK(least_cost_id == -1);
// Stores the further reachable end polygon, in case our goal is not reachable. // Stores the further reachable end polygon, in case our goal is not reachable.
if (is_reachable) { if (is_reachable) {
float d = navigation_polys[least_cost_id].entry.distance_to(p_destination); float d = navigation_polys[least_cost_id].entry.distance_to(p_destination);
@ -276,8 +279,6 @@ Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p
} }
} }
ERR_BREAK(least_cost_id == -1);
// Check if we reached the end // Check if we reached the end
if (navigation_polys[least_cost_id].poly == end_poly) { if (navigation_polys[least_cost_id].poly == end_poly) {
// Yep, done!! // Yep, done!!