diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-22 17:36:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 17:36:33 +0200 |
| commit | 43ff5dd890fa647ac3e91a30a2a2198cb40db34a (patch) | |
| tree | dc4e9f99571263cc04f250f825854a6782e4a266 /scene/resources/mesh.h | |
| parent | dabc9823934ca13ad02cd13fcb544aaab955da25 (diff) | |
| parent | 8893b2bdb48ccac447db15a5b33f3c06329c6a8a (diff) | |
Merge pull request #64642 from aaronfranke/mesh-cleanup
Diffstat (limited to 'scene/resources/mesh.h')
| -rw-r--r-- | scene/resources/mesh.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index 63dbda92d0..491a383416 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -169,9 +169,6 @@ public: void generate_debug_mesh_lines(Vector<Vector3> &r_lines); void generate_debug_mesh_indices(Vector<Vector3> &r_points); - Ref<Shape3D> create_trimesh_shape() const; - Ref<Shape3D> create_convex_shape(bool p_clean = true, bool p_simplify = false) const; - Ref<Mesh> create_outline(float p_margin) const; void set_lightmap_size_hint(const Size2i &p_size); @@ -214,6 +211,8 @@ public: static ConvexDecompositionFunc convex_decomposition_function; Vector<Ref<Shape3D>> convex_decompose(const ConvexDecompositionSettings &p_settings) const; + Ref<Shape3D> create_convex_shape(bool p_clean = true, bool p_simplify = false) const; + Ref<Shape3D> create_trimesh_shape() const; virtual int get_builtin_bind_pose_count() const; virtual Transform3D get_builtin_bind_pose(int p_index) const; |