Combine UVs only if the right attribute is used after settings apply

MapStudioProject · Oct 17, 2024 · bb51ba6 · bb51ba6
1 parent ff65ae6
commit bb51ba6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/Plugins/CafeLibrary/Bfres/Editing/Nodes/ModelWrapper.cs b/Plugins/CafeLibrary/Bfres/Editing/Nodes/ModelWrapper.cs
@@ -499,6 +499,7 @@ public void ImportModel(string filePath, bool replacing = false, Action onImport
                         if (!ok)
                             return;
 
+                        modelDlg.OnApply(materials);
                         //Import the bfres model data
                         Model = BfresModelImporter.ImportModel(ResFile, Model, ioscene, filePath, settings);
                         ImportModel(Model, materials, settings);
@@ -507,6 +508,7 @@ public void ImportModel(string filePath, bool replacing = false, Action onImport
                 }
                 else
                 {
+                    modelDlg.OnApply(materials);
                     //Import the bfres model data
                     Model = BfresModelImporter.ImportModel(ResFile, Model, ioscene, filePath, settings);
                     ImportModel(Model, materials, settings);

diff --git a/Plugins/CafeLibrary/Bfres/Imgui/ModelImportDialog.cs b/Plugins/CafeLibrary/Bfres/Imgui/ModelImportDialog.cs
@@ -7,6 +7,7 @@
 using MapStudio.UI;
 using IONET.Core;
 using Toolbox.Core;
+using BfresLibrary;
 
 namespace CafeLibrary
 {
@@ -25,15 +26,29 @@ public class ModelImportDialog : UIFramework.Window
 
         }
 
+        public void OnApply(List<Material> materials)
+        {
+            foreach (var mesh in this.Settings.Meshes)
+            {
+                //Map original by default
+                var mat = materials.FirstOrDefault(x => x.Name == mesh.MaterialName);
+                //Map to imported instance if needed
+                if (mesh.MaterialInstance != null)
+                    mat = mesh.MaterialInstance;
+
+                if (mat != null) {
+                    //Use combined UVs if used by the material
+                    mesh.CombineUVs = mat.ShaderAssign != null &&
+                                      mat.ShaderAssign.AttribAssigns.ContainsValue("_g3d_02_u0_u1");
+                }
+            }
+        }
+
         public void Setup(FMDL fmdl, IOScene scene, ModelImportSettings settings)
         {
             Settings = settings;
             PresetWindow.LoadPresets(fmdl.ResFile.IsPlatformSwitch);
 
-            //Check for combined
-            var combineUVs = fmdl.Model.Materials.Values.Any(x => x.ShaderAssign != null &&
-                                x.ShaderAssign.AttribAssigns.ContainsValue("_g3d_02_u0_u1"));
-
             string DefaultPreset = "";
             bool isCourse = fmdl.ResFile.Name == "course_model.szs";
             bool isSwitch = fmdl.ResFile.IsPlatformSwitch;
@@ -53,7 +68,6 @@ public void Setup(FMDL fmdl, IOScene scene, ModelImportSettings settings)
                 var meshSettings = new ModelImportSettings.MeshSettings();
                 meshSettings.MeshData = mesh;
                 meshSettings.Name = mesh.Name;
-                meshSettings.CombineUVs = combineUVs;
                 meshSettings.MaterialName = "";
                 meshSettings.SkinCount = mesh.Vertices.Max(x => x.Envelope.Weights.Count);
                 meshSettings.Normal.Enable = mesh.HasNormals;