From 90427da42f84019e8d3aaa3091fb5a4ce4177e36 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 17 Oct 2023 09:59:21 +0200
Subject: [PATCH] Add `SubAssetFolder` to model import option to redirect
 auto-imported materials and textures location

---
 Source/Engine/ContentImporters/ImportModelFile.cpp | 3 ++-
 Source/Engine/Tools/ModelTool/ModelTool.cpp        | 2 ++
 Source/Engine/Tools/ModelTool/ModelTool.h          | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Source/Engine/ContentImporters/ImportModelFile.cpp b/Source/Engine/ContentImporters/ImportModelFile.cpp
index b9a4f5675..530769e49 100644
--- a/Source/Engine/ContentImporters/ImportModelFile.cpp
+++ b/Source/Engine/ContentImporters/ImportModelFile.cpp
@@ -124,7 +124,8 @@ CreateAssetResult ImportModelFile::Import(CreateAssetContext& context)
     // Import model file
     ModelData modelData;
     String errorMsg;
-    String autoImportOutput = String(StringUtils::GetDirectoryName(context.TargetAssetPath)) / StringUtils::GetFileNameWithoutExtension(context.InputPath);
+    String autoImportOutput(StringUtils::GetDirectoryName(context.TargetAssetPath));
+    autoImportOutput /= options.SubAssetFolder.HasChars() ? options.SubAssetFolder.TrimTrailing() : StringUtils::GetFileNameWithoutExtension(context.InputPath);
     if (ModelTool::ImportModel(context.InputPath, modelData, options, errorMsg, autoImportOutput))
     {
         LOG(Error, "Cannot import model file. {0}", errorMsg);
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index b703b47d1..f026eaf95 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -396,6 +396,7 @@ void ModelTool::Options::Serialize(SerializeStream& stream, const void* otherObj
     SERIALIZE(SDFResolution);
     SERIALIZE(SplitObjects);
     SERIALIZE(ObjectIndex);
+    SERIALIZE(SubAssetFolder);
 }
 
 void ModelTool::Options::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier)
@@ -441,6 +442,7 @@ void ModelTool::Options::Deserialize(DeserializeStream& stream, ISerializeModifi
     DESERIALIZE(SDFResolution);
     DESERIALIZE(SplitObjects);
     DESERIALIZE(ObjectIndex);
+    DESERIALIZE(SubAssetFolder);
 
     // [Deprecated on 23.11.2021, expires on 21.11.2023]
     int32 AnimationIndex = -1;
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.h b/Source/Engine/Tools/ModelTool/ModelTool.h
index 36bb9b12c..bad10b86e 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.h
+++ b/Source/Engine/Tools/ModelTool/ModelTool.h
@@ -370,6 +370,12 @@ public:
         API_FIELD(Attributes="EditorOrder(2010), EditorDisplay(\"Splitting\")")
         int32 ObjectIndex = -1;
 
+    public: // Other
+
+        // If specified, will be used as sub-directory name for automatically imported sub assets such as textures and materials. Set to whitespace (single space) to import to the same directory.
+        API_FIELD(Attributes="EditorOrder(3030), EditorDisplay(\"Other\")")
+        String SubAssetFolder = TEXT("");
+
         // Runtime data for objects splitting during import (used internally)
         void* SplitContext = nullptr;
         Function<bool(Options& splitOptions, const String& objectName)> OnSplitImport;