GTS re-serialization support, part 1

Author: Norbyte

LSLib/LS/BinUtils.cs

@@ -13,8 +13,7 @@ public static T ReadStruct<T>(BinaryReader reader)
         {
             T outStruct;
             int count = Marshal.SizeOf(typeof(T));
-            byte[] readBuffer = new byte[count];
-            readBuffer = reader.ReadBytes(count);
+            byte[] readBuffer = reader.ReadBytes(count);
             GCHandle handle = GCHandle.Alloc(readBuffer, GCHandleType.Pinned);
             outStruct = (T)Marshal.PtrToStructure(handle.AddrOfPinnedObject(), typeof(T));
             handle.Free();
@@ -25,8 +24,7 @@ public static void ReadStructs<T>(BinaryReader reader, T[] elements)
         {
             int elementSize = Marshal.SizeOf(typeof(T));
             int bytes = elementSize * elements.Length;
-            byte[] readBuffer = new byte[bytes];
-            readBuffer = reader.ReadBytes(bytes);
+            byte[] readBuffer = reader.ReadBytes(bytes);
             GCHandle handle = GCHandle.Alloc(readBuffer, GCHandleType.Pinned);
             var addr = handle.AddrOfPinnedObject();
             for (var i = 0; i < elements.Length; i++)
@@ -47,6 +45,22 @@ public static void WriteStruct<T>(BinaryWriter writer, ref T inStruct)
             writer.Write(writeBuffer);
         }
 
+        public static void WriteStructs<T>(BinaryWriter writer, T[] elements)
+        {
+            int elementSize = Marshal.SizeOf(typeof(T));
+            int bytes = elementSize * elements.Length;
+            byte[] writeBuffer = new byte[bytes];
+            GCHandle handle = GCHandle.Alloc(writeBuffer, GCHandleType.Pinned);
+            var addr = handle.AddrOfPinnedObject();
+            for (var i = 0; i < elements.Length; i++)
+            {
+                var elementAddr = new IntPtr(addr.ToInt64() + elementSize * i);
+                Marshal.StructureToPtr(elements[i], elementAddr, true);
+            }
+            handle.Free();
+            writer.Write(writeBuffer);
+        }
+
         public static NodeAttribute ReadAttribute(NodeAttribute.DataType type, BinaryReader reader)
         {
             var attr = new NodeAttribute(type);

LSLib/VirtualTextures/PageFile.cs

@@ -48,7 +48,7 @@ public void Dispose()
 
         private byte[] DoUnpackTileBC(GTPChunkHeader header, int outputSize)
         {
-            var parameterBlock = TileSet.ParameterBlocks[header.ParameterBlockID];
+            var parameterBlock = (GTSBCParameterBlock)TileSet.ParameterBlocks[header.ParameterBlockID];
             if (parameterBlock.CompressionName1 != "lz77" || parameterBlock.CompressionName2 != "fastlz0.1.0")
             {
                 throw new InvalidDataException($"Unsupported BC compression format: '{parameterBlock.CompressionName1}', '{parameterBlock.CompressionName2}'");
@@ -65,6 +65,8 @@ private byte[] DoUnpackTileBC(GTPChunkHeader header, int outputSize)
 
         private byte[] DoUnpackTileUniform(GTPChunkHeader header)
         {
+            var parameterBlock = (GTSUniformParameterBlock)TileSet.ParameterBlocks[header.ParameterBlockID];
+
             byte[] img = new byte[TileSet.Header.TileWidth * TileSet.Header.TileHeight];
             Array.Clear(img, 0, img.Length);
             return img;
@@ -76,8 +78,8 @@ public byte[] UnpackTile(int pageIndex, int chunkIndex, int outputSize)
             var chunkHeader = BinUtils.ReadStruct<GTPChunkHeader>(Reader);
             switch (chunkHeader.Codec)
             {
-                case 0: return DoUnpackTileUniform(chunkHeader);
-                case 9: return DoUnpackTileBC(chunkHeader, outputSize);
+                case GTSCodec.Uniform: return DoUnpackTileUniform(chunkHeader);
+                case GTSCodec.BC: return DoUnpackTileBC(chunkHeader, outputSize);
                 default: throw new InvalidDataException($"Unsupported codec: {chunkHeader.Codec}");
             }
         }