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 /servers/navigation_server_3d.h | |
| parent | f9f3db443e1c3004f1c4418967d9c900c8923692 (diff) | |
| parent | 245da150e7a3eb17435f64afd25939ad669e0901 (diff) | |
Merge pull request #62052 from smix8/navigation_layer_functions_4.x
Streamline Navigation layer function names.
Diffstat (limited to 'servers/navigation_server_3d.h')
| -rw-r--r-- | servers/navigation_server_3d.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/navigation_server_3d.h b/servers/navigation_server_3d.h index 9b7e48e8d1..9c04d68622 100644 --- a/servers/navigation_server_3d.h +++ b/servers/navigation_server_3d.h @@ -84,7 +84,7 @@ public: virtual real_t map_get_edge_connection_margin(RID p_map) const = 0; /// Returns the navigation path to reach the destination from the origin. - virtual Vector<Vector3> map_get_path(RID p_map, Vector3 p_origin, Vector3 p_destination, bool p_optimize, uint32_t p_navigable_layers = 1) const = 0; + virtual Vector<Vector3> map_get_path(RID p_map, Vector3 p_origin, Vector3 p_destination, bool p_optimize, uint32_t p_navigation_layers = 1) const = 0; virtual Vector3 map_get_closest_point_to_segment(RID p_map, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision = false) const = 0; virtual Vector3 map_get_closest_point(RID p_map, const Vector3 &p_point) const = 0; @@ -110,8 +110,8 @@ public: virtual RID region_get_map(RID p_region) const = 0; /// Set the region's layers - virtual void region_set_layers(RID p_region, uint32_t p_layers) const = 0; - virtual uint32_t region_get_layers(RID p_region) const = 0; + virtual void region_set_navigation_layers(RID p_region, uint32_t p_navigation_layers) const = 0; + virtual uint32_t region_get_navigation_layers(RID p_region) const = 0; /// Set the global transformation of this region. virtual void region_set_transform(RID p_region, Transform3D p_transform) const = 0; |