diff --git a/BlendFile/Reader.cs b/BlendFile/Reader.cs
index dfcc8f2..5c97c40 100644
--- a/BlendFile/Reader.cs
+++ b/BlendFile/Reader.cs
@@ -49,7 +49,14 @@ public class Reader {
///
/// memory address in current system endianness
/// A object
- public FileBlock? GetBlock(long memAddr) => memBlocks.SkipWhile(x => x.Key < memAddr).FirstOrDefault().Value;
+ public FileBlock? GetBlock(long memAddr)
+ {
+
+ var blocks = OrderedBlocks.Where(x =>
+ memAddr >= x.MemAddr.ToPointer() && memAddr < x.MemAddr.ToPointer() + x.LenBody);
+
+ return blocks.MaxBy(x => x.LenBody);
+ }
///
/// Creates a new instance of the class
@@ -59,6 +66,8 @@ public class Reader {
_path = path;
}
+ public List OrderedBlocks;
+
///
/// Creates a new instance of the class
///
@@ -82,8 +91,17 @@ public class Reader {
var file = new KaitaiStream(_path);
var blend = new Kaitai.BlendFile(file);
- Console.WriteLine($"Start offset: 0x{blend.Blocks[0].MemAddr.ToPointer():X}");
+
+ OrderedBlocks = blend.Blocks.OrderBy(x => x.MemAddr.ToPointer()).ToList();
+
+ var startAddr = OrderedBlocks.Skip(1).SkipWhile(x => x.Code != "DNA1").First().MemAddr.ToPointer();
+ var endAddr = OrderedBlocks.Last().MemAddr.ToPointer();
+
+ Console.WriteLine($"Start offset: 0x{startAddr:X}");
+ Console.WriteLine($"End offset: 0x{endAddr:X}");
+ Console.WriteLine($"Size in MB: {((endAddr - startAddr) / 1024 / 1024)}");
+
bool isLe = blend.Hdr.Endian == Endian.Le;
//TODO: two blocks somehow have the same mem address... this sounds wrong.
blend.Blocks.ForEach(block => memBlocks.TryAdd(block.MemAddr.ToMemAddr(isLe), block));
@@ -130,6 +148,9 @@ public class Reader {
// get the pointer value
var addr = GetBlockFieldDataOffset(obj.Key.Item1, f.GetCustomAttribute()!.OriginalIndex,
fieldInfo);
+ // dereference the pointer
+ addr = pointers.GetValueOrDefault(addr);
+ if (addr == IntPtr.Zero) continue; // null pointer
// get the object that the pointer is pointing to if we've already converted it
var newobj = objects.GetValueOrDefault((addr, f.FieldType));
if (newobj != null)
@@ -140,7 +161,6 @@ public class Reader {
if (newobj != null) {
FillObject(addr, ref newobj, f.FieldType.GetFields());
f.SetValue(obj.Value, newobj);
- Objects.Add((addr, f.FieldType), newobj);
} // should never happen
else throw new NotSupportedException($"Type \"{f.FieldType}\" is unknown");
}
@@ -298,6 +318,7 @@ public class Reader {
for (int i = 0; i < arrayAttribute.Size; i += 8) {
var itemData = new byte[8];
Array.Copy(data, i, itemData, 0, 8);
+ if(itemData.ToPointer() == IntPtr.Zero) continue;
object? cellData = ActivateInstance(type);
FillObject(itemData.ToPointer(), ref cellData, type.GetFields());