Beta v2.3.4.7b

Author: Lunaretic

xivModdingFramework/Models/DataContainers/MdlModelData.cs

@@ -78,7 +78,7 @@ public class MdlModelData
         /// <summary>
         /// The total number of indices that the mesh shapes uses
         /// </summary>
-        public short ShapeDataCount { get; set; }
+        public ushort ShapeDataCount { get; set; }
 
         /// <summary>
         /// Unknown Usage

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -136,17 +136,8 @@ public void UpdateShapeData()
                     var baseVert = Vertices[rKv.Key];
                     var shapeVert = shp.Vertices[rKv.Value];
 
-                    shapeVert.Normal = baseVert.Normal;
-                    shapeVert.Tangent = baseVert.Tangent;
-                    shapeVert.Binormal = baseVert.Binormal;
-                    shapeVert.Handedness = baseVert.Handedness;
-                    shapeVert.UV1 = baseVert.UV1;
-                    shapeVert.UV2 = baseVert.UV2;
-
-                    Array.Copy(baseVert.VertexColor, shapeVert.VertexColor, 4);
-                    Array.Copy(baseVert.BoneIds, shapeVert.BoneIds, 4);
-                    Array.Copy(baseVert.Weights, shapeVert.Weights, 4);
-
+                    shp.Vertices[rKv.Value] = (TTVertex)baseVert.Clone();
+                    shp.Vertices[rKv.Value].Position = shapeVert.Position;
                 }
             }
         }
@@ -652,11 +643,11 @@ public short ShapePartCount
         /// <summary>
         /// Total Shape Data (Index) Entries
         /// </summary>
-        public short ShapeDataCount
+        public ushort ShapeDataCount
         {
             get
             {
-                short sum = 0;
+                uint sum = 0;
                 // This one is a little more complex.
                 foreach (var m in MeshGroups)
                 {
@@ -677,7 +668,13 @@ public short ShapeDataCount
                         }
                     }
                 }
-                return sum;
+                
+                if(sum > ushort.MaxValue)
+                {
+                    throw new Exception($"Model exceeds the maximum possible shape data indices.\n\nCurrent: {sum.ToString()}\nMaximum: {ushort.MaxValue.ToString()}");
+                }
+
+                return (ushort) sum;
             }
         }
 
@@ -1157,12 +1154,21 @@ public static TTModel LoadFromFile(string filePath, Action<bool, string> logging
                             vertex.Position.Y = reader.GetFloat("position_y");
                             vertex.Position.Z = reader.GetFloat("position_z");
 
+                            var repVert = part.Vertices[vertexId];
+                            if (repVert.Position.Equals(vertex.Position))
+                            {
+                                // Skip morphology which doesn't actually change anything.
+                                continue;
+                            }
+
                             if (!part.ShapeParts.ContainsKey(shapeName))
                             {
                                 var shpPt = new TTShapePart();
                                 shpPt.Name = shapeName;
                                 part.ShapeParts.Add(shapeName, shpPt);
                             }
+
+
                             part.ShapeParts[shapeName].VertexReplacements.Add(vertexId, part.ShapeParts[shapeName].Vertices.Count);
                             part.ShapeParts[shapeName].Vertices.Add(vertex);
 

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -481,7 +481,7 @@ public async Task<XivMdl> GetRawMdlData(string mdlPath, bool getOriginal = false
                     BoneListCount = br.ReadInt16(),
                     ShapeCount = br.ReadInt16(),
                     ShapePartCount = br.ReadInt16(),
-                    ShapeDataCount = br.ReadInt16(),
+                    ShapeDataCount = br.ReadUInt16(),
                     Unknown1 = br.ReadInt16(),
                     Unknown2 = br.ReadInt16(),
                     Unknown3 = br.ReadInt16(),
@@ -2518,7 +2518,7 @@ internal async Task<byte[]> MakeNewMdlFile(TTModel ttModel, XivMdl ogMdl, Action
                 modelDataBlock.AddRange(BitConverter.GetBytes((short)ttModel.MeshGroups.Count));
                 modelDataBlock.AddRange(BitConverter.GetBytes(ttModel.HasShapeData ? (short)ttModel.ShapeNames.Count : (short)0));
                 modelDataBlock.AddRange(BitConverter.GetBytes(ttModel.HasShapeData ? (short)ttModel.ShapePartCount : (short)0));
-                modelDataBlock.AddRange(BitConverter.GetBytes(ttModel.HasShapeData ? (short)ttModel.ShapeDataCount : (short)0));
+                modelDataBlock.AddRange(BitConverter.GetBytes(ttModel.HasShapeData ? (ushort)ttModel.ShapeDataCount : (ushort)0));
                 modelDataBlock.AddRange(BitConverter.GetBytes(ogModelData.Unknown1));
                 modelDataBlock.AddRange(BitConverter.GetBytes(ogModelData.Unknown2));
                 modelDataBlock.AddRange(BitConverter.GetBytes(ogModelData.Unknown3));