- Bump Version numbers

- Fix for potential crash/deadlock when switching between certain models.
- Fix for Shape Data not being Racially Deformed.

Author: Lunaretic

xivModdingFramework/Cache/XivCache.cs

@@ -29,7 +29,7 @@ public static class XivCache
         private static GameInfo _gameInfo;
         private static DirectoryInfo _dbPath;
         private static DirectoryInfo _rootCachePath;
-        public static readonly Version CacheVersion = new Version("1.0.1.6");
+        public static readonly Version CacheVersion = new Version("1.0.2.0");
         private const string dbFileName = "mod_cache.db";
         private const string rootCacheFileName = "item_sets.db";
         private const string creationScript = "CreateCacheDB.sql";

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -1093,6 +1093,48 @@ public static void ApplyRacialDeform(TTModel model, XivRace targetRace, bool inv
                             v.Tangent = tangent;
                         }
                     }
+
+                    // Same thing, but for the Shape Data parts.
+                    foreach(var p in m.ShapeParts)
+                    {
+                        foreach(var v in p.Vertices)
+                        {
+                            Vector3 position = Vector3.Zero;
+                            Vector3 normal = Vector3.Zero;
+                            Vector3 binormal = Vector3.Zero;
+                            Vector3 tangent = Vector3.Zero;
+
+                            // And each bone in that vertex.
+                            for (var b = 0; b < 4; b++)
+                            {
+                                if (v.Weights[b] == 0) continue;
+                                var boneName = m.Bones[v.BoneIds[b]];
+                                var boneWeight = (v.Weights[b]) / 255f;
+
+                                var matrix = Matrix.Identity;
+                                var normalMatrix = Matrix.Identity;
+                                matrix = deformations[boneName];
+                                normalMatrix = normalmatrixes[boneName];
+
+                                if (invert)
+                                {
+                                    matrix = inverted[boneName];
+                                    normalMatrix = invertednormalmatrixes[boneName];
+                                }
+
+
+                                position += MatrixTransform(v.Position, matrix) * boneWeight;
+                                normal += MatrixTransform(v.Normal, normalMatrix) * boneWeight;
+                                binormal += MatrixTransform(v.Binormal, normalMatrix) * boneWeight;
+                                tangent += MatrixTransform(v.Tangent, normalMatrix) * boneWeight;
+                            }
+
+                            v.Position = position;
+                            v.Normal = normal;
+                            v.Binormal = binormal;
+                            v.Tangent = tangent;
+                        }
+                    }
                 }
             }
             catch(Exception ex)