Merge branch 'develop' into full_model

Author: liinko

xivModdingFramework/Materials/FileTypes/Mtrl.cs

@@ -996,6 +996,7 @@ private async Task<List<TexTypePath>> GetTexNames(IEnumerable<string> texPathLis
         private static readonly Regex _weaponMatch = new Regex("(w[0-9]{4})");
         private static readonly Regex _tailMatch = new Regex("(t[0-9]{4})");
         private static readonly Regex _raceMatch = new Regex("(c[0-9]{4})");
+        private static readonly Regex _bodyRegex = new Regex("(b[0-9]{4})");
         private static readonly Regex _skinRegex = new Regex("^/mt_c([0-9]{4})b([0-9]{4})_.+\\.mtrl$");
         /// <summary>
         /// Resolves the MTRL path for a given MDL path.
@@ -1020,11 +1021,27 @@ public string GetMtrlPath(string mdlPath, string mtrlName, int mtrlVariant = 1)
                 var mdlMatch = _raceMatch.Match(mdlPath);
                 var mtrlMatch = _raceMatch.Match(mtrlName);
 
+
                 // Both Items have racial model information in their path, and the races DON'T match.
                 if (mdlMatch.Success && mtrlMatch.Success && mdlMatch.Groups[1].Value != mtrlMatch.Groups[1].Value)
                 {
-                    // In this case, we actually replace the race in the Material the race from the MODEL, which has priority.
-                    mtrlName = mtrlName.Replace(mtrlMatch.Groups[1].Value, mdlMatch.Groups[1].Value);
+
+                    // Need to find the racial skin for this race.
+                    var baseRace = XivRaces.GetXivRace(mdlMatch.Groups[1].Value.Substring(1));
+                    var skinRace = XivRaceTree.GetSkinRace(baseRace);
+                    var skinRaceString = "c" + XivRaces.GetRaceCode(skinRace);
+
+                    // In this case, we actually replace both with the racial skin material based on the Model, which has priority.
+                    mtrlName = mtrlName.Replace(mtrlMatch.Groups[1].Value, skinRaceString);
+                    mdlPath = mdlPath.Replace(mdlMatch.Groups[1].Value, skinRaceString);
+
+                    // If we actually shifted races, reset the body identifier.
+                    // This shouldn't really ever happen, but safety check.
+                    if(baseRace != skinRace)
+                    {
+                        mtrlName = _bodyRegex.Replace(mtrlName, "b0001");
+                        mdlPath = _bodyRegex.Replace(mdlPath, "b0001");
+                    }
                 }
 
 

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -217,6 +217,12 @@ public async Task ExportModel(TTModel model, string outputFilePath, int mtrlVari
             // Pop the textures out so the exporters can reference them.
             if (includeTextures)
             {
+                // Fix up our skin references in the model before exporting, to ensure
+                // we supply the right material names to the exporters down-chain.
+                if (model.IsInternal)
+                {
+                    ModelModifiers.FixUpSkinReferences(model, model.Source, null);
+                }
                 await ExportMaterialsForModel(model, outputFilePath, _gameDirectory, mtrlVariant);
             }
 

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -1134,6 +1134,7 @@ public static void CalculateTangentsFromBinormals(TTModel model, Action<bool, st
         }
 
 
+        private static readonly Regex _skinMaterialRegex = new Regex("^/mt_c([0-9]{4})b([0-9]{4})_.+\\.mtrl$");
 
         /// <summary>
         /// Fixes up the racial skin references in the model's materials.
@@ -1143,28 +1144,50 @@ public static void CalculateTangentsFromBinormals(TTModel model, Action<bool, st
         /// <param name="newInternalPath"></param>
         public static void FixUpSkinReferences(TTModel model, string newInternalPath, Action<bool, string> loggingFunction = null)
         {
+            if (loggingFunction == null)
+            {
+                loggingFunction = NoOp;
+            }
 
             // Here we should to go in and correct any Skin Material references to point to the skin material for this race.
             // It's not actually -NEEDED-, as the game will dynamically resolve them anyways to the player's skin material, but it's good for user expectation and sanity.
 
             var raceRegex = new Regex("(c[0-9]{4})");
+            var bodyRegex = new Regex("(b[0-9]{4})");
+
             // So we have to do this step first.
             var newRaceMatch = raceRegex.Match(newInternalPath);
 
+            // Now model doesn't exist in a racial folder.  Nothing to fix up/impossible to.
             if(!newRaceMatch.Success)
             {
                 return;
             }
 
             loggingFunction(false, "Fixing up racial skin references...");
 
+            // Need to find the racial skin for this race.
+            var baseRace = XivRaces.GetXivRace(newRaceMatch.Groups[1].Value.Substring(1));
+            var skinRace = XivRaceTree.GetSkinRace(baseRace);
+            var skinRaceString = "c" + XivRaces.GetRaceCode(skinRace);
+
+
+
             foreach (var m in model.MeshGroups)
             {
                 if (m.Material == null) continue;
-                var mtrlMatch = raceRegex.Match(m.Material);
-                if(mtrlMatch.Success)
+
+                // Only fix up -skin- materials.
+                if (_skinMaterialRegex.IsMatch(m.Material))
                 {
-                    m.Material.Replace(mtrlMatch.Groups[1].Value, newRaceMatch.Groups[1].Value);
+                    var mtrlMatch = raceRegex.Match(m.Material);
+                    if (mtrlMatch.Success && mtrlMatch.Groups[1].Value != skinRaceString)
+                    {
+                        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");
+                    }
                 }
             }