Merge pull request #79 from senko-forks/pr-zoomies

Speed up model loading (Zoomies)

Author: Lunaretic

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -348,7 +348,6 @@ public static async Task<XivMdl> GetXivMdl(string mdlPath, bool getOriginal = fa
 
         public static XivMdl GetXivMdl(byte[] mdlData, string mdlPath = "")
         {
-
             var xivMdl = new XivMdl { MdlPath = mdlPath };
             int totalNonNullMaterials = 0;
             var getShapeData = true;
@@ -1019,7 +1018,7 @@ public static XivMdl GetXivMdl(byte[] mdlData, string mdlPath = "")
                 }
 
 
-                    var lodNum = 0;
+                var lodNum = 0;
                 var totalMeshNum = 0;
                 foreach (var lod in xivMdl.LoDList)
                 {
@@ -1031,16 +1030,12 @@ public static XivMdl GetXivMdl(byte[] mdlData, string mdlPath = "")
                     {
                         throw new Exception("Failed to parse some meshes in previous LoD level.");
                     }
-
-                    // Seek to the start of the LoD.
-                    br.BaseStream.Seek(lod.VertexDataOffset, SeekOrigin.Begin);
-                    var LoDStart = br.BaseStream.Position;
 
                     var mIdx = 0;
 
                     foreach (var meshData in meshDataList)
                     {
-                        MdlVertexReader.ReadVertexData(br, meshData, lod.VertexDataOffset, lod.IndexDataOffset);
+                        MdlVertexReader.ReadVertexData(mdlData, meshData, lod.VertexDataOffset, lod.IndexDataOffset);
 
                         mIdx++;
                         totalMeshNum++;

xivModdingFramework/Models/FileTypes/MdlVertexReader.cs

@@ -13,7 +13,7 @@ namespace xivModdingFramework.Models.FileTypes
 {
     internal static class MdlVertexReader
     {
-        public static void ReadVertexData(BinaryReader br, MeshData meshData, int lodVertexOffset, int lodIndexOffset)
+        public static void ReadVertexData(byte[] mdlData, MeshData meshData, int lodVertexOffset, int lodIndexOffset)
         {
             var vertexData = new VertexData();
 
@@ -24,45 +24,37 @@ public static void ReadVertexData(BinaryReader br, MeshData meshData, int lodVer
             var block1Offset = meshData.MeshInfo.VertexDataOffset1 + lodVertexOffset;
             var indexOffset = (meshData.MeshInfo.IndexDataOffset * 2) + lodIndexOffset;
 
-            br.BaseStream.Seek(block0Offset, SeekOrigin.Begin);
-            var block0Sorted = info.Where(x => x.DataBlock == 0).OrderBy(x => x.DataOffset);
-            for(int i = 0; i < vertexCount; i++)
+            var block0Sorted = info.Where(x => x.DataBlock == 0).OrderBy(x => x.DataOffset).ToList();
+            var block1Sorted = info.Where(x => x.DataBlock == 1).OrderBy(x => x.DataOffset).ToList();
+
+            var block0Reader = new BinaryReader(new MemoryStream(mdlData, block0Offset, vertexCount * meshData.MeshInfo.VertexDataEntrySize0));
+            for (int i = 0; i < vertexCount; i++)
             {
-                foreach(var entry in block0Sorted)
+                foreach (var entry in block0Sorted)
                 {
-                    ReadData(vertexData, br, entry.DataUsage, entry.DataType, entry.Count);
+                    ReadData(vertexData, block0Reader, entry.DataUsage, entry.DataType, entry.Count);
                 }
             }
 
-            if(br.BaseStream.Position != block0Offset + (vertexCount * meshData.MeshInfo.VertexDataEntrySize0))
-            {
+            if (block0Reader.BaseStream.Position != block0Reader.BaseStream.Length)
                 throw new InvalidDataException("Vertex Data Size Mismatch. Some part(s) of the vertex data in stream 0 were not read properly.");
-            }
 
-            br.BaseStream.Seek(block1Offset, SeekOrigin.Begin);
-            var block1Sorted = info.Where(x => x.DataBlock == 1).OrderBy(x => x.DataOffset);
+            var block1Reader = new BinaryReader(new MemoryStream(mdlData, block1Offset, vertexCount * meshData.MeshInfo.VertexDataEntrySize1));
             for (int i = 0; i < vertexCount; i++)
             {
                 foreach (var entry in block1Sorted)
                 {
-                    ReadData(vertexData, br, entry.DataUsage, entry.DataType, entry.Count);
+                    ReadData(vertexData, block1Reader, entry.DataUsage, entry.DataType, entry.Count);
                 }
             }
 
-            if (br.BaseStream.Position != block1Offset + (vertexCount * meshData.MeshInfo.VertexDataEntrySize1))
-            {
+            if (block1Reader.BaseStream.Position != block1Reader.BaseStream.Length)
                 throw new InvalidDataException("Vertex Data Size Mismatch. Some part(s) of the vertex data in stream 1 were not read properly.");
-            }
 
-            br.BaseStream.Seek(indexOffset, SeekOrigin.Begin);
+            var indexReader = new BinaryReader(new MemoryStream(mdlData, indexOffset, indexCount * 2));
             for (var i = 0; i < indexCount; i++)
             {
-                vertexData.Indices.Add(br.ReadUInt16());
-            }
-
-            if (br.BaseStream.Position != indexOffset + (indexCount * 2))
-            {
-                throw new InvalidDataException("Index Size Mismatch. Some part(s) of the index data were not read properly.");
+                vertexData.Indices.Add(indexReader.ReadUInt16());
             }
 
             meshData.VertexData = vertexData;

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -421,7 +421,6 @@ public static void MergeGeometryData(TTModel ttModel, XivMdl rawMdl, Action<bool
 
                 for (var pi = 0; pi < totalParts; pi++)
                 {
-
                     var ttPart = new TTMeshPart();
                     ttMesh.Parts.Add(ttPart);
                     ttPart.Name = "Part " + partIdx;
@@ -431,24 +430,21 @@ public static void MergeGeometryData(TTModel ttModel, XivMdl rawMdl, Action<bool
                     var indexStart = fakePart == false ? basePart.IndexOffset - baseMesh.MeshInfo.IndexDataOffset : 0;
                     var indexCount = fakePart == false ? basePart.IndexCount : baseMesh.MeshInfo.IndexCount;
 
-                    var indices = baseMesh.VertexData.Indices.GetRange(indexStart, indexCount);
+                    var indices = baseMesh.VertexData.Indices.Skip(indexStart).Take(indexCount);
 
                     // Get the Vertices unique to this part.
-                    var uniqueVertexIdSet = new SortedSet<int>(indices); // Maximum possible amount is # of indices, though likely it is less.
-
-                    foreach (var ind in indices)
-                    {
-                        uniqueVertexIdSet.Add(ind);
-                    }
+                    var uniqueVertexIdSet = new HashSet<int>(indices);
 
                     // Need it as a list to have index access to it.
-                    var uniqueVertexIds = uniqueVertexIdSet.ToList();
+                    var uniqueVertexIds = new List<int>(uniqueVertexIdSet);
+                    uniqueVertexIds.Sort();
 
                     // Maps old vertex ID to new vertex ID.
-                    var vertDict = new Dictionary<int, int>(uniqueVertexIds.Count);
+                    var vertMap = new int[uniqueVertexIds.Max() + 1];
 
                     // Now we need to loop through, copy over the vertex data, keeping track of the new vertex IDs.
                     ttPart.Vertices = new List<TTVertex>(uniqueVertexIds.Count);
+
                     for (var i = 0; i < uniqueVertexIds.Count; i++)
                     {
                         var oldVertexId = uniqueVertexIds[i];
@@ -556,14 +552,14 @@ public static void MergeGeometryData(TTModel ttModel, XivMdl rawMdl, Action<bool
                         }
 
                         ttPart.Vertices.Add(ttVert);
-                        vertDict.Add(oldVertexId, ttPart.Vertices.Count - 1);
+                        vertMap[oldVertexId] = ttPart.Vertices.Count - 1;
                     }
 
                     // Now we need to copy in the triangle indices, pointing to the new, part-level vertex IDs.
-                    ttPart.TriangleIndices = new List<int>(indices.Count);
+                    ttPart.TriangleIndices = new List<int>(indexCount);
                     foreach (var oldVertexId in indices)
                     {
-                        ttPart.TriangleIndices.Add(vertDict[oldVertexId]);
+                        ttPart.TriangleIndices.Add(vertMap[oldVertexId]);
                     }
 
                     // Ok, gucci now.