GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'import_mesh_with_collision_type_as_convex' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-import_mesh_with_collision_type_as_convex

Browse Source
This commit is contained in:
Wojtek Figat
2023-10-04 17:39:39 +02:00
parent 57dc3e00c7 23b6b93726
commit a5374920bd
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Tools/ModelTool/ModelTool.cpp
View File

@@ -1107,7 +1107,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& meshData, Options& op
#if COMPILE_WITH_PHYSICS_COOKING #if COMPILE_WITH_PHYSICS_COOKING
// Create collision // Create collision
CollisionCooking::Argument arg; CollisionCooking::Argument arg;
arg.Type = CollisionDataType::TriangleMesh; arg.Type = options.CollisionType;
arg.OverrideModelData = &collisionModel; arg.OverrideModelData = &collisionModel;
auto assetPath = autoImportOutput / StringUtils::GetFileNameWithoutExtension(path) + TEXT("Collision") ASSET_FILES_EXTENSION_WITH_DOT; auto assetPath = autoImportOutput / StringUtils::GetFileNameWithoutExtension(path) + TEXT("Collision") ASSET_FILES_EXTENSION_WITH_DOT;
if (CreateCollisionData::CookMeshCollision(assetPath, arg)) if (CreateCollisionData::CookMeshCollision(assetPath, arg))

4
Source/Engine/Tools/ModelTool/ModelTool.h
View File

@@ -6,6 +6,7 @@
#include "Engine/Core/Config.h" #include "Engine/Core/Config.h"
#include "Engine/Content/Assets/ModelBase.h" #include "Engine/Content/Assets/ModelBase.h"
#include "Engine/Physics/CollisionData.h"
#if USE_EDITOR #if USE_EDITOR
#include "Engine/Core/ISerializable.h" #include "Engine/Core/ISerializable.h"
#include "Engine/Graphics/Models/ModelData.h" #include "Engine/Graphics/Models/ModelData.h"
@@ -262,6 +263,9 @@ public:
// If specified, all meshes which name starts with this prefix will be imported as a separate collision data (excluded used for rendering). // If specified, all meshes which name starts with this prefix will be imported as a separate collision data (excluded used for rendering).
API_FIELD(Attributes="EditorOrder(100), EditorDisplay(\"Geometry\"), VisibleIf(nameof(ShowGeometry))") API_FIELD(Attributes="EditorOrder(100), EditorDisplay(\"Geometry\"), VisibleIf(nameof(ShowGeometry))")
String CollisionMeshesPrefix = TEXT(""); String CollisionMeshesPrefix = TEXT("");
// The type of collision that should be generated if has collision prefix especified
API_FIELD(Attributes = "EditorOrder(105), EditorDisplay(\"Geometry\"), VisibleIf(nameof(ShowGeometry))")
CollisionDataType CollisionType = CollisionDataType::TriangleMesh;
public: // Transform public: // Transform