Beta v2.3.4.8b

Author: Lunaretic

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -1869,6 +1869,35 @@ public static void SaveFullToFile(string filePath, XivRace race, List<TTModel> m
                                         }
                                     }
 
+                                    // Shape Parts
+                                    foreach (var shpKv in p.ShapeParts)
+                                    {
+                                        if (!shpKv.Key.StartsWith("shp_")) continue;
+                                        var shp = shpKv.Value;
+
+                                        query = @"insert into shape_vertices ( mesh,  part,  shape,  vertex_id,  position_x,  position_y,  position_z) 
+                                                                   values($mesh, $part, $shape, $vertex_id, $position_x, $position_y, $position_z);";
+                                        using (var cmd = new SQLiteCommand(query, db))
+                                        {
+                                            foreach (var vKv in shp.VertexReplacements)
+                                            {
+                                                var v = shp.Vertices[vKv.Value];
+                                                cmd.Parameters.AddWithValue("part", partIdx);
+                                                cmd.Parameters.AddWithValue("mesh", meshIdx);
+                                                cmd.Parameters.AddWithValue("shape", shpKv.Key);
+                                                cmd.Parameters.AddWithValue("vertex_id", vKv.Key);
+
+                                                cmd.Parameters.AddWithValue("position_x", v.Position.X);
+                                                cmd.Parameters.AddWithValue("position_y", v.Position.Y);
+                                                cmd.Parameters.AddWithValue("position_z", v.Position.Z);
+
+
+                                                cmd.ExecuteScalar();
+                                                vIdx++;
+                                            }
+                                        }
+                                    }
+
                                     partIdx++;
                                 }
 
@@ -1986,7 +2015,14 @@ public static TTModel FromRaw(XivMdl rawMdl, Action<bool, string> loggingFunctio
             ModelModifiers.MergeGeometryData(ttModel, rawMdl, loggingFunction);
             ModelModifiers.MergeAttributeData(ttModel, rawMdl, loggingFunction);
             ModelModifiers.MergeMaterialData(ttModel, rawMdl, loggingFunction);
-            ModelModifiers.MergeShapeData(ttModel, rawMdl, loggingFunction);
+            try
+            {
+                ModelModifiers.MergeShapeData(ttModel, rawMdl, loggingFunction);
+            } catch(Exception ex)
+            {
+                loggingFunction(true, "Unable to load shape data: " + ex.Message);
+                ModelModifiers.ClearShapeData(ttModel, loggingFunction);
+            }
             ttModel.Source = rawMdl.MdlPath;
 
             return ttModel;

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -3254,7 +3254,7 @@ internal async Task<byte[]> MakeNewMdlFile(TTModel ttModel, XivMdl ogMdl, Action
 
                             var shapeDataCount = 0;
                             // Write the shape data if it exists.
-                            if (ttModel.HasShapeData && !addedMesh && lodNum == 0)
+                            if (ttModel.HasShapeData && lodNum == 0)
                             {
                                 var entrySizeSum = meshData.MeshInfo.VertexDataEntrySize0 + meshData.MeshInfo.VertexDataEntrySize1;
                                 if (!isAlreadyModified)
@@ -3835,7 +3835,7 @@ internal async Task<byte[]> MakeNewMdlFile(TTModel ttModel, XivMdl ogMdl, Action
             }
             catch (Exception ex)
             {
-                throw ex;
+                throw;
             }
         }