Update v3.0.7.2

Author: Lunaretic

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -3519,6 +3519,7 @@ public static byte[] MakeUncompressedMdlFile(TTModel ttModel, XivMdl ogMdl, Acti
                     if (i < 2)
                     {
                         // First bounding box is bounds from the origin.
+
                         boundingBoxDataBlock.AddRange(BitConverter.GetBytes(i == 0 && minVect.X > 0 ? 0.0f : minVect.X));
                         boundingBoxDataBlock.AddRange(BitConverter.GetBytes(i == 0 && minVect.Y > 0 ? 0.0f : minVect.Y));
                         boundingBoxDataBlock.AddRange(BitConverter.GetBytes(i == 0 && minVect.Z > 0 ? 0.0f : minVect.Z));
@@ -3536,21 +3537,47 @@ public static byte[] MakeUncompressedMdlFile(TTModel ttModel, XivMdl ogMdl, Acti
                     }
                 }
 
-                // Afterwards there are is a bounding box for every bone.
-                // Again, we'll be lazy and just use the full model bounding box for each.
-                // Unsure what these are actually used for since there seems no difference
-                // in model function whether these have real data or no data.
+                var ogBbDict = new Dictionary<string, List<Vector4>>();
+
+                var boneId = 0;
+                foreach(var bbList in ogMdl.BoneBoundingBoxes)
+                {
+                    if (boneId >= ogMdl.PathData.BoneList.Count) continue;
+                    var bone = ogMdl.PathData.BoneList[boneId];
+
+                    var list = bbList;
+                    // Ignore old bad data.
+                    if (new Vector3(bbList[0][0], bbList[0][1], bbList[0][2]) == minVect
+                        && new Vector3(bbList[1][0], bbList[1][1], bbList[1][2]) == maxVect)
+                    {
+                        list = new List<Vector4>()
+                        {
+                            new Vector4(0,0,0,0),
+                            new Vector4(0,0,0,0),
+                        };
+                    }
+
+                    ogBbDict.Add(bone, list);
+                    boneId++;
+                }
+
+
+                // Bone bounding boxes.  We use a 1/10th model size cube for every bone.
+                // This gives us something functional, without having to do a bunch of wild and crazy
+                // parsing/math or demanding the user import models with a functional skeleton.
+                const float _Divisor = 20.0f;
                 var boneBoundingBoxDataBlock = new List<byte>();
                 for (var i = 0; i < ttModel.Bones.Count; i++)
                 {
-                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(minVect.X));
-                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(minVect.Y));
-                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(minVect.Z));
+                    var bone = ttModel.Bones[i];
+                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(-1 * modelRadius / _Divisor));
+                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(-1 * modelRadius / _Divisor));
+                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(-1 * modelRadius / _Divisor));
                     boundingBoxDataBlock.AddRange(BitConverter.GetBytes(1.0f));
 
-                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(maxVect.X));
-                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(maxVect.Y));
-                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(maxVect.Z));
+                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(modelRadius / _Divisor));
+                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(modelRadius / _Divisor));
+                    boundingBoxDataBlock.AddRange(BitConverter.GetBytes(modelRadius / _Divisor));
                     boundingBoxDataBlock.AddRange(BitConverter.GetBytes(1.0f));
                 }
 

xivModdingFramework/Models/ModelTextures/ModelTexture.cs

@@ -824,8 +824,9 @@ private static ShaderMapperDelegate GetShaderMapper(CustomModelColors colors, Xi
                 var bonusColor = GetSkinBonusColor(mtrl, colors);
                 var highlightColor = GetSkinBonusColor2(mtrl, colors);
                 var metalnessConst = 1 - GetFloatConst(mtrl, 0x59BDA0B1, 1.0f);
+                var isHroth = mtrl.ShaderKeys.FirstOrDefault(x => x.KeyId == 0x380CAED0 && x.Value == 0x57FF3B64) != null;
 
-                return (Color4 diffuse, Color4 normal, Color4 mask, Color4 index) => {
+                 return (Color4 diffuse, Color4 normal, Color4 mask, Color4 index) => {
                     var roughness = 0.0f;
                     var metalness = metalnessConst;
                     var occlusion = 1.0f;
@@ -888,6 +889,11 @@ private static ShaderMapperDelegate GetShaderMapper(CustomModelColors colors, Xi
                     var alpha = diffuse.Alpha * alphaMultiplier;
                     alpha = allowTranslucency ? alpha : (alpha < 1 ? 0 : 1);
 
+                    if (isHroth)
+                    {
+                        alpha = 1.0f;
+                    }
+
                     var emissive = emissiveColorMul;
                     var sss = mask.Blue;
 
@@ -1253,6 +1259,12 @@ private static Color4 GetConstColor(XivMtrl mtrl, uint constant, Color4 defaultC
         private static (Color4? Color, bool Blend) GetSkinBonusColor(XivMtrl mtrl, CustomModelColors colors)
         {
             Color4? bonusColor = null;
+            var compatMode = mtrl.ShaderKeys.FirstOrDefault(x => x.KeyId == 0xB616DC5A && x.Value == 0x600EF9DF) != null;
+            if (compatMode)
+            {
+                return (null, false);
+            }
+
 
             var bonusColorKey = mtrl.ShaderKeys.FirstOrDefault(x => x.KeyId == 0x380CAED0);
 
@@ -1288,6 +1300,11 @@ private static (Color4? Color, bool Blend) GetSkinBonusColor(XivMtrl mtrl, Custo
         private static (Color4? Color, bool Blend) GetSkinBonusColor2(XivMtrl mtrl, CustomModelColors colors)
         {
             Color4? bonusColor = null;
+            var compatMode = mtrl.ShaderKeys.FirstOrDefault(x => x.KeyId == 0xB616DC5A && x.Value == 0x600EF9DF) != null;
+            if (compatMode)
+            {
+                return (null, false);
+            }
 
             var bonusColorKey = mtrl.ShaderKeys.FirstOrDefault(x => x.KeyId == 0x380CAED0);
 

xivModdingFramework/Mods/RootCloner.cs

@@ -723,7 +723,13 @@ private static string UpdateFileName(XivDependencyRoot Source, XivDependencyRoot
                         dstSlot = srcSlot + dstSlot;
                     }
 
-                    file = file.Replace(srcSlot, dstSlot);
+                    if (!string.IsNullOrWhiteSpace(srcSlot))
+                    {
+                        file = file.Replace(srcSlot, dstSlot);
+                    } else if(!string.IsNullOrWhiteSpace(dstSlot))
+                    {
+                        file = file.Replace(match.Groups[0].Value, match.Groups[0].Value + "_" + dstSlot);
+                    }
                 }