diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-12-18 00:11:16 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-12-18 00:11:16 +0100 |
| commit | 5d2137aeea22958b8d634f98c05e3ee9f5a27216 (patch) | |
| tree | 2ce3ee0dcde3f5ee77bece6702381dd8d138dbd7 /modules/navigation/navigation_mesh_generator.h | |
| parent | d44d0cc0fd543da143010ad96978951facd87c1e (diff) | |
| parent | 34e7628f5f1b419bfed1acd915209347e615bedf (diff) | |
Merge pull request #69931 from smix8/navigation_abbreviation_changes_4.x
Fix Navigation API abbreviations inconsistency
Diffstat (limited to 'modules/navigation/navigation_mesh_generator.h')
| -rw-r--r-- | modules/navigation/navigation_mesh_generator.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/navigation/navigation_mesh_generator.h b/modules/navigation/navigation_mesh_generator.h index 8cc1531b53..f6bf39d714 100644 --- a/modules/navigation/navigation_mesh_generator.h +++ b/modules/navigation/navigation_mesh_generator.h @@ -55,9 +55,9 @@ protected: static void _add_faces(const PackedVector3Array &p_faces, const Transform3D &p_xform, Vector<float> &p_vertices, Vector<int> &p_indices); static void _parse_geometry(const Transform3D &p_navmesh_transform, Node *p_node, Vector<float> &p_vertices, Vector<int> &p_indices, NavigationMesh::ParsedGeometryType p_generate_from, uint32_t p_collision_mask, bool p_recurse_children); - static void _convert_detail_mesh_to_native_navigation_mesh(const rcPolyMeshDetail *p_detail_mesh, Ref<NavigationMesh> p_nav_mesh); + static void _convert_detail_mesh_to_native_navigation_mesh(const rcPolyMeshDetail *p_detail_mesh, Ref<NavigationMesh> p_navigation_mesh); static void _build_recast_navigation_mesh( - Ref<NavigationMesh> p_nav_mesh, + Ref<NavigationMesh> p_navigation_mesh, #ifdef TOOLS_ENABLED EditorProgress *ep, #endif @@ -75,8 +75,8 @@ public: NavigationMeshGenerator(); ~NavigationMeshGenerator(); - void bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node); - void clear(Ref<NavigationMesh> p_nav_mesh); + void bake(Ref<NavigationMesh> p_navigation_mesh, Node *p_root_node); + void clear(Ref<NavigationMesh> p_navigation_mesh); }; #endif |