Skip to content

Commit 9930f45

Browse files
committed
remove old experimental code
1 parent 3d5b291 commit 9930f45

File tree

2 files changed

+0
-98
lines changed

2 files changed

+0
-98
lines changed

OpenLocoTool/DatFileParsing/LocoObject.cs

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,6 @@ public G1Dat(G1Header g1Header, List<G1Element32> g1Elements)
9393
public List<G1Element32> G1Elements { get; set; }
9494
}
9595

96-
//public class ByteLocoObject
97-
//{
98-
// public byte[] S5Header { get; }
99-
// public byte[] ObjectHeader { get; set; }
100-
// public byte[] FixedData { get; set; }
101-
// public byte[] VariableData { get; set; }
102-
// public byte[] StringTable { get; set; }
103-
// public byte[] G1Header { get; set; }
104-
// public byte[] G1Elements { get; set; }
105-
//}
106-
10796
public static class ObjectTypeFixedSize
10897
{
10998
public static int GetSize(ObjectType objectType)
@@ -147,49 +136,6 @@ public static int GetSize(ObjectType objectType)
147136
};
148137
}
149138

150-
public class LocoMemoryObject
151-
{
152-
public byte[] BytesSHeader { get; } = new byte[S5Header.StructLength];
153-
public byte[] BytesOHeader { get; } = new byte[ObjectHeader.StructLength];
154-
public byte[] BytesFixedData { get; set; }
155-
public byte[] BytesStringTable { get; set; }
156-
public byte[] BytesVariableData { get; set; }
157-
public byte[] BytesG1Header { get; set; } = new byte[G1Header.StructLength];
158-
public byte[] BytesG1Elements { get; set; }
159-
160-
public S5Header SHeader
161-
{
162-
get => S5Header.Read(BytesSHeader);
163-
set => value.Write().CopyTo(BytesSHeader);
164-
}
165-
166-
public ObjectHeader OHeader
167-
{
168-
get => ObjectHeader.Read(BytesOHeader);
169-
set => value.Write().CopyTo(BytesOHeader);
170-
}
171-
172-
//const int FixedDataOffset = S5Header.StructLength + ObjectHeader.StructLength;
173-
int FixedDataLength => ObjectTypeFixedSize.GetSize(SHeader.ObjectType);
174-
175-
public ILocoStruct FixedData
176-
{
177-
get => SawyerStreamReader.GetLocoStruct(SHeader.ObjectType, BytesFixedData.AsSpan()[0..FixedDataLength]);
178-
set => ByteWriter.WriteLocoStruct(value).CopyTo(BytesFixedData.AsSpan()[0..FixedDataLength]);
179-
}
180-
181-
// variable data
182-
183-
// string table
184-
185-
// graphics data
186-
//public G1Header G1Header
187-
//{
188-
// get => G1Header.Read(BytesG1Header);
189-
// set => value.Write().CopyTo(BytesG1Header);
190-
//}
191-
}
192-
193139
[TypeConverter(typeof(ExpandableObjectConverter))]
194140
public class LocoObject : ILocoObject
195141
{

OpenLocoTool/DatFileParsing/SawyerStreamReader.cs

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -45,50 +45,6 @@ public G1Dat LoadG1(string filename)
4545
return new G1Dat(g1Header, imageTable);
4646
}
4747

48-
public static LocoMemoryObject LoadFullExperimental(string filename)
49-
{
50-
var fullData = LoadBytesFromFile(filename);
51-
var locoMemoryObject = new LocoMemoryObject();
52-
53-
fullData[0..S5Header.StructLength].CopyTo(locoMemoryObject.BytesSHeader, 0);
54-
fullData[S5Header.StructLength..(S5Header.StructLength + ObjectHeader.StructLength)].CopyTo(locoMemoryObject.BytesOHeader, 0);
55-
56-
var remainingData = Decode(
57-
locoMemoryObject.OHeader.Encoding,
58-
fullData[(S5Header.StructLength + ObjectHeader.StructLength)..]);
59-
60-
var fixedDataLength = ObjectTypeFixedSize.GetSize(locoMemoryObject.SHeader.ObjectType);
61-
locoMemoryObject.BytesFixedData = new byte[fixedDataLength];
62-
remainingData[0..fixedDataLength].CopyTo(locoMemoryObject.BytesFixedData, 0);
63-
64-
remainingData = remainingData[fixedDataLength..];
65-
66-
var locoStruct = locoMemoryObject.FixedData;
67-
68-
// every object has a string table
69-
var (stringTable, stringTableBytesRead) = LoadStringTable(remainingData, locoStruct);
70-
remainingData = remainingData[stringTableBytesRead..];
71-
72-
if (locoStruct is ILocoStructStringTablePostLoad locoStructString)
73-
{
74-
locoStructString.LoadPostStringTable(stringTable);
75-
}
76-
77-
// variable data
78-
if (locoMemoryObject.FixedData is ILocoStructVariableData locoStructExtra)
79-
{
80-
remainingData = locoStructExtra.Load(remainingData).ToArray();
81-
}
82-
83-
// some objects have graphics data
84-
var (g1Header, imageTable, imageTableBytesRead) = LoadImageTable(remainingData);
85-
86-
// no more data
87-
//Verify.AreEqual(imageTableBytesRead, remainingData.Length);
88-
89-
return locoMemoryObject;
90-
}
91-
9248
// load file
9349
public ILocoObject LoadFull(string filename, bool loadExtra = true)
9450
{

0 commit comments

Comments
 (0)