Merge pull request #45 from burninrubber0/console-support

Add console support
burninrubber0 · Aug 27, 2023 · 6433e91 · 6433e91
2 parents 51f23e0 + 1d2259a
commit 6433e91
Show file tree

Hide file tree

Showing 43 changed files with 1,093 additions and 1,364 deletions.
diff --git a/BaseHandlers/AptData.cs b/BaseHandlers/AptData.cs
@@ -304,7 +304,7 @@ public class Character
         // Data
         public CharacterData Data;
 
-        private static Frame ReadFrame(BinaryReader br, uint dataStart)
+        private static Frame ReadFrame(BinaryReader2 br, uint dataStart)
         {
             Frame frame = new Frame();
 
@@ -435,7 +435,7 @@ private static Frame ReadFrame(BinaryReader br, uint dataStart)
             return frame;
         }
 
-        public static Character Read(BinaryReader br, uint dataStart)
+        public static Character Read(BinaryReader2 br, uint dataStart)
         {
             Character result = new Character();
 
@@ -669,7 +669,7 @@ public static Character Read(BinaryReader br, uint dataStart)
             return result;
         }
 
-        public void Write(BinaryWriter bw)
+        public void Write(BinaryWriter2 bw)
         {
             bw.Write((uint)Type);
             bw.Write(Signature);
@@ -779,7 +779,8 @@ public bool Read(BundleEntry entry, ILoader loader = null)
         public bool Write(BundleEntry entry)
         {
             MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter2 bw = new BinaryWriter2(ms);
+            bw.BigEndian = entry.Console;
 
             // TODO: Write
 

diff --git a/BaseHandlers/IDList.cs b/BaseHandlers/IDList.cs
@@ -66,7 +66,8 @@ public bool Read(BundleEntry entry, ILoader loader = null)
         public bool Write(BundleEntry entry)
         {
             MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter2 bw = new BinaryWriter2(ms);
+            bw.BigEndian = entry.Console;
 
             bw.Write(ReferenceEntryIDOffset);
             bw.Write(Unknown2);

diff --git a/BaseHandlers/InstanceList.cs b/BaseHandlers/InstanceList.cs
@@ -25,7 +25,7 @@ public class ModelInstance
 
         public Vector4 Rotation => Transform.ExtractRotation().ToAxisAngle();
 
-        public static ModelInstance Read(BinaryReader br)
+        public static ModelInstance Read(BinaryReader2 br)
         {
             ModelInstance result = new ModelInstance();
 
@@ -38,7 +38,7 @@ public static ModelInstance Read(BinaryReader br)
             return result;
         }
 
-        public void Write(BinaryWriter bw)
+        public void Write(BinaryWriter2 bw)
         {
             bw.Write(ModelEntryPtr);
             bw.Write(Unknown2);
@@ -120,7 +120,8 @@ public bool Read(BundleEntry entry, ILoader loader = null)
         public bool Write(BundleEntry entry)
         {
             MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter2 bw = new BinaryWriter2(ms);
+            bw.BigEndian = entry.Console;
 
             bw.Write(Unknown1);
             bw.Write(Instances.Count);

diff --git a/BaseHandlers/ProgressionData.cs b/BaseHandlers/ProgressionData.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using BundleFormat;
@@ -603,7 +603,8 @@ public bool Read(BundleEntry entry, ILoader loader = null)
         public bool Write(BundleEntry entry)
         {
             MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter2 bw = new BinaryWriter2(ms);
+            bw.BigEndian = entry.Console;
 
             // TODO: Write
 

diff --git a/BaseHandlers/Renderable.cs b/BaseHandlers/Renderable.cs
@@ -128,7 +128,7 @@ public void BuildModel()
             Model = new Model(meshes);
         }
 
-        public VertexData ReadVertex(BinaryReader br, VertexAttribute attribute)
+        public VertexData ReadVertex(BinaryReader2 br, VertexAttribute attribute)
         {
             switch (attribute.Size) // We don't use type here. This is wrong tbh.
             {
@@ -196,7 +196,7 @@ public VertexData ReadVertex(BinaryReader br, VertexAttribute attribute)
             return new VertexData();
         }
 
-        public void ReadBody(BinaryReader br)
+        public void ReadBody(BinaryReader2 br)
         {
             for (int i = 0; i < NumIndices; i++)
             {

diff --git a/BaseHandlers/StreetData.cs b/BaseHandlers/StreetData.cs
@@ -263,7 +263,8 @@ public bool Read(BundleEntry entry, ILoader loader = null)
         public bool Write(BundleEntry entry)
         {
             MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter2 bw = new BinaryWriter2(ms);
+            bw.BigEndian = entry.Console;
 
             bw.Write(Unknown1);
             long fileSizeOffset = bw.BaseStream.Position;