Update 2.3.0.3

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/Cache/XivDependencyGraph.cs

@@ -276,6 +276,11 @@ public async Task<XivMtrl> GetMtrlData(string mtrlFile, int materialSet = -1, in
 
             mtrlOffset = await index.GetDataOffset(mtrlPath);
 
+            if(mtrlOffset == 0)
+            {
+                return null;
+            }
+
             var mtrlData = await GetMtrlData(mtrlOffset, mtrlPath, dxVersion);
 
             return mtrlData;

xivModdingFramework/Materials/FileTypes/Mtrl.cs

@@ -1557,6 +1557,11 @@ public void SetFullModelDBMetaData(string filePath, string fullModelName)
         /// <returns></returns>
         public static TTModel FromRaw(XivMdl rawMdl, Action<bool, string> loggingFunction = null)
         {
+            if(rawMdl == null)
+            {
+                return null;
+            }
+
             if (loggingFunction == null)
             {
                 loggingFunction = ModelModifiers.NoOp;

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -433,7 +433,7 @@ public async Task<XivMdl> GetRawMdlData(string mdlPath, bool getOriginal = false
 
             if (offset == 0)
             {
-                throw new Exception($"Could not find offset for {mdlPath}");
+                return null;
             }
 
             var mdlData = await dat.GetType3Data(offset, _dataFile);

xivModdingFramework/Models/FileTypes/Mdl.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)
@@ -1287,6 +1329,7 @@ public static void CalculateTangents(TTModel model, Action<bool, string> logging
             {
                 loggingFunction = NoOp;
             }
+            if (model == null) return;
 
             loggingFunction(false, "Calculating Tangents...");
             var hasTangents = model.MeshGroups.Any(x => x.Parts.Any(x => x.Vertices.Any(x => x.Tangent != Vector3.Zero)));

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -56,6 +56,8 @@ public class CustomModelColors
         // Optional values.
         public Color? HairHighlightColor;
 
+        public bool InvertNormalGreen = false;
+
 
 
         // One for each colorset row.  Null for undyed.
@@ -75,6 +77,7 @@ public CustomModelColors()
             FurnitureColor = new Color(141, 60, 204, 255);
 
             HairHighlightColor = new Color(77, 126, 240, 255);
+            InvertNormalGreen = false;
 
             DyeColors = new List<Color?>(16);
             for(int i = 0; i < 16; i++)
@@ -211,6 +214,11 @@ await Task.Run(() =>
                         baseSpecularColor = new Color(specularPixels[i - 3], specularPixels[i - 2], specularPixels[i - 1], specularPixels[i]);
                     }
 
+                    if(colors != null && colors.InvertNormalGreen)
+                    {
+                        baseNormalColor[1] = (byte)(255 - baseNormalColor[1]);
+                    }
+
                     byte colorsetValue = baseNormalColor.A;
 
                     // Calculate real colors from the inputs and shader.

xivModdingFramework/Models/ModelTextures/ModelTexture.cs

@@ -985,6 +985,53 @@ await Task.Run(() =>
             return fileHashesList;
         }
 
+        /// <summary>
+        /// Gets the entire universe of hash pairs (folder, file) for a datafile.
+        /// </summary>
+        public async Task<Dictionary<int, HashSet<int>>> GetAllHashes(XivDataFile dataFile)
+        {
+            var ret = new Dictionary<int, HashSet<int>>();
+
+            // These are the offsets to relevant data
+            const int fileCountOffset = 1036;
+            const int dataStartOffset = 2048;
+
+            var indexPath = Path.Combine(_gameDirectory.FullName, $"{dataFile.GetDataFileName()}{IndexExtension}");
+
+            await _semaphoreSlim.WaitAsync();
+            try
+            {
+                await Task.Run(() =>
+                {
+                    using (var br = new BinaryReader(File.OpenRead(indexPath)))
+                    {
+                        br.BaseStream.Seek(fileCountOffset, SeekOrigin.Begin);
+                        var totalFiles = br.ReadInt32();
+
+                        br.BaseStream.Seek(dataStartOffset, SeekOrigin.Begin);
+                        for (var i = 0; i < totalFiles; i += 16)
+                        {
+                            var hashedFile = br.ReadInt32();
+                            var folderPathHash = br.ReadInt32();
+                            if(!ret.ContainsKey(folderPathHash))
+                            {
+                                ret.Add(folderPathHash, new HashSet<int>());
+                            }
+                            ret[folderPathHash].Add(hashedFile);
+
+                            br.ReadBytes(4);
+                            br.ReadBytes(4);
+                        }
+                    }
+                });
+            }
+            finally
+            {
+                _semaphoreSlim.Release();
+            }
+            return ret;
+        }
+
         /// <summary>
         /// Get all the file hash and file offset in a given folder 
         /// </summary>