mirrors/OpenTS2
1
0
Fork 0
mirror of https://github.com/LazyDuchess/OpenTS2.git synced 2025-01-23 00:31:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up field iteration in OBJCodec.

Browse source
This commit is contained in:
LazyDuchess 2023-02-01 15:21:14 -03:00
parent c105d206a9
commit 1482af268f
2 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Assets/Scripts/OpenTS2/Content/DBPF/ObjectDefinitionAsset.cs
View file

@ -34,7 +34,7 @@ namespace OpenTS2.Content.DBPF
"DiagonalSelectorGUID1",
"DiagonalSelectorGUID2",
"GridAlignedSelectorGUID1",
"DiagonalSelectorGUID2",
"GridAlignedSelectorGUID2",
"ObjOwnershipFlags",
"IgnoreGlobalSimField",
"CannotMoveOutWith",
@ -126,6 +126,26 @@ namespace OpenTS2.Content.DBPF
}
}
public uint DiagonalSelectorGUID
{
get { return (uint)(DiagonalSelectorGUID2 << 16) + (uint)DiagonalSelectorGUID1; }
set
{
DiagonalSelectorGUID1 = (ushort)(value & 0xFFFF);
DiagonalSelectorGUID2 = (ushort)(value >> 16);
}
}
public uint GridAlignedSelectorGUID
{
get { return (uint)(GridAlignedSelectorGUID2 << 16) + (uint)GridAlignedSelectorGUID1; }
set
{
GridAlignedSelectorGUID1 = (ushort)(value & 0xFFFF);
GridAlignedSelectorGUID2 = (ushort)(value >> 16);
}
}
public uint ProxyGUID
{
get { return (uint)(ProxyGUID2 << 16) + (uint)ProxyGUID1; }

21
Assets/Scripts/OpenTS2/Files/Formats/DBPF/OBJDCodec.cs
View file

@ -29,26 +29,19 @@ namespace OpenTS2.Files.Formats.DBPF
var asset = new ObjectDefinitionAsset();
var stream = new MemoryStream(bytes);
var reader = IoBuffer.FromStream(stream, ByteOrder.LITTLE_ENDIAN);
int offset = 0;
asset.FileName = reader.ReadNullTerminatedUTF8();
offset += 64 * sizeof(byte);
object BoxedAsset = RuntimeHelpers.GetObjectValue(asset);
reader.Seek(SeekOrigin.Begin, 64);
foreach (string element in ObjectDefinitionAsset.Fields)
var assetType = typeof(ObjectDefinitionAsset);
foreach (var field in ObjectDefinitionAsset.Fields)
{
reader.Seek(SeekOrigin.Begin, offset);
if (element != "unused")
{
asset.GetType().GetProperty(element).SetValue(BoxedAsset, reader.ReadUInt16());
}
offset += sizeof(short);
if (field == "unused")
continue;
assetType.GetProperty(field).SetValue(asset, reader.ReadUInt16());
}
asset = (ObjectDefinitionAsset)BoxedAsset;
return asset;
}
}