Formatting (again)
This commit is contained in:
@@ -49,9 +49,7 @@ public class Reader {
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="memAddr">memory address in current system endianness</param>
|
/// <param name="memAddr">memory address in current system endianness</param>
|
||||||
/// <returns>A <see cref="Kaitai.BlendFile.FileBlock"/> object</returns>
|
/// <returns>A <see cref="Kaitai.BlendFile.FileBlock"/> object</returns>
|
||||||
public FileBlock? GetBlock(long memAddr)
|
public FileBlock? GetBlock(long memAddr) {
|
||||||
{
|
|
||||||
|
|
||||||
var blocks = OrderedBlocks.Where(x =>
|
var blocks = OrderedBlocks.Where(x =>
|
||||||
memAddr >= x.MemAddr.ToPointer() && memAddr < x.MemAddr.ToPointer() + x.LenBody);
|
memAddr >= x.MemAddr.ToPointer() && memAddr < x.MemAddr.ToPointer() + x.LenBody);
|
||||||
|
|
||||||
@@ -91,17 +89,17 @@ public class Reader {
|
|||||||
var file = new KaitaiStream(_path);
|
var file = new KaitaiStream(_path);
|
||||||
var blend = new Kaitai.BlendFile(file);
|
var blend = new Kaitai.BlendFile(file);
|
||||||
|
|
||||||
|
|
||||||
OrderedBlocks = blend.Blocks.OrderBy(x => x.MemAddr.ToPointer()).ToList();
|
OrderedBlocks = blend.Blocks.OrderBy(x => x.MemAddr.ToPointer()).ToList();
|
||||||
|
|
||||||
var startAddr = OrderedBlocks.Skip(1).SkipWhile(x => x.Code != "DNA1").First().MemAddr.ToPointer();
|
var startAddr = OrderedBlocks.Skip(1).SkipWhile(x => x.Code != "DNA1").First().MemAddr.ToPointer();
|
||||||
var endAddr = OrderedBlocks.Last().MemAddr.ToPointer();
|
var endAddr = OrderedBlocks.Last().MemAddr.ToPointer();
|
||||||
|
|
||||||
Console.WriteLine($"Start offset: 0x{startAddr:X}");
|
Console.WriteLine($"Start offset: 0x{startAddr:X}");
|
||||||
Console.WriteLine($"End offset: 0x{endAddr:X}");
|
Console.WriteLine($"End offset: 0x{endAddr:X}");
|
||||||
Console.WriteLine($"Size in MB: {((endAddr - startAddr) / 1024 / 1024)}");
|
Console.WriteLine($"Size in MB: {((endAddr - startAddr) / 1024 / 1024)}");
|
||||||
|
|
||||||
|
|
||||||
bool isLe = blend.Hdr.Endian == Endian.Le;
|
bool isLe = blend.Hdr.Endian == Endian.Le;
|
||||||
//TODO: two blocks somehow have the same mem address... this sounds wrong.
|
//TODO: two blocks somehow have the same mem address... this sounds wrong.
|
||||||
blend.Blocks.ForEach(block => memBlocks.TryAdd(block.MemAddr.ToMemAddr(isLe), block));
|
blend.Blocks.ForEach(block => memBlocks.TryAdd(block.MemAddr.ToMemAddr(isLe), block));
|
||||||
@@ -139,7 +137,7 @@ public class Reader {
|
|||||||
// get all fields that are pointers
|
// get all fields that are pointers
|
||||||
var list = fieldInfo.Where(fldInfo =>
|
var list = fieldInfo.Where(fldInfo =>
|
||||||
fldInfo.GetCustomAttributes().OfType<DNAFieldAttribute>().FirstOrDefault()?.IsPointer ?? false).ToList();
|
fldInfo.GetCustomAttributes().OfType<DNAFieldAttribute>().FirstOrDefault()?.IsPointer ?? false).ToList();
|
||||||
|
|
||||||
list.AddRange(fieldInfo.Where(fldInfo =>
|
list.AddRange(fieldInfo.Where(fldInfo =>
|
||||||
fldInfo.GetCustomAttributes().OfType<DNAArrayAttribute>().FirstOrDefault()?.IsPointer ?? false));
|
fldInfo.GetCustomAttributes().OfType<DNAArrayAttribute>().FirstOrDefault()?.IsPointer ?? false));
|
||||||
|
|
||||||
@@ -149,7 +147,7 @@ public class Reader {
|
|||||||
var addr = GetBlockFieldDataOffset(obj.Key.Item1, f.GetCustomAttribute<DNAFieldAttribute>()!.OriginalIndex,
|
var addr = GetBlockFieldDataOffset(obj.Key.Item1, f.GetCustomAttribute<DNAFieldAttribute>()!.OriginalIndex,
|
||||||
fieldInfo);
|
fieldInfo);
|
||||||
// dereference the pointer
|
// dereference the pointer
|
||||||
addr = pointers.GetValueOrDefault(addr);
|
addr = pointers.GetValueOrDefault(addr);
|
||||||
if (addr == IntPtr.Zero) continue; // null pointer
|
if (addr == IntPtr.Zero) continue; // null pointer
|
||||||
// get the object that the pointer is pointing to if we've already converted it
|
// get the object that the pointer is pointing to if we've already converted it
|
||||||
var newobj = objects.GetValueOrDefault((addr, f.FieldType));
|
var newobj = objects.GetValueOrDefault((addr, f.FieldType));
|
||||||
@@ -299,69 +297,67 @@ public class Reader {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static int[] CalculateArrayIndices(List<int> sizes, int index)
|
private static int[] CalculateArrayIndices(List<int> sizes, int index) {
|
||||||
{
|
|
||||||
int[] indexArray = new int[sizes.Count];
|
int[] indexArray = new int[sizes.Count];
|
||||||
for (int k = 0; k < sizes.Count; k++) {
|
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;
|
return indexArray;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Array FillPointersArray(DNAArrayAttribute arrayAttribute, byte[] data,
|
private Array FillPointersArray(DNAArrayAttribute arrayAttribute, byte[] data,
|
||||||
Type type, List<int> sizes)
|
Type type, List<int> sizes) {
|
||||||
{
|
|
||||||
//Create the array
|
//Create the array
|
||||||
var array = Array.CreateInstance(type, sizes.ToArray());
|
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];
|
var itemData = new byte[8];
|
||||||
Array.Copy(data, i, itemData, 0, 8);
|
Array.Copy(data, i, itemData, 0, 8);
|
||||||
if(itemData.ToPointer() == IntPtr.Zero) continue;
|
if (itemData.ToPointer() == IntPtr.Zero) continue;
|
||||||
object? cellData = ActivateInstance(type);
|
object? cellData = ActivateInstance(type);
|
||||||
FillObject(itemData.ToPointer(), ref cellData, type.GetFields());
|
FillObject(itemData.ToPointer(), ref cellData, type.GetFields());
|
||||||
|
|
||||||
var indexArray = CalculateArrayIndices(sizes, i);
|
var indexArray = CalculateArrayIndices(sizes, i);
|
||||||
|
|
||||||
array.SetValue(cellData, indexArray);
|
array.SetValue(cellData, indexArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
return array;
|
return array;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Array FillNormalTypeArray(DNAArrayAttribute arrayAttribute, byte[] data, FileBlock block, Type type, List<int> sizes, int itemLenght, int offset)
|
private Array FillNormalTypeArray(DNAArrayAttribute arrayAttribute, byte[] data, FileBlock block, Type type,
|
||||||
{
|
List<int> sizes, int itemLenght, int offset) {
|
||||||
var array = Array.CreateInstance(type, sizes.ToArray());
|
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];
|
var itemData = new byte[itemLenght];
|
||||||
Array.Copy(data, i, itemData, 0, itemLenght);
|
Array.Copy(data, i, itemData, 0, itemLenght);
|
||||||
object? cellData = ConvertFieldData(itemData, arrayAttribute.OriginalType);
|
object? cellData = ConvertFieldData(itemData, arrayAttribute.OriginalType);
|
||||||
|
|
||||||
var indexArray = CalculateArrayIndices(sizes, i);
|
var indexArray = CalculateArrayIndices(sizes, i);
|
||||||
|
|
||||||
array.SetValue(cellData, indexArray);
|
array.SetValue(cellData, indexArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
return array;
|
return array;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Array FillCustomTypeArray(DNAArrayAttribute arrayAttribute, byte[] data, FileBlock block, Type type, List<int> sizes, int itemLenght, int offset)
|
private Array FillCustomTypeArray(DNAArrayAttribute arrayAttribute, byte[] data, FileBlock block, Type type,
|
||||||
{
|
List<int> sizes, int itemLenght, int offset) {
|
||||||
var array = Array.CreateInstance(type, sizes.ToArray());
|
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];
|
var itemData = new byte[itemLenght];
|
||||||
Array.Copy(data, i, itemData, 0, itemLenght);
|
Array.Copy(data, i, itemData, 0, itemLenght);
|
||||||
object? cellData = ActivateInstance(type);
|
object? cellData = ActivateInstance(type);
|
||||||
FillObject(block, ref cellData, type.GetFields(), offset + i);
|
FillObject(block, ref cellData, type.GetFields(), offset + i);
|
||||||
|
|
||||||
var indexArray = CalculateArrayIndices(sizes, i);
|
var indexArray = CalculateArrayIndices(sizes, i);
|
||||||
|
|
||||||
array.SetValue(cellData, indexArray);
|
array.SetValue(cellData, indexArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
return array;
|
return array;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -375,24 +371,23 @@ public class Reader {
|
|||||||
int dataLength = arrayAttribute.Size;
|
int dataLength = arrayAttribute.Size;
|
||||||
var data = new byte[dataLength];
|
var data = new byte[dataLength];
|
||||||
Array.Copy((byte[])block.Body, offset, data, 0, dataLength);
|
Array.Copy((byte[])block.Body, offset, data, 0, dataLength);
|
||||||
|
|
||||||
//Gather Array type
|
//Gather Array type
|
||||||
var type = Type.GetType(arrayAttribute.OriginalType.ParseFType()) ?? dnaTypesDb[arrayAttribute.OriginalType];
|
var type = Type.GetType(arrayAttribute.OriginalType.ParseFType()) ?? dnaTypesDb[arrayAttribute.OriginalType];
|
||||||
if (type == null) throw new NotSupportedException($"Unknown type \"{arrayAttribute.OriginalType}\"");
|
if (type == null) throw new NotSupportedException($"Unknown type \"{arrayAttribute.OriginalType}\"");
|
||||||
|
|
||||||
if(arrayAttribute.IsPointer){
|
if (arrayAttribute.IsPointer) {
|
||||||
return FillPointersArray(arrayAttribute, data, type, sizes);
|
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<DNAFieldAttribute>()?.Size ??
|
int itemLenght = type.GetCustomAttribute<DNAFieldAttribute>()?.Size ??
|
||||||
type.GetCustomAttribute<DNAClassAttribute>()!.Size;
|
type.GetCustomAttribute<DNAClassAttribute>()!.Size;
|
||||||
return FillCustomTypeArray(arrayAttribute, data, block, type, sizes, itemLenght, offset.ToInt32());
|
return FillCustomTypeArray(arrayAttribute, data, block, type, sizes, itemLenght, offset.ToInt32());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private object? ConvertListField(FileBlock block, FieldInfo field, DNAListAttribute attrib, IntPtr startOffset) {
|
private object? ConvertListField(FileBlock block, FieldInfo field, DNAListAttribute attrib, IntPtr startOffset) {
|
||||||
|
|||||||
Reference in New Issue
Block a user