Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Use a more specific type for Mesh create_(convex|trimesh)_shape

Browse source
This commit is contained in:
Aaron Franke 2022-11-25 11:43:06 -06:00
parent a9fbf3718d
commit 93ab82536d
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
10 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scene/3d/mesh_instance_3d.cpp
View file

@ -33,6 +33,8 @@
#include "collision_shape_3d.h"
#include "core/core_string_names.h"
#include "physics_body_3d.h"
#include "scene/resources/concave_polygon_shape_3d.h"
#include "scene/resources/convex_polygon_shape_3d.h"
bool MeshInstance3D::_set(const StringName &p_name, const Variant &p_value) {
//this is not _too_ bad performance wise, really. it only arrives here if the property was not set anywhere else.
@ -224,7 +226,7 @@ Node *MeshInstance3D::create_trimesh_collision_node() {
return nullptr;
}
Ref<Shape3D> shape = mesh->create_trimesh_shape();
Ref<ConcavePolygonShape3D> shape = mesh->create_trimesh_shape();
if (shape.is_null()) {
return nullptr;
}
@ -254,7 +256,7 @@ Node *MeshInstance3D::create_convex_collision_node(bool p_clean, bool p_simplify
return nullptr;
}
Ref<Shape3D> shape = mesh->create_convex_shape(p_clean, p_simplify);
Ref<ConvexPolygonShape3D> shape = mesh->create_convex_shape(p_clean, p_simplify);
if (shape.is_null()) {
return nullptr;
}