From e3bb38f13b2958f7905a157b4cfc962ff5b16500 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 26 Jul 2024 23:15:07 +0200
Subject: [PATCH] Move arrays caching to be local for import and setup ignore
 flags for OpenFBX

#2672
---
 .../Tools/ModelTool/ModelTool.OpenFBX.cpp     | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
index eb13dcb48..6e94f73d3 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
@@ -104,6 +104,10 @@ struct OpenFbxImporterData
     Array<const ofbx::Material*> Materials;
     Array<MaterialSlotEntry> ImportedMaterials;
 
+    Array<int> TriangulatedIndicesCache;
+    Array<Int4> BlendIndicesCache;
+    Array<Float4> BlendWeightsCache;
+
     OpenFbxImporterData(const String& path, const ModelTool::Options& options, ofbx::IScene* scene)
         : Scene(scene)
         , ScenePtr(scene)
@@ -685,10 +689,8 @@ bool ProcessMesh(ModelData& result, OpenFbxImporterData& data, const ofbx::Mesh*
     const ofbx::Skin* skin = aMesh->getSkin();
     const ofbx::BlendShape* blendShape = aMesh->getBlendShape();
 
-    static Array<int> triangulatedIndices;
+    auto& triangulatedIndices = data.TriangulatedIndicesCache;
     triangulatedIndices.Resize(vertexCount, false);
-    static Array<Int4> blendIndices;
-    static Array<Float4> blendWeights;
 
     // Properties
     const ofbx::Material* aMaterial = nullptr;
@@ -833,6 +835,8 @@ bool ProcessMesh(ModelData& result, OpenFbxImporterData& data, const ofbx::Mesh*
     // Blend Indices and Blend Weights
     if (skin && skin->getClusterCount() > 0 && EnumHasAnyFlags(data.Options.ImportTypes, ImportDataTypes::Skeleton))
     {
+        auto& blendIndices = data.BlendIndicesCache;
+        auto& blendWeights = data.BlendWeightsCache;
         blendIndices.Resize(positions.values_count, false);
         blendWeights.Resize(positions.values_count, false);
         blendIndices.SetAll(Int4::Zero);
@@ -1261,20 +1265,26 @@ bool ModelTool::ImportDataOpenFBX(const String& path, ModelData& data, Options&
         errorMsg = TEXT("Cannot load file.");
         return true;
     }
-    ofbx::u16 loadFlags = 0;
+    ofbx::LoadFlags loadFlags = ofbx::LoadFlags::NONE;
     if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Geometry))
     {
         if (!options.ImportBlendShapes)
-            loadFlags |= (ofbx::u64)ofbx::LoadFlags::IGNORE_BLEND_SHAPES;
+            loadFlags |= ofbx::LoadFlags::IGNORE_BLEND_SHAPES;
     }
     else
     {
-        loadFlags |= (ofbx::u64)ofbx::LoadFlags::IGNORE_GEOMETRY | (ofbx::u64)ofbx::LoadFlags::IGNORE_BLEND_SHAPES;
+        loadFlags |= ofbx::LoadFlags::IGNORE_GEOMETRY | ofbx::LoadFlags::IGNORE_BLEND_SHAPES;
     }
+    if (EnumHasNoneFlags(options.ImportTypes, ImportDataTypes::Materials))
+        loadFlags |= ofbx::LoadFlags::IGNORE_MATERIALS;
+    if (EnumHasNoneFlags(options.ImportTypes, ImportDataTypes::Textures))
+        loadFlags |= ofbx::LoadFlags::IGNORE_TEXTURES;
+    if (EnumHasNoneFlags(options.ImportTypes, ImportDataTypes::Animations))
+        loadFlags |= ofbx::LoadFlags::IGNORE_ANIMATIONS;
     ofbx::IScene* scene;
     {
         PROFILE_CPU_NAMED("ofbx::load");
-        scene = ofbx::load(fileData.Get(), fileData.Count(), loadFlags);
+        scene = ofbx::load(fileData.Get(), fileData.Count(), (ofbx::u16)loadFlags);
     }
     if (!scene)
     {