Remove duped files (#26)

* remove duped files * Update Maple2.File.Parser.csproj
AngeloTadeucci · Jun 17, 2024 · 364efa8 · 364efa8
1 parent 9076273
commit 364efa8
Show file tree

Hide file tree

Showing 21 changed files with 49 additions and 1,007 deletions.
diff --git a/Maple2.File.IO/Nif/PhysXMesh.cs b/Maple2.File.IO/Nif/PhysXMesh.cs
@@ -5,11 +5,11 @@
 namespace Maple2.File.IO.Nif;
 
 public struct PhysXMeshFace {
-    public byte Vert0;
-    public byte Vert1;
-    public byte Vert2;
+    public uint Vert0;
+    public uint Vert1;
+    public uint Vert2;
 
-    public PhysXMeshFace(byte vert0 = 0, byte vert1 = 0, byte vert2 = 0) {
+    public PhysXMeshFace(uint vert0 = 0, uint vert1 = 0, uint vert2 = 0) {
         Vert0 = vert0;
         Vert1 = vert1;
         Vert2 = vert2;
@@ -67,7 +67,7 @@ private NxsMeshType ParseConvexMesh(EndianReader reader) {
 
         byte[] unkSection1 = reader.ReadBytes(8);
 
-        // Sanity check to check a known piece of data for potential changes 
+        // Sanity check to check a known piece of data for potential changes
         if (!unkSection1.SequenceEqual(unkDataSection1)) {
             throw new InvalidDataException("Unknown PhysX convex mesh data layout");
         }
@@ -76,7 +76,7 @@ private NxsMeshType ParseConvexMesh(EndianReader reader) {
 
         byte[] unkSection2 = reader.ReadBytes(4);
 
-        // Sanity check to check a known piece of data for potential changes 
+        // Sanity check to check a known piece of data for potential changes
         if (!unkSection2.SequenceEqual(unkDataSection2)) {
             throw new InvalidDataException("Unknown PhysX convex mesh data layout");
         }
@@ -102,11 +102,27 @@ private NxsMeshType ParseConvexMesh(EndianReader reader) {
         uint unk10 = reader.ReadAdjustedUInt32();
 
         for (int i = 0; i < faceCount; ++i) {
-            PhysXMeshFace face = new PhysXMeshFace(
-                reader.ReadByte(),
-                reader.ReadByte(),
-                reader.ReadByte()
-            );
+            PhysXMeshFace face;
+
+            if (vertexCount < 0x100) {
+                face = new PhysXMeshFace(
+                    reader.ReadByte(),
+                    reader.ReadByte(),
+                    reader.ReadByte()
+                );
+            } else if (vertexCount < 0x10000) {
+                face = new PhysXMeshFace(
+                    reader.ReadUInt16(),
+                    reader.ReadUInt16(),
+                    reader.ReadUInt16()
+                );
+            } else {
+                face = new PhysXMeshFace(
+                    reader.ReadUInt32(),
+                    reader.ReadUInt32(),
+                    reader.ReadUInt32()
+                );
+            }
 
             Faces.Add(face);
 
@@ -141,11 +157,27 @@ private NxsMeshType ParseTriangleMesh(EndianReader reader) {
         }
 
         for (int i = 0; i < faceCount; ++i) {
-            PhysXMeshFace face = new PhysXMeshFace(
-                reader.ReadByte(),
-                reader.ReadByte(),
-                reader.ReadByte()
-            );
+            PhysXMeshFace face;
+
+            if (vertexCount < 0x100) {
+                face = new PhysXMeshFace(
+                    reader.ReadByte(),
+                    reader.ReadByte(),
+                    reader.ReadByte()
+                );
+            } else if (vertexCount < 0x10000) {
+                face = new PhysXMeshFace(
+                    reader.ReadUInt16(),
+                    reader.ReadUInt16(),
+                    reader.ReadUInt16()
+                );
+            } else {
+                face = new PhysXMeshFace(
+                    reader.ReadUInt32(),
+                    reader.ReadUInt32(),
+                    reader.ReadUInt32()
+                );
+            }
 
             Faces.Add(face);
 

diff --git a/Maple2.File.IO/Nif/NifM2dArchive.cs → Maple2.File.IO/Nif/PrefixedM2dReader.cs b/Maple2.File.IO/Nif/NifM2dArchive.cs → Maple2.File.IO/Nif/PrefixedM2dReader.cs
diff --git a/Maple2.File.Parser/Enum/NxActorFlag.cs b/Maple2.File.Parser/Enum/NxActorFlag.cs
diff --git a/Maple2.File.Parser/Enum/NxMeshShapeFlags.cs b/Maple2.File.Parser/Enum/NxMeshShapeFlags.cs
diff --git a/Maple2.File.Parser/Enum/NxPagingMode.cs b/Maple2.File.Parser/Enum/NxPagingMode.cs
diff --git a/Maple2.File.Parser/Enum/NxShapeFlag.cs b/Maple2.File.Parser/Enum/NxShapeFlag.cs
diff --git a/Maple2.File.Parser/Enum/NxShapeType.cs b/Maple2.File.Parser/Enum/NxShapeType.cs
diff --git a/Maple2.File.Parser/Enum/NxsMeshType.cs b/Maple2.File.Parser/Enum/NxsMeshType.cs
diff --git a/Maple2.File.Parser/Enum/PhysXMeshFlags.cs b/Maple2.File.Parser/Enum/PhysXMeshFlags.cs
diff --git a/Maple2.File.Parser/Maple2.File.Parser.csproj b/Maple2.File.Parser/Maple2.File.Parser.csproj
@@ -13,7 +13,7 @@
         <PackageTags>MapleStory2, File, Parser, m2d, xml</PackageTags>
         <!-- Use following lines to write the generated files to disk. -->
         <EmitCompilerGeneratedFiles Condition=" '$(Configuration)' == 'Debug' ">true</EmitCompilerGeneratedFiles>
-        <PackageVersion>2.1.19</PackageVersion>
+        <PackageVersion>2.1.20</PackageVersion>
         <TargetFramework>net8.0</TargetFramework>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/Maple2.File.Parser/Nif/Endian.cs b/Maple2.File.Parser/Nif/Endian.cs
diff --git a/Maple2.File.Parser/Nif/NiPhysXActorDesc.cs b/Maple2.File.Parser/Nif/NiPhysXActorDesc.cs