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

Merge branch 'PE-1.4' of https://github.com/plemsoft/FlaxEngine into plemsoft-PE-1.4

Browse Source
This commit is contained in:
Wojtek Figat
2022-10-29 11:15:36 +02:00
parent 284917796a 6a5efdeb29
commit bd562a374a
11 changed files with 149 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
View File

@@ -641,6 +641,7 @@ bool ModelTool::ImportDataAssimp(const char* path, ImportedModelData& data, Opti
aiProcess_JoinIdenticalVertices |
aiProcess_LimitBoneWeights |
aiProcess_Triangulate |
aiProcess_SortByPType | //PE: Added aiProcess_SortByPType so we can ignore meshes with non triangle faces.
aiProcess_GenUVCoords |
aiProcess_FindDegenerates |
aiProcess_FindInvalidData |

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

@@ -1552,10 +1552,14 @@ bool ModelTool::ImportModel(const String& path, ModelData& meshData, Options& op
int32 ModelTool::DetectLodIndex(const String& nodeName)
{
const int32 index = nodeName.FindLast(TEXT("LOD"));
int32 index = nodeName.FindLast(TEXT("LOD"));
if (index != -1)
{
int32 num;
//PE: Many models use LOD_0... to indentify LOD levels.
if (nodeName.Length() > 4 && nodeName[3] == '_')
index++;
if (!StringUtils::Parse(nodeName.Get() + index + 3, &num))
{
if (num >= 0 && num < MODEL_MAX_LODS)