Merge pull request #11 from gul4sch/master

Added Phys File Type, Added more M2 chunks (some unfinished), changed some smaller things

Warcraft.NET.Docs/ChunkAvailability.cs

@@ -107,7 +107,6 @@ internal static class ChunkAvailability
                         "M2", new()
                         {
                             "MD21",
-                            "PFID",
                             "SFID",
                             "AFID",
                             "BFID",
@@ -136,6 +135,32 @@ internal static class ChunkAvailability
                         }
                     },
                 }
+            },{
+                "phys", new ()
+                {
+                    {
+                        "PHYS", new()
+                        {
+                            "PHYS",
+                            "PHYT",
+                            "BDY4",
+                            "SHP2",
+                            "BOXS",
+                            "CAPS",
+                            "SPHS",
+                            "PLYT",
+                            "JOIN",
+                            "WLJ3",
+                            "SPHJ",
+                            "SHJ2",
+                            "PRS2",
+                            "REV2",
+                            "DSTJ",
+                            "SHOJ",
+                            "PHYV",
+                        }
+                    },
+                }
             },
             {
                 "tex", new ()

Warcraft.NET.Docs/Program.cs

@@ -1,4 +1,5 @@
 using Warcraft.NET.Docs.Steps;
+using Warcraft.NET.Files.Skel;
 
 namespace Warcraft.NET.Docs
 {

Warcraft.NET/Extensions/ExtendedIO.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Text;
 using Warcraft.NET.Exceptions;
 using Warcraft.NET.Files.Interfaces;
@@ -78,6 +79,22 @@ public static Vector3 ReadVector3(this BinaryReader binaryReader, AxisConfigurat
             }
         }
 
+        /// <summary>
+        /// Reads a 48-byte <see cref="Mat3x4"/> structure from the data stream and advances the position of the stream by
+        /// 48 bytes.
+        /// </summary>
+        /// <returns>The Mat3x4.</returns>
+        /// <param name="binaryReader">The reader.</param>
+        /// <param name="convertTo">Which axis configuration the read mat3x4 should be converted to.</param>
+        public static Matrix3x4 ReadMatrix3x4(this BinaryReader binaryReader, AxisConfiguration convertTo = AxisConfiguration.YUp)
+        {
+            var a = binaryReader.ReadVector3(convertTo);
+            var b = binaryReader.ReadVector3(convertTo);
+            var c = binaryReader.ReadVector3(convertTo);
+            var pos = binaryReader.ReadVector3(convertTo);
+            return new Matrix3x4(a, b, c, pos);
+        }
+
         /// <summary>
         /// Reads a 12-byte <see cref="Rotator"/> from the data stream and advances the position of the stream by
         /// 12 bytes.
@@ -283,37 +300,37 @@ public static ShortVector3 ReadShortVector3(this BinaryReader binaryReader, Axis
             switch (convertTo)
             {
                 case AxisConfiguration.Native:
-                {
-                    return new ShortVector3(binaryReader.ReadInt16(), binaryReader.ReadInt16(), binaryReader.ReadInt16());
-                }
+                    {
+                        return new ShortVector3(binaryReader.ReadInt16(), binaryReader.ReadInt16(), binaryReader.ReadInt16());
+                    }
                 case AxisConfiguration.YUp:
-                {
-                    var x1 = binaryReader.ReadInt16();
-                    var y1 = binaryReader.ReadInt16();
-                    var z1 = binaryReader.ReadInt16();
+                    {
+                        var x1 = binaryReader.ReadInt16();
+                        var y1 = binaryReader.ReadInt16();
+                        var z1 = binaryReader.ReadInt16();
 
-                    var x = x1;
-                    var y = z1;
-                    var z = (short)-y1;
+                        var x = x1;
+                        var y = z1;
+                        var z = (short)-y1;
 
-                    return new ShortVector3(x, y, z);
-                }
+                        return new ShortVector3(x, y, z);
+                    }
                 case AxisConfiguration.ZUp:
-                {
-                    var x1 = binaryReader.ReadInt16();
-                    var y1 = binaryReader.ReadInt16();
-                    var z1 = binaryReader.ReadInt16();
+                    {
+                        var x1 = binaryReader.ReadInt16();
+                        var y1 = binaryReader.ReadInt16();
+                        var z1 = binaryReader.ReadInt16();
 
-                    var x = x1;
-                    var y = (short)-z1;
-                    var z = y1;
+                        var x = x1;
+                        var y = (short)-z1;
+                        var z = y1;
 
-                    return new ShortVector3(x, y, z);
-                }
+                        return new ShortVector3(x, y, z);
+                    }
                 default:
-                {
-                    throw new ArgumentOutOfRangeException(nameof(convertTo), convertTo, null);
-                }
+                    {
+                        throw new ArgumentOutOfRangeException(nameof(convertTo), convertTo, null);
+                    }
             }
         }
 
@@ -432,6 +449,32 @@ public static void WriteChunkSignature(this BinaryWriter binaryWriter, string si
             }
         }
 
+        /// <summary>
+        /// Writes a struct to the BinaryWriter.
+        /// </summary>
+        /// <typeparam name="T">The type of struct to write.</typeparam>
+        /// <param name="binaryWriter">The BinaryWriter instance.</param>
+        /// <param name="value">The struct value to write.</param>
+        public static void WriteStruct<T>(this BinaryWriter binaryWriter, T value) where T : struct
+        {
+            int size = Marshal.SizeOf<T>();
+            byte[] bytes = new byte[size];
+
+            IntPtr ptr = Marshal.AllocHGlobal(size);
+            try
+            {
+                Marshal.StructureToPtr(value, ptr, true);
+                Marshal.Copy(ptr, bytes, 0, size);
+            }
+            finally
+            {
+                Marshal.FreeHGlobal(ptr);
+            }
+
+            // Write the padded bytes
+            binaryWriter.Write(bytes);
+        }
+
         /// <summary>
         /// Writes a 12-byte <see cref="Rotator"/> value to the data stream in Pitch/Yaw/Roll order.
         /// </summary>
@@ -560,6 +603,25 @@ public static void WriteVector3(this BinaryWriter binaryWriter, Vector3 vector,
             }
         }
 
+        /// <summary>
+        /// Writes a 48-byte <see cref="Matrix3x4"/> value to the data stream. This function
+        /// </summary>
+        /// <param name="binaryWriter">The current <see cref="BinaryWriter"/> object.</param>
+        /// <param name="matrix">The Vector to write.</param>
+        /// <param name="storeAs">Which axis configuration the read vector should be stored as.</param>
+        public static void WriteMatrix3x4(this BinaryWriter binaryWriter, Matrix3x4 matrix, AxisConfiguration storeAs = AxisConfiguration.ZUp)
+        {
+            var column1 = matrix.RotationX * matrix.Scale.X;
+            var column2 = matrix.RotationY * matrix.Scale.Y;
+            var column3 = matrix.RotationZ * matrix.Scale.Z;
+            var column4 = matrix.Position;
+
+            binaryWriter.WriteVector3(column1, storeAs);
+            binaryWriter.WriteVector3(column2, storeAs);
+            binaryWriter.WriteVector3(column3, storeAs);
+            binaryWriter.WriteVector3(column4, storeAs);
+        }
+
         /// <summary>
         /// Writes a 16-byte <see cref="Quaternion"/> to the data stream.
         /// </summary>
@@ -597,23 +659,23 @@ public static void WriteShortVector3(this BinaryWriter binaryWriter, ShortVector
             {
                 case AxisConfiguration.Native:
                 case AxisConfiguration.YUp:
-                {
-                    binaryWriter.Write(vector.X);
-                    binaryWriter.Write(vector.Y);
-                    binaryWriter.Write(vector.Z);
-                    break;
-                }
+                    {
+                        binaryWriter.Write(vector.X);
+                        binaryWriter.Write(vector.Y);
+                        binaryWriter.Write(vector.Z);
+                        break;
+                    }
                 case AxisConfiguration.ZUp:
-                {
-                    binaryWriter.Write(vector.X);
-                    binaryWriter.Write((short)(vector.Z * -1));
-                    binaryWriter.Write(vector.Y);
-                    break;
-                }
+                    {
+                        binaryWriter.Write(vector.X);
+                        binaryWriter.Write((short)(vector.Z * -1));
+                        binaryWriter.Write(vector.Y);
+                        break;
+                    }
                 default:
-                {
-                    throw new ArgumentOutOfRangeException(nameof(storeAs), storeAs, null);
-                }
+                    {
+                        throw new ArgumentOutOfRangeException(nameof(storeAs), storeAs, null);
+                    }
             }
         }
 

Warcraft.NET/Files/M2/Chunks/BfA/LDV1.cs

@@ -0,0 +1,69 @@
+using System.Collections.Generic;
+using System.IO;
+using Warcraft.NET.Attribute;
+using Warcraft.NET.Files.Interfaces;
+using Warcraft.NET.Files.M2.Entries;
+
+namespace Warcraft.NET.Files.M2.Chunks.BfA
+{
+    [AutoDocChunk(AutoDocChunkVersionHelper.VersionAfterLegion, AutoDocChunkVersionHelper.VersionBeforeBfA)]
+    public class LDV1 : IIFFChunk, IBinarySerializable
+    {
+        /// <summary>
+        /// Holds the binary chunk signature.
+        /// </summary>
+        public const string Signature = "LDV1";
+
+        /// <summary>
+        /// Gets or sets the Lod Data Version 1 Entries
+        /// </summary>
+        public List<LDV1Entry> LDV1Entries = new();
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="LDV1"/>
+        /// </summary>
+        public LDV1() { }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="LDV1"/>
+        /// </summary>
+        /// <param name="inData">ExtendedData.</param>
+        public LDV1(byte[] inData) => LoadBinaryData(inData);
+
+        /// <inheritdoc />
+        public string GetSignature() { return Signature; }
+
+        /// <inheritdoc />
+        public uint GetSize() { return (uint)Serialize().Length; }
+
+        /// <inheritdoc />
+        public void LoadBinaryData(byte[] inData)
+        {
+            {
+                using (var ms = new MemoryStream(inData))
+                using (var br = new BinaryReader(ms))
+                {
+                    var LDV1count = br.BaseStream.Length / LDV1Entry.GetSize();
+                    for (var i = 0; i < LDV1count; ++i)
+                    {
+                        LDV1Entries.Add(new LDV1Entry(br.ReadBytes(LDV1Entry.GetSize())));
+                    }
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public byte[] Serialize(long offset = 0)
+        {
+            using (var ms = new MemoryStream())
+            using (var bw = new BinaryWriter(ms))
+            {
+                foreach (LDV1Entry obj in LDV1Entries)
+                {
+                    bw.Write(obj.Serialize());
+                }
+                return ms.ToArray();
+            }
+        }
+    }
+}

Warcraft.NET/Files/M2/Chunks/BfA/TXID.cs

@@ -61,4 +61,4 @@ public byte[] Serialize(long offset = 0)
             }
         }
     }
-}
+}

Warcraft.NET/Files/M2/Chunks/BfA/WFV1.cs

@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.IO;
+using Warcraft.NET.Attribute;
+using Warcraft.NET.Files.Interfaces;
+using Warcraft.NET.Files.M2.Entries;
+
+namespace Warcraft.NET.Files.M2.Chunks.BfA
+{
+    [AutoDocChunk(AutoDocChunkVersionHelper.VersionAfterLegion, AutoDocChunkVersionHelper.VersionBeforeBfA)]
+    public class WFV1 : IIFFChunk, IBinarySerializable
+    {
+        /// <summary>
+        /// Holds the binary chunk signature.
+        /// </summary>
+        public const string Signature = "WFV1";
+
+        /// <summary>
+        /// Gets or sets the full data (deserialization NYI)
+        /// </summary>
+        public byte[] Data;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="WFV1"/>
+        /// </summary>
+        public WFV1() { }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="WFV1"/>
+        /// </summary>
+        /// <param name="inData">ExtendedData.</param>
+        public WFV1(byte[] inData) => LoadBinaryData(inData);
+
+        /// <inheritdoc />
+        public string GetSignature() { return Signature; }
+
+        /// <inheritdoc />
+        public uint GetSize() { return (uint)Serialize().Length; }
+
+        /// <inheritdoc />
+        public void LoadBinaryData(byte[] inData)
+        {
+            Data = inData;
+        }
+
+        /// <inheritdoc />
+        public byte[] Serialize(long offset = 0)
+        {
+            return Data;
+        }
+    }
+}