diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-11 14:12:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 14:12:56 +0200 |
| commit | a57d420224e1d2ac40281e81e1300184a8ce9902 (patch) | |
| tree | c731d5c2fd55b75622a718b517c0d259d5c02499 /modules/navigation/navigation_mesh_generator.cpp | |
| parent | efc6b29601f4d6096dbe076b633c9a313ebba019 (diff) | |
| parent | 60298328caa445dee7c562fedbefec990b292f5a (diff) | |
Merge pull request #51500 from timothyqiu/navmesh-doc
Diffstat (limited to 'modules/navigation/navigation_mesh_generator.cpp')
| -rw-r--r-- | modules/navigation/navigation_mesh_generator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/navigation/navigation_mesh_generator.cpp b/modules/navigation/navigation_mesh_generator.cpp index 41cd75fd22..74da939e6f 100644 --- a/modules/navigation/navigation_mesh_generator.cpp +++ b/modules/navigation/navigation_mesh_generator.cpp @@ -138,7 +138,7 @@ void NavigationMeshGenerator::_add_faces(const PackedVector3Array &p_faces, cons } } -void NavigationMeshGenerator::_parse_geometry(Transform3D p_accumulated_transform, Node *p_node, Vector<float> &p_verticies, Vector<int> &p_indices, int p_generate_from, uint32_t p_collision_mask, bool p_recurse_children) { +void NavigationMeshGenerator::_parse_geometry(Transform3D p_accumulated_transform, Node *p_node, Vector<float> &p_verticies, Vector<int> &p_indices, NavigationMesh::ParsedGeometryType p_generate_from, uint32_t p_collision_mask, bool p_recurse_children) { if (Object::cast_to<MeshInstance3D>(p_node) && p_generate_from != NavigationMesh::PARSED_GEOMETRY_STATIC_COLLIDERS) { MeshInstance3D *mesh_instance = Object::cast_to<MeshInstance3D>(p_node); Ref<Mesh> mesh = mesh_instance->get_mesh(); @@ -515,7 +515,7 @@ void NavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node) Transform3D navmesh_xform = Object::cast_to<Node3D>(p_node)->get_transform().affine_inverse(); for (Node *E : parse_nodes) { - int geometry_type = p_nav_mesh->get_parsed_geometry_type(); + NavigationMesh::ParsedGeometryType geometry_type = p_nav_mesh->get_parsed_geometry_type(); uint32_t collision_mask = p_nav_mesh->get_collision_mask(); bool recurse_children = p_nav_mesh->get_source_geometry_mode() != NavigationMesh::SOURCE_GEOMETRY_GROUPS_EXPLICIT; _parse_geometry(navmesh_xform, E, vertices, indices, geometry_type, collision_mask, recurse_children); |