From 97bd90d4be056926c85a6b8087984507c5f7c865 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 5 Apr 2024 15:23:09 +0200 Subject: [PATCH] Change default collision type to `ConvexMesh` from `TriangleMesh` --- Source/Editor/Content/Proxy/CollisionDataProxy.cs | 2 +- Source/Engine/Tools/ModelTool/ModelTool.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Editor/Content/Proxy/CollisionDataProxy.cs b/Source/Editor/Content/Proxy/CollisionDataProxy.cs index 154789dc5..497823636 100644 --- a/Source/Editor/Content/Proxy/CollisionDataProxy.cs +++ b/Source/Editor/Content/Proxy/CollisionDataProxy.cs @@ -135,7 +135,7 @@ namespace FlaxEditor.Content } Task.Run(() => { - Editor.CookMeshCollision(assetItem.Path, CollisionDataType.TriangleMesh, model); + Editor.CookMeshCollision(assetItem.Path, CollisionDataType.ConvexMesh, model); if (created != null) FlaxEngine.Scripting.InvokeOnUpdate(() => created(collisionData)); }); diff --git a/Source/Engine/Tools/ModelTool/ModelTool.h b/Source/Engine/Tools/ModelTool/ModelTool.h index f70584681..96d1ae6c0 100644 --- a/Source/Engine/Tools/ModelTool/ModelTool.h +++ b/Source/Engine/Tools/ModelTool/ModelTool.h @@ -196,7 +196,7 @@ public: String CollisionMeshesPrefix = TEXT(""); // The type of collision that should be generated if the mesh has a collision prefix specified. API_FIELD(Attributes = "EditorOrder(105), EditorDisplay(\"Geometry\"), VisibleIf(nameof(ShowGeometry))") - CollisionDataType CollisionType = CollisionDataType::TriangleMesh; + CollisionDataType CollisionType = CollisionDataType::ConvexMesh; public: // Transform