diff --git a/BlendFile/Reader.cs b/BlendFile/Reader.cs
index 5c97c40..131c9c0 100644
--- a/BlendFile/Reader.cs
+++ b/BlendFile/Reader.cs
@@ -49,9 +49,7 @@ public class Reader {
///
/// memory address in current system endianness
/// A object
- public FileBlock? GetBlock(long memAddr)
- {
-
+ public FileBlock? GetBlock(long memAddr) {
var blocks = OrderedBlocks.Where(x =>
memAddr >= x.MemAddr.ToPointer() && memAddr < x.MemAddr.ToPointer() + x.LenBody);
@@ -91,17 +89,17 @@ public class Reader {
var file = new KaitaiStream(_path);
var blend = new Kaitai.BlendFile(file);
-
+
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));
@@ -139,7 +137,7 @@ public class Reader {
// get all fields that are pointers
var list = fieldInfo.Where(fldInfo =>
fldInfo.GetCustomAttributes().OfType().FirstOrDefault()?.IsPointer ?? false).ToList();
-
+
list.AddRange(fieldInfo.Where(fldInfo =>
fldInfo.GetCustomAttributes().OfType().FirstOrDefault()?.IsPointer ?? false));
@@ -149,7 +147,7 @@ public class Reader {
var addr = GetBlockFieldDataOffset(obj.Key.Item1, f.GetCustomAttribute()!.OriginalIndex,
fieldInfo);
// dereference the pointer
- addr = pointers.GetValueOrDefault(addr);
+ 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));
@@ -299,69 +297,67 @@ public class Reader {
return null;
}
- private static int[] CalculateArrayIndices(List sizes, int index)
- {
+ private static int[] CalculateArrayIndices(List sizes, int index) {
int[] indexArray = new int[sizes.Count];
for (int k = 0; k < sizes.Count; k++) {
- indexArray[k] = index/sizes[(k+1) ..].Aggregate(1, (a, b) => a * b) % sizes[k];
+ indexArray[k] = index / sizes[(k + 1) ..].Aggregate(1, (a, b) => a * b) % sizes[k];
}
-
+
return indexArray;
}
-
+
private Array FillPointersArray(DNAArrayAttribute arrayAttribute, byte[] data,
- Type type, List sizes)
- {
+ Type type, List sizes) {
//Create the array
var array = Array.CreateInstance(type, sizes.ToArray());
-
- for (int i = 0; i < arrayAttribute.Size; i += 8) {
+
+ 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;
+ if (itemData.ToPointer() == IntPtr.Zero) continue;
object? cellData = ActivateInstance(type);
FillObject(itemData.ToPointer(), ref cellData, type.GetFields());
- var indexArray = CalculateArrayIndices(sizes, i);
-
+ var indexArray = CalculateArrayIndices(sizes, i);
+
array.SetValue(cellData, indexArray);
}
-
+
return array;
}
- private Array FillNormalTypeArray(DNAArrayAttribute arrayAttribute, byte[] data, FileBlock block, Type type, List sizes, int itemLenght, int offset)
- {
+ private Array FillNormalTypeArray(DNAArrayAttribute arrayAttribute, byte[] data, FileBlock block, Type type,
+ List sizes, int itemLenght, int offset) {
var array = Array.CreateInstance(type, sizes.ToArray());
-
- for (int i = 0; i < arrayAttribute.Size; i += itemLenght) {
+
+ for (int i = 0; i < arrayAttribute.Size; i += itemLenght) {
var itemData = new byte[itemLenght];
Array.Copy(data, i, itemData, 0, itemLenght);
object? cellData = ConvertFieldData(itemData, arrayAttribute.OriginalType);
-
+
var indexArray = CalculateArrayIndices(sizes, i);
-
+
array.SetValue(cellData, indexArray);
}
return array;
}
- private Array FillCustomTypeArray(DNAArrayAttribute arrayAttribute, byte[] data, FileBlock block, Type type, List sizes, int itemLenght, int offset)
- {
+ private Array FillCustomTypeArray(DNAArrayAttribute arrayAttribute, byte[] data, FileBlock block, Type type,
+ List sizes, int itemLenght, int offset) {
var array = Array.CreateInstance(type, sizes.ToArray());
-
- for (int i = 0; i < arrayAttribute.Size; i += itemLenght) {
+
+ for (int i = 0; i < arrayAttribute.Size; i += itemLenght) {
var itemData = new byte[itemLenght];
Array.Copy(data, i, itemData, 0, itemLenght);
object? cellData = ActivateInstance(type);
FillObject(block, ref cellData, type.GetFields(), offset + i);
-
+
var indexArray = CalculateArrayIndices(sizes, i);
-
+
array.SetValue(cellData, indexArray);
}
-
+
return array;
}
@@ -375,24 +371,23 @@ public class Reader {
int dataLength = arrayAttribute.Size;
var data = new byte[dataLength];
Array.Copy((byte[])block.Body, offset, data, 0, dataLength);
-
+
//Gather Array type
var type = Type.GetType(arrayAttribute.OriginalType.ParseFType()) ?? dnaTypesDb[arrayAttribute.OriginalType];
if (type == null) throw new NotSupportedException($"Unknown type \"{arrayAttribute.OriginalType}\"");
-
- if(arrayAttribute.IsPointer){
+
+ if (arrayAttribute.IsPointer) {
return FillPointersArray(arrayAttribute, data, type, sizes);
}
-
- if (!dnaTypesDb.ContainsKey(arrayAttribute.OriginalType)) {
- return FillNormalTypeArray(arrayAttribute, data, block, type, sizes, arrayAttribute.OriginalType.ParseFSize()!.Value, offset.ToInt32());
+ if (!dnaTypesDb.ContainsKey(arrayAttribute.OriginalType)) {
+ return FillNormalTypeArray(arrayAttribute, data, block, type, sizes,
+ arrayAttribute.OriginalType.ParseFSize()!.Value, offset.ToInt32());
}
-
+
int itemLenght = type.GetCustomAttribute()?.Size ??
type.GetCustomAttribute()!.Size;
return FillCustomTypeArray(arrayAttribute, data, block, type, sizes, itemLenght, offset.ToInt32());
-
}
private object? ConvertListField(FileBlock block, FieldInfo field, DNAListAttribute attrib, IntPtr startOffset) {