finish up experimental object loading

Author: LeftofZen

OpenLocoTool/DatFileParsing/LocoObject.cs

@@ -176,13 +176,13 @@ public ObjectHeader OHeader
 			set => value.Write().CopyTo(BytesOHeader);
 		}
 
-		const 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, BytesFixedData.AsSpan()[FixedDataOffset..FixedDataLength]);
-			set => ByteWriter.WriteLocoStruct(value).CopyTo(BytesFixedData.AsSpan()[FixedDataOffset..FixedDataLength]);
+			get => SawyerStreamReader.GetLocoStruct(SHeader.ObjectType, BytesFixedData.AsSpan()[0..FixedDataLength]);
+			set => ByteWriter.WriteLocoStruct(value).CopyTo(BytesFixedData.AsSpan()[0..FixedDataLength]);
 		}
 
 		// variable data

OpenLocoTool/DatFileParsing/SawyerStreamReader.cs

@@ -45,7 +45,7 @@ public IG1Dat LoadG1(string filename)
 			return new G1Dat(g1Header, imageTable);
 		}
 
-		public void LoadFullExperimental(string filename)
+		public static LocoMemoryObject LoadFullExperimental(string filename)
 		{
 			var fullData = LoadBytesFromFile(filename);
 			var locoMemoryObject = new LocoMemoryObject();
@@ -58,8 +58,9 @@ public void LoadFullExperimental(string filename)
 				fullData[(S5Header.StructLength + ObjectHeader.StructLength)..]);
 
 			var fixedDataLength = ObjectTypeFixedSize.GetSize(locoMemoryObject.SHeader.ObjectType);
+			locoMemoryObject.BytesFixedData = new byte[fixedDataLength];
 			remainingData[0..fixedDataLength].CopyTo(locoMemoryObject.BytesFixedData, 0);
-			
+
 			remainingData = remainingData[fixedDataLength..];
 
 			var locoStruct = locoMemoryObject.FixedData;
@@ -78,19 +79,20 @@ public void LoadFullExperimental(string filename)
 			{
 				remainingData = locoStructExtra.Load(remainingData).ToArray();
 			}
-			
+
 			// some objects have graphics data
 			var (g1Header, imageTable, imageTableBytesRead) = LoadImageTable(remainingData);
-			Verify.AreEqual(imageTableBytesRead, remainingData.Length);
 
 			// no more data
+			//Verify.AreEqual(imageTableBytesRead, remainingData.Length);
 
+			return locoMemoryObject;
 		}
 
 		// load file
 		public ILocoObject LoadFull(string filename, bool loadExtra = true)
 		{
-			LoadFullExperimental(filename);
+			//LoadFullExperimental(filename);
 
 			ReadOnlySpan<byte> fullData = LoadBytesFromFile(filename);
 
@@ -151,7 +153,7 @@ public ILocoObject LoadFull(string filename, bool loadExtra = true)
 			return newObj;
 		}
 
-		(StringTable table, int bytesRead) LoadStringTable(ReadOnlySpan<byte> data, ILocoStruct locoStruct)
+		static (StringTable table, int bytesRead) LoadStringTable(ReadOnlySpan<byte> data, ILocoStruct locoStruct)
 		{
 			var stringAttr = locoStruct.GetType().GetCustomAttribute(typeof(LocoStringCountAttribute), inherit: false) as LocoStringCountAttribute;
 			var stringsInTable = stringAttr?.Count ?? 1;
@@ -177,7 +179,7 @@ public ILocoObject LoadFull(string filename, bool loadExtra = true)
 
 					if (strings.ContainsKey((i, lang)))
 					{
-						Logger.Error($"Key {(i, lang)} already exists (this shouldn't happen)");
+						//Logger.Error($"Key {(i, lang)} already exists (this shouldn't happen)");
 						break;
 					}
 					else

OpenLocoToolGui/MainForm.cs

@@ -453,6 +453,10 @@ void tv_AfterSelect(object sender, TreeViewEventArgs e)
 			{
 				var filename = e.Node.Name;
 				CurrentUIObject = model.LoadAndCacheObject(filename);
+
+				//var exp = SawyerStreamReader.LoadFullExperimental(filename);
+				//pgObject.SelectedObject = exp;
+
 				LoadDataDump(filename);
 			}
 		}