diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-15 00:59:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-15 00:59:37 +0200 |
commit | 4f9c46df487a2b7698ff3dde38bb6ca1259facce (patch) | |
tree | 0196164bf0096f47654d4eb361b6166908451ddf /modules/navigation/nav_map.cpp | |
parent | f9f3db443e1c3004f1c4418967d9c900c8923692 (diff) | |
parent | 245da150e7a3eb17435f64afd25939ad669e0901 (diff) | |
download | redot-engine-4f9c46df487a2b7698ff3dde38bb6ca1259facce.tar.gz |
Merge pull request #62052 from smix8/navigation_layer_functions_4.x
Streamline Navigation layer function names.
Diffstat (limited to 'modules/navigation/nav_map.cpp')
-rw-r--r-- | modules/navigation/nav_map.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/navigation/nav_map.cpp b/modules/navigation/nav_map.cpp index 059dc989a8..49c12813b3 100644 --- a/modules/navigation/nav_map.cpp +++ b/modules/navigation/nav_map.cpp @@ -65,7 +65,7 @@ gd::PointKey NavMap::get_point_key(const Vector3 &p_pos) const { return p; } -Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p_optimize, uint32_t p_layers) const { +Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p_optimize, uint32_t p_navigation_layers) const { // Find the start poly and the end poly on this map. const gd::Polygon *begin_poly = nullptr; const gd::Polygon *end_poly = nullptr; @@ -78,7 +78,7 @@ Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p const gd::Polygon &p = polygons[i]; // Only consider the polygon if it in a region with compatible layers. - if ((p_layers & p.owner->get_layers()) == 0) { + if ((p_navigation_layers & p.owner->get_navigation_layers()) == 0) { continue; } @@ -154,7 +154,7 @@ Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p const gd::Edge::Connection &connection = edge.connections[connection_index]; // Only consider the connection to another polygon if this polygon is in a region with compatible layers. - if ((p_layers & connection.polygon->owner->get_layers()) == 0) { + if ((p_navigation_layers & connection.polygon->owner->get_navigation_layers()) == 0) { continue; } |