godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Merge pull request #52266 from AndreaCatania/coll

Browse Source
This commit is contained in:
Rémi Verschelde
2021-09-14 14:34:22 +02:00
committed by GitHub
parent 0f7fe554fb e3a06c3a9e
commit e13d8eda1b
11 changed files with 493 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/import/scene_importer_mesh.cpp
View File

@@ -524,12 +524,12 @@ Vector<Face3> EditorSceneImporterMesh::get_faces() const {
return faces;
}
Vector<Ref<Shape3D>> EditorSceneImporterMesh::convex_decompose() const {
Vector<Ref<Shape3D>> EditorSceneImporterMesh::convex_decompose(const Mesh::ConvexDecompositionSettings &p_settings) const {
ERR_FAIL_COND_V(!Mesh::convex_composition_function, Vector<Ref<Shape3D>>());
const Vector<Face3> faces = get_faces();
Vector<Vector<Face3>> decomposed = Mesh::convex_composition_function(faces, -1);
Vector<Vector<Face3>> decomposed = Mesh::convex_composition_function(faces, p_settings);
Vector<Ref<Shape3D>> ret;