progress on memory model

Author: BenjaminSutas

OpenLocoTool/DatFileParsing/LocoObject.cs

@@ -156,31 +156,45 @@ public static int GetSize(ObjectType objectType)
 
 	public class LocoMemoryObject
 	{
-		byte[] full; // the full bytes of the object, decoded
+		public byte[] BytesSHeader { get; } = new byte[S5Header.StructLength];
+		public byte[] BytesOHeader { get; } = new byte[ObjectHeader.StructLength];
+		public byte[] BytesFixedData { get; set; }
+		public byte[] BytesStringTable { get; set; }
+		public byte[] BytesVariableData { get; set; }
+		public byte[] BytesG1Header { get; set; } = new byte[G1Header.StructLength];
+		public byte[] BytesG1Elements { get; set; }
 
 		public S5Header SHeader
 		{
-			get => S5Header.Read(full.AsSpan()[0..S5Header.StructLength]);
-			set => value.Write().CopyTo(full.AsSpan()[0..S5Header.StructLength]);
+			get => S5Header.Read(BytesSHeader);
+			set => value.Write().CopyTo(BytesSHeader);
 		}
 
 		public ObjectHeader OHeader
 		{
-			get => ObjectHeader.Read(full.AsSpan()[0..ObjectHeader.StructLength]);
-			set => value.Write().CopyTo(full.AsSpan()[S5Header.StructLength..ObjectHeader.StructLength]);
+			get => ObjectHeader.Read(BytesOHeader);
+			set => value.Write().CopyTo(BytesOHeader);
 		}
 
-		int FixedDataOffset => S5Header.StructLength + ObjectHeader.StructLength;
+		const int FixedDataOffset = S5Header.StructLength + ObjectHeader.StructLength;
 		int FixedDataLength => ObjectTypeFixedSize.GetSize(SHeader.ObjectType);
+		
 		public ILocoStruct FixedData
 		{
-			get => SawyerStreamReader.GetLocoStruct(SHeader.ObjectType, full.AsSpan()[FixedDataOffset..FixedDataLength]);
-			set => ByteWriter.WriteLocoStruct(value).CopyTo(full.AsSpan()[FixedDataOffset..FixedDataLength]);
+			get => SawyerStreamReader.GetLocoStruct(SHeader.ObjectType, BytesFixedData.AsSpan()[FixedDataOffset..FixedDataLength]);
+			set => ByteWriter.WriteLocoStruct(value).CopyTo(BytesFixedData.AsSpan()[FixedDataOffset..FixedDataLength]);
 		}
 
 		// variable data
+
 		// string table
+
 		// graphics data
+		//public G1Header G1Header
+		//{
+		//	get => G1Header.Read(BytesG1Header);
+		//	set => value.Write().CopyTo(BytesG1Header);
+		//}
 	}
 
 	[TypeConverter(typeof(ExpandableObjectConverter))]

OpenLocoTool/DatFileParsing/SawyerStreamReader.cs

@@ -1,10 +1,12 @@
 using System.Diagnostics;
 using System.Numerics;
 using System.Reflection;
+using System.Reflection.PortableExecutable;
 using System.Text;
 using OpenLocoTool.Headers;
 using OpenLocoTool.Objects;
 using OpenLocoToolCommon;
+using Zenith.Core;
 
 namespace OpenLocoTool.DatFileParsing
 {
@@ -43,9 +45,53 @@ public IG1Dat LoadG1(string filename)
 			return new G1Dat(g1Header, imageTable);
 		}
 
+		public void LoadFullExperimental(string filename)
+		{
+			var fullData = LoadBytesFromFile(filename);
+			var locoMemoryObject = new LocoMemoryObject();
+
+			fullData[0..S5Header.StructLength].CopyTo(locoMemoryObject.BytesSHeader, 0);
+			fullData[S5Header.StructLength..(S5Header.StructLength + ObjectHeader.StructLength)].CopyTo(locoMemoryObject.BytesOHeader, 0);
+
+			var remainingData = Decode(
+				locoMemoryObject.OHeader.Encoding,
+				fullData[(S5Header.StructLength + ObjectHeader.StructLength)..]);
+
+			var fixedDataLength = ObjectTypeFixedSize.GetSize(locoMemoryObject.SHeader.ObjectType);
+			remainingData[0..fixedDataLength].CopyTo(locoMemoryObject.BytesFixedData, 0);
+			
+			remainingData = remainingData[fixedDataLength..];
+
+			var locoStruct = locoMemoryObject.FixedData;
+
+			// every object has a string table
+			var (stringTable, stringTableBytesRead) = LoadStringTable(remainingData, locoStruct);
+			remainingData = remainingData[stringTableBytesRead..];
+
+			if (locoStruct is ILocoStructStringTablePostLoad locoStructString)
+			{
+				locoStructString.LoadPostStringTable(stringTable);
+			}
+
+			// variable data
+			if (locoMemoryObject.FixedData is ILocoStructVariableData locoStructExtra)
+			{
+				remainingData = locoStructExtra.Load(remainingData).ToArray();
+			}
+			
+			// some objects have graphics data
+			var (g1Header, imageTable, imageTableBytesRead) = LoadImageTable(remainingData);
+			Verify.AreEqual(imageTableBytesRead, remainingData.Length);
+
+			// no more data
+
+		}
+
 		// load file
 		public ILocoObject LoadFull(string filename, bool loadExtra = true)
 		{
+			LoadFullExperimental(filename);
+
 			ReadOnlySpan<byte> fullData = LoadBytesFromFile(filename);
 
 			// make openlocotool useful objects

OpenLocoTool/Headers/ObjectHeader.cs

@@ -9,7 +9,7 @@ namespace OpenLocoTool.Headers
 	[LocoStructSize(0x05)]
 	public record ObjectHeader(SawyerEncoding Encoding, uint32_t DataLength)
 	{
-		public static int StructLength => 0x05;
+		public const int StructLength = 0x05;
 
 		public static ObjectHeader Read(ReadOnlySpan<byte> data)
 		{

OpenLocoTool/Headers/S5Header.cs

@@ -21,7 +21,7 @@ public S5Header(uint32_t flags, string name, uint32_t checksum)
 			: this(name, checksum)
 			=> Flags = flags;
 
-		public static int StructLength => 0x10;
+		public const int StructLength = 0x10;
 
 		public uint32_t Flags { get; set; }