Adds support for pulling material data from .db files and applying it to a mdl export.

Current supported workflow is using console tools to wrap the db with the switch /mats.

Author: Glorou

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -1476,7 +1476,7 @@ public static async Task<TTModel> LoadFromFile(string filePath, Action<bool, str
             {
                 loggingFunction = ModelModifiers.NoOp;
             }
-            if(settings == null)
+            if (settings == null)
             {
                 settings = new ModelImportOptions();
             }
@@ -1519,7 +1519,7 @@ public static async Task<TTModel> LoadFromFile(string filePath, Action<bool, str
                                 }
                                 else
                                 {
-                                    model.MeshGroups[meshNum].MeshType = (EMeshType) Enum.Parse(typeof(EMeshType), t);
+                                    model.MeshGroups[meshNum].MeshType = (EMeshType)Enum.Parse(typeof(EMeshType), t);
                                 }
 
                                 model.MeshGroups[meshNum].Name = reader.GetString("name");
@@ -1546,7 +1546,7 @@ public static async Task<TTModel> LoadFromFile(string filePath, Action<bool, str
                             }
 
                             // Spawn parts as needed.
-                            while(model.MeshGroups[meshNum].Parts.Count <= partNum)
+                            while (model.MeshGroups[meshNum].Parts.Count <= partNum)
                             {
                                 model.MeshGroups[meshNum].Parts.Add(new TTMeshPart());
 
@@ -1672,14 +1672,15 @@ public static async Task<TTModel> LoadFromFile(string filePath, Action<bool, str
                             vertex.FlowDirection[0] = reader.GetFloat("flow_u");
                             vertex.FlowDirection[1] = reader.GetFloat("flow_v");
 
-                            if(vertex.Binormal != Vector3.Zero)
+                            if (vertex.Binormal != Vector3.Zero)
                             {
                                 var tangent = Vector3.Cross(vertex.Normal, vertex.Binormal).Normalized();
                                 var dot = Vector3.Dot(tangent, vertex.Tangent);
-                                if(dot < 0.5f)
+                                if (dot < 0.5f)
                                 {
                                     vertex.Handedness = true;
-                                } else
+                                }
+                                else
                                 {
                                     vertex.Handedness = false;
                                 }
@@ -1693,7 +1694,8 @@ public static async Task<TTModel> LoadFromFile(string filePath, Action<bool, str
                             try
                             {
                                 return reader.GetInt32("vertex_id");
-                            } catch(Exception ex)
+                            }
+                            catch (Exception ex)
                             {
                                 throw ex;
                             }
@@ -1741,25 +1743,42 @@ public static async Task<TTModel> LoadFromFile(string filePath, Action<bool, str
                         }
                     }
                 }
-                db.Close();
-            }
 
-            // Try to make sure the DB is properly unlocked.'
+                //Load Mats if applicable
+                query = "select * from materials order by material_id";
+                using (var cmd = new SQLiteCommand(query, db))
+                {
+                    using (var reader = new CacheReader(cmd.ExecuteReader()))
+                    {
+                        while (reader.NextRow())
+                        {
+                            var matNum = reader.GetInt32("material_id");
+                            var materialPath = reader.GetString("name");
+                            model.MeshGroups[matNum].Material = materialPath;
+                        }
+                    }
+                
 
-            XivCache.WaitForSqlCleanup();
+                    db.Close();
+                }
 
-            model.UVState = UVAddressingSpace.Standard;
+                // Try to make sure the DB is properly unlocked.'
 
-            // Convert the model to FFXIV's internal weirdness.
-            ModelModifiers.MakeImportReady(model, settings.ShiftImportUV, loggingFunction);
+                XivCache.WaitForSqlCleanup();
 
-            await ModelModifiers.CalculateTangents(model, loggingFunction);
+                model.UVState = UVAddressingSpace.Standard;
 
-            await ModelModifiers.ConvertFlowData(model, loggingFunction);
+                // Convert the model to FFXIV's internal weirdness.
+                ModelModifiers.MakeImportReady(model, settings.ShiftImportUV, loggingFunction);
 
-            ModelModifiers.CleanWeights(model, loggingFunction);
+                await ModelModifiers.CalculateTangents(model, loggingFunction);
 
-            return model;
+                await ModelModifiers.ConvertFlowData(model, loggingFunction);
+
+                ModelModifiers.CleanWeights(model, loggingFunction);
+
+                return model;
+            }
         }
 
         private static void MigrateImportDb(SQLiteConnection db)

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -1911,10 +1911,13 @@ public static async Task<long> ImportModel(string externalFile, string internalF
         /// <exception cref="InvalidDataException"></exception>
         public static async Task<byte[]> FileToUncompressedMdl(string externalPath, string internalPath, ModelImportOptions options = null, ModTransaction tx = null)
         {
-
+            bool applyOptions = false;
             if (options == null)
             {
                 options = new ModelImportOptions();
+            } else
+            {
+                applyOptions = true;
             }
 
             if (options.LoggingFunction == null)
@@ -2001,7 +2004,7 @@ await Task.Run(async () =>
                 }
                 else
                 {
-                    ttModel = await LoadExternalModel(externalPath, options, false);
+                    ttModel = await LoadExternalModel(externalPath, options, applyOptions);
                 }
                 #endregion