Add bounding box updates to fast v6 upgrades.

Author: Lunaretic

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -2400,7 +2400,7 @@ public static void SaveFullToFile(string filePath, XivRace race, List<TTModel> m
         private static void WriteVertex(TTVertex v, SQLiteConnection db, int meshIdx, int partIdx, int vIdx)
         {
             var query = @"insert into vertices ( mesh,  part,  vertex_id,  position_x,  position_y,  position_z,  normal_x,  normal_y,  normal_z,  binormal_x,  binormal_y,  binormal_z,  tangent_x,  tangent_y,  tangent_z,  color_r,  color_g,  color_b,   color_a,  color2_r,  color2_g,  color2_b,  color2_a,  uv_1_u,  uv_1_v,  uv_2_u,  uv_2_v,  bone_1_id,  bone_1_weight,  bone_2_id,  bone_2_weight,  bone_3_id,  bone_3_weight,  bone_4_id,  bone_4_weight,  bone_5_id,  bone_5_weight,  bone_6_id,  bone_6_weight,  bone_7_id,  bone_7_weight,  bone_8_id,  bone_8_weight,  uv_3_u,  uv_3_v) 
-                                        values ($mesh, $part, $vertex_id, $position_x, $position_y, $position_z, $normal_x, $normal_y, $normal_z, $binormal_x, $binormal_y, $binormal_z, $tangent_x, $tangent_y, $tangent_z, $color_r, $color_g, $color_b, $color1_a, $color2_r, $color2_g, $color2_b, $color2_a, $uv_1_u, $uv_1_v, $uv_2_u, $uv_2_v, $bone_1_id, $bone_1_weight, $bone_2_id, $bone_2_weight, $bone_3_id, $bone_3_weight, $bone_4_id, $bone_4_weight, $bone_5_id, $bone_5_weight, $bone_6_id, $bone_6_weight, $bone_7_id, $bone_7_weight, $bone_8_id, $bone_8_weight, $uv_3_u, $uv_3_v);";
+                                        values ($mesh, $part, $vertex_id, $position_x, $position_y, $position_z, $normal_x, $normal_y, $normal_z, $binormal_x, $binormal_y, $binormal_z, $tangent_x, $tangent_y, $tangent_z, $color_r, $color_g, $color_b,  $color_a, $color2_r, $color2_g, $color2_b, $color2_a, $uv_1_u, $uv_1_v, $uv_2_u, $uv_2_v, $bone_1_id, $bone_1_weight, $bone_2_id, $bone_2_weight, $bone_3_id, $bone_3_weight, $bone_4_id, $bone_4_weight, $bone_5_id, $bone_5_weight, $bone_6_id, $bone_6_weight, $bone_7_id, $bone_7_weight, $bone_8_id, $bone_8_weight, $uv_3_u, $uv_3_v);";
             using (var cmd = new SQLiteCommand(query, db))
             {
                 cmd.Parameters.AddWithValue("part", partIdx);

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -1130,6 +1130,40 @@ public static XivMdl GetXivMdl(byte[] mdlData, string mdlPath = "")
         }
 
 
+        internal static List<Vector4> ReadBoundingBox(BinaryReader br)
+        {
+            var ret = new List<Vector4>();
+
+            ret.Add(new Vector4(
+                br.ReadSingle(),
+                br.ReadSingle(),
+                br.ReadSingle(),
+                br.ReadSingle()
+            ));
+
+            ret.Add(new Vector4(
+                br.ReadSingle(),
+                br.ReadSingle(),
+                br.ReadSingle(),
+                br.ReadSingle()
+            ));
+
+            return ret;
+        }
+        internal static void WriteBoundingBox(BinaryWriter bw, List<Vector4> bb)
+        {
+            bw.Write(BitConverter.GetBytes(bb[0][0]));
+            bw.Write(BitConverter.GetBytes(bb[0][1]));
+            bw.Write(BitConverter.GetBytes(bb[0][2]));
+            bw.Write(BitConverter.GetBytes(bb[0][3]));
+
+            bw.Write(BitConverter.GetBytes(bb[1][0]));
+            bw.Write(BitConverter.GetBytes(bb[1][1]));
+            bw.Write(BitConverter.GetBytes(bb[1][2]));
+            bw.Write(BitConverter.GetBytes(bb[1][3]));
+        }
+
+
         /// <summary>
         /// Extracts and calculates the full MTRL paths from a given MDL file.
         /// A material variant of -1 gets the materials for ALL variants,

xivModdingFramework/Mods/EndwalkerUpgrade.cs

@@ -421,13 +421,57 @@ private static bool FastMdlv6Upgrade(BinaryReader br, BinaryWriter bw, long offs
                 idx++;
             }
 
-            var end = bonesetStart + boneSetSize;
+            // Net size of old bone sets
+            var end = bonesetStart + (((64 * 2) + 4) * mdlData.BoneSetCount);
             while(bw.BaseStream.Position < end)
             {
                 // Fill out the remainder of the block with 0s.
                 bw.Write((byte)0);
             }
 
+            var endOfBoneSet = bw.BaseStream.Position;
+
+            // Shape Data is next.
+            var shpCount = mdlData.ShapeCount;
+            var shpParts = mdlData.ShapePartCount;
+            var shpIndices = mdlData.ShapeDataCount;
+
+            var endOfShapeHeaders = endOfBoneSet + (shpCount * 16);
+            var endOfShapePartHeaders = endOfShapeHeaders + (shpParts * 12);
+            var endOfShapeIndices = endOfShapePartHeaders + (shpIndices * 4);
+
+            // Part Bone Sets
+            br.BaseStream.Seek(endOfShapeIndices, SeekOrigin.Begin);
+            var partBoneSets = br.ReadInt32();
+            var endOfPartBones = br.BaseStream.Position + (partBoneSets);
+
+            // Padding
+            br.BaseStream.Seek(endOfPartBones, SeekOrigin.Begin);
+            var padding = br.ReadByte();
+            br.BaseStream.Seek(br.BaseStream.Position + padding, SeekOrigin.Begin);
+
+            // Bounding Boxes
+            var baseBox = Mdl.ReadBoundingBox(br);
+            var mdlBox = Mdl.ReadBoundingBox(br);
+            var waterBox = Mdl.ReadBoundingBox(br);
+            var shadowBox = Mdl.ReadBoundingBox(br);
+
+            const float _Divisor = 20.0f;
+            var min = -1 * (mdlData.Radius / _Divisor);
+            var max = (mdlData.Radius / _Divisor);
+            var bb = new List<Vector4>()
+            {
+                new Vector4(min, min, min, 1.0f),
+                new Vector4(max, max, max, 1.0f),
+            };
+
+            // Write new bone bounding boxes.
+            bw.BaseStream.Seek(br.BaseStream.Position, SeekOrigin.Begin);
+            for(int i = 0; i < mdlData.BoneCount; i++)
+            {
+                Mdl.WriteBoundingBox(bw, bb);
+            }
+
             return true;
         }