Merge pull request #85 from Glorou/master

Adding support for input embeded textures

Author: Lunaretic

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -1741,25 +1741,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();
+                }
 
-            XivCache.WaitForSqlCleanup();
+                // Try to make sure the DB is properly unlocked.'
 
-            model.UVState = UVAddressingSpace.Standard;
+                XivCache.WaitForSqlCleanup();
 
-            // Convert the model to FFXIV's internal weirdness.
-            ModelModifiers.MakeImportReady(model, settings.ShiftImportUV, loggingFunction);
+                model.UVState = UVAddressingSpace.Standard;
 
-            await ModelModifiers.CalculateTangents(model, loggingFunction);
+                // Convert the model to FFXIV's internal weirdness.
+                ModelModifiers.MakeImportReady(model, settings.ShiftImportUV, loggingFunction);
 
-            await ModelModifiers.ConvertFlowData(model, loggingFunction);
+                await ModelModifiers.CalculateTangents(model, loggingFunction);
 
-            ModelModifiers.CleanWeights(model, loggingFunction);
+                await ModelModifiers.ConvertFlowData(model, loggingFunction);
 
-            return model;
+                ModelModifiers.CleanWeights(model, loggingFunction);
+
+                return model;
+            }
         }
 
         private static void MigrateImportDb(SQLiteConnection db)

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -1921,10 +1921,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)
@@ -2011,7 +2014,7 @@ await Task.Run(async () =>
                 }
                 else
                 {
-                    ttModel = await LoadExternalModel(externalPath, options, false);
+                    ttModel = await LoadExternalModel(externalPath, options, applyOptions);
                 }
                 #endregion