Merge pull request #15 from TexTools/full_model

Merge FullModel branch to Develop

Author: Lunaretic

xivModdingFramework/Models/DataContainers/ModelTextureData.cs

@@ -34,5 +34,7 @@ public class ModelTextureData
         public byte[] Alpha { get; set; }
 
         public byte[] Emissive { get; set; }
+
+        public string MaterialPath { get; set; }
     }
 }

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -326,7 +326,9 @@ public static async Task ExportMaterialsForModel(TTModel model, string outputFil
                     // Set source race to match so that it doesn't get replaced
                     if (targetRace != XivRace.All_Races)
                     {
-                        if (materialName.Contains("b0001"))
+                        var bodyRegex = new Regex("(b[0-9]{4})");
+
+                        if (bodyRegex.Match(materialName).Success)
                         {
                             var currentRace = model.Source.Substring(model.Source.LastIndexOf('c') + 1, 4);
                             mdlPath = model.Source.Replace(currentRace, targetRace.GetRaceCode());

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -1182,7 +1182,7 @@ public static void FixUpSkinReferences(TTModel model, string newInternalPath, Ac
         /// </summary>
         /// <param name="model"></param>
         /// <param name="newInternalPath"></param>
-        public static void FixUpSkinReferences(TTModel model, XivRace baseRace, Action<bool, string> loggingFunction = null)
+        public static void FixUpSkinReferences(TTModel model, XivRace baseRace, Action<bool, string> loggingFunction = null, string bodyReplacement = "")
         {
             if (loggingFunction == null)
             {
@@ -1208,7 +1208,12 @@ public static void FixUpSkinReferences(TTModel model, XivRace baseRace, Action<b
                         m.Material = m.Material.Replace(mtrlMatch.Groups[1].Value, skinRaceString);
 
                         // Reset the body ID if we actually changed races.
-                        m.Material = bodyRegex.Replace(m.Material, "b0001");
+                        bodyReplacement = string.IsNullOrEmpty(bodyReplacement) ? "b0001" : bodyReplacement;
+                        m.Material = bodyRegex.Replace(m.Material, bodyReplacement);
+                    }
+                    else if (bodyReplacement != "")
+                    {
+                        m.Material = bodyRegex.Replace(m.Material, bodyReplacement);
                     }
                 }
             }

xivModdingFramework/Models/ModelTextures/ModelTexture.cs

@@ -178,7 +178,8 @@ public static async Task<ModelTextureData> GetModelMaps(Tex tex, XivMtrl mtrl, C
                     Diffuse = new byte[0],
                     Specular = new byte[0],
                     Emissive = new byte[0],
-                    Alpha = new byte[0]
+                    Alpha = new byte[0],
+                    MaterialPath = mtrl.MTRLPath.Substring(mtrl.MTRLPath.LastIndexOf('/'))
                 };
                 return empty;
             }
@@ -251,7 +252,8 @@ await Task.Run(() =>
                 Diffuse = diffuseMap.ToArray(),
                 Specular = specularMap.ToArray(),
                 Emissive = emissiveMap.ToArray(),
-                Alpha = alphaMap.ToArray()
+                Alpha = alphaMap.ToArray(),
+                MaterialPath = mtrl.MTRLPath.Substring(mtrl.MTRLPath.LastIndexOf('/'))
             };
 
             return modelTextureData;