From 73e98f5c5dd664cf10882eb26c7c626ca6d414fa Mon Sep 17 00:00:00 2001 From: Samuele Lorefice Date: Fri, 7 Mar 2025 19:13:29 +0100 Subject: [PATCH] Regenerated code files --- BlendFile/DNA/ActionChannelBag.cs | 12 ++-- BlendFile/DNA/ActionLayer.cs | 12 ++-- BlendFile/DNA/ActionStripKeyframeData.cs | 12 ++-- BlendFile/DNA/GreasePencil.cs | 70 ++++++++++---------- BlendFile/DNA/IDPropertyUIDataBool.cs | 16 ++--- BlendFile/DNA/IDPropertyUIDataFloat.cs | 40 ++++++------ BlendFile/DNA/IDPropertyUIDataInt.cs | 40 ++++++------ BlendFile/DNA/bAction.cs | 82 ++++++++++++------------ BlendFile/DNA/bArmature.cs | 38 +++++------ BlendFile/Reader.cs | 4 +- 10 files changed, 163 insertions(+), 163 deletions(-) diff --git a/BlendFile/DNA/ActionChannelBag.cs b/BlendFile/DNA/ActionChannelBag.cs index 557df92..3f65c17 100644 --- a/BlendFile/DNA/ActionChannelBag.cs +++ b/BlendFile/DNA/ActionChannelBag.cs @@ -17,22 +17,22 @@ namespace BlendFile.DNA { public class ActionChannelBag { [DNAFieldAttribute(4, "int", 0, "slot_handle", "int", false, 0)] public int slot_handle; - [DNAFieldAttribute(4, "uchar", 3, "_pad[4]", "System.Byte[]", false, 4)] - public byte[] _pad = new System.Byte[4]; - [DNAListAttribute(8, "bActionGroup", "**group_array", 2, "bActionGroup", "int", "group_array_num", 1, 12, 8)] + [DNAListAttribute(8, "bActionGroup", "**group_array", 2, "bActionGroup", "int", "group_array_num", 1, 8, 4)] public System.Collections.Generic.List group_array; + [DNAFieldAttribute(4, "uchar", 3, "_pad[4]", "System.Byte[]", false, 16)] + public byte[] _pad = new System.Byte[4]; [DNAListAttribute(8, "FCurve", "**fcurve_array", 5, "FCurve", "int", "fcurve_array_num", 4, 24, 20)] public System.Collections.Generic.List fcurve_array; public ActionChannelBag() { this.slot_handle = default; - this._pad = default; this.group_array = default; + this._pad = default; this.fcurve_array = default; } - public ActionChannelBag(int slot_handle, byte[] _pad, System.Collections.Generic.List group_array, System.Collections.Generic.List fcurve_array) { + public ActionChannelBag(int slot_handle, System.Collections.Generic.List group_array, byte[] _pad, System.Collections.Generic.List fcurve_array) { this.slot_handle = slot_handle; - this._pad = _pad; this.group_array = group_array; + this._pad = _pad; this.fcurve_array = fcurve_array; } } diff --git a/BlendFile/DNA/ActionLayer.cs b/BlendFile/DNA/ActionLayer.cs index e834ee2..db533f9 100644 --- a/BlendFile/DNA/ActionLayer.cs +++ b/BlendFile/DNA/ActionLayer.cs @@ -25,27 +25,27 @@ namespace BlendFile.DNA { public sbyte layer_mix_mode; [DNAFieldAttribute(2, "uchar", 4, "_pad0[2]", "System.Byte[]", false, 70)] public byte[] _pad0 = new System.Byte[2]; - [DNAFieldAttribute(4, "uchar", 7, "_pad1[4]", "System.Byte[]", false, 72)] - public byte[] _pad1 = new System.Byte[4]; - [DNAListAttribute(8, "ActionStrip", "**strip_array", 5, "ActionStrip", "int", "strip_array_num", 6, 76, 0)] + [DNAListAttribute(8, "ActionStrip", "**strip_array", 5, "ActionStrip", 80, "strip_array_num", 6, 72, 0)] public System.Collections.Generic.List strip_array; + [DNAFieldAttribute(4, "uchar", 7, "_pad1[4]", "System.Byte[]", false, 84)] + public byte[] _pad1 = new System.Byte[4]; public ActionLayer() { this.name = default; this.influence = default; this.layer_flags = default; this.layer_mix_mode = default; this._pad0 = default; - this._pad1 = default; this.strip_array = default; + this._pad1 = default; } - public ActionLayer(char[] name, float influence, byte layer_flags, sbyte layer_mix_mode, byte[] _pad0, byte[] _pad1, System.Collections.Generic.List strip_array) { + public ActionLayer(char[] name, float influence, byte layer_flags, sbyte layer_mix_mode, byte[] _pad0, System.Collections.Generic.List strip_array, byte[] _pad1) { this.name = name; this.influence = influence; this.layer_flags = layer_flags; this.layer_mix_mode = layer_mix_mode; this._pad0 = _pad0; - this._pad1 = _pad1; this.strip_array = strip_array; + this._pad1 = _pad1; } } } diff --git a/BlendFile/DNA/ActionStripKeyframeData.cs b/BlendFile/DNA/ActionStripKeyframeData.cs index 0bd4e78..14cd8a8 100644 --- a/BlendFile/DNA/ActionStripKeyframeData.cs +++ b/BlendFile/DNA/ActionStripKeyframeData.cs @@ -15,17 +15,17 @@ namespace BlendFile.DNA { [DNAClassAttribute(68, "ActionStripKeyframeData", 16)] public class ActionStripKeyframeData { - [DNAFieldAttribute(4, "uchar", 2, "_pad[4]", "System.Byte[]", false, 0)] - public byte[] _pad = new System.Byte[4]; - [DNAListAttribute(8, "ActionChannelBag", "**channelbag_array", 0, "ActionChannelBag", "int", "channelbag_array_num", 1, 4, 0)] + [DNAListAttribute(8, "ActionChannelBag", "**channelbag_array", 0, "ActionChannelBag", 8, "channelbag_array_num", 1, 0, 0)] public System.Collections.Generic.List channelbag_array; + [DNAFieldAttribute(4, "uchar", 2, "_pad[4]", "System.Byte[]", false, 12)] + public byte[] _pad = new System.Byte[4]; public ActionStripKeyframeData() { - this._pad = default; this.channelbag_array = default; + this._pad = default; } - public ActionStripKeyframeData(byte[] _pad, System.Collections.Generic.List channelbag_array) { - this._pad = _pad; + public ActionStripKeyframeData(System.Collections.Generic.List channelbag_array, byte[] _pad) { this.channelbag_array = channelbag_array; + this._pad = _pad; } } } diff --git a/BlendFile/DNA/GreasePencil.cs b/BlendFile/DNA/GreasePencil.cs index cd1d1bc..bdd6cc8 100644 --- a/BlendFile/DNA/GreasePencil.cs +++ b/BlendFile/DNA/GreasePencil.cs @@ -19,45 +19,47 @@ namespace BlendFile.DNA { public ID id; [DNAFieldAttribute(8, "AnimData", 1, "*adt", "AnimData", true, 208)] public AnimData adt; - [DNAFieldAttribute(4, "char", 4, "_pad[4]", "System.Char[]", false, 216)] - public char[] _pad = new System.Char[4]; - [DNAFieldAttribute(8, "GreasePencilLayerTreeGroup", 5, "*root_group_ptr", "GreasePencilLayerTreeGroup", true, 220)] - public GreasePencilLayerTreeGroup root_group_ptr; - [DNAFieldAttribute(248, "CustomData", 6, "layers_data", "CustomData", false, 228)] - public CustomData layers_data; - [DNAFieldAttribute(4, "int", 7, "attributes_active_index", "int", false, 476)] - public int attributes_active_index; - [DNAFieldAttribute(4, "char", 8, "_pad2[4]", "System.Char[]", false, 480)] - public char[] _pad2 = new System.Char[4]; - [DNAFieldAttribute(8, "GreasePencilLayerTreeNode", 9, "*active_node", "GreasePencilLayerTreeNode", true, 484)] - public GreasePencilLayerTreeNode active_node; - [DNAFieldAttribute(2, "char", 12, "_pad3[2]", "System.Char[]", false, 492)] - public char[] _pad3 = new System.Char[2]; - [DNAFieldAttribute(4, "int", 13, "flag", "int", false, 494)] - public int flag; - [DNAFieldAttribute(16, "ListBase", 14, "vertex_group_names", "ListBase", false, 498)] - public ListBase vertex_group_names; - [DNAFieldAttribute(4, "int", 15, "vertex_group_active_index", "int", false, 514)] - public int vertex_group_active_index; - [DNAFieldAttribute(4, "char", 16, "_pad4[4]", "System.Char[]", false, 518)] - public char[] _pad4 = new System.Char[4]; - [DNAFieldAttribute(40, "GreasePencilOnionSkinningSettings", 17, "onion_skinning_settings", "GreasePencilOnionSkinningSettings", false, 522)] - public GreasePencilOnionSkinningSettings onion_skinning_settings; - [DNAFieldAttribute(8, "GreasePencilRuntimeHandle", 18, "*runtime", "GreasePencilRuntimeHandle", true, 562)] - public GreasePencilRuntimeHandle runtime; - [DNAListAttribute(8, "GreasePencilDrawingBase", "**drawing_array", 2, "GreasePencilDrawingBase", "int", "drawing_array_size", 3, 570, 0)] + [DNAListAttribute(8, "GreasePencilDrawingBase", "**drawing_array", 2, "GreasePencilDrawingBase", 224, "drawing_array_size", 3, 216, 0)] public System.Collections.Generic.List drawing_array; - [DNAListAttribute(8, "Material", "**material_array", 10, "Material", "short", "material_array_size", 11, 582, 0)] + [DNAFieldAttribute(4, "char", 4, "_pad[4]", "System.Char[]", false, 228)] + public char[] _pad = new System.Char[4]; + [DNAFieldAttribute(8, "GreasePencilLayerTreeGroup", 5, "*root_group_ptr", "GreasePencilLayerTreeGroup", true, 232)] + public GreasePencilLayerTreeGroup root_group_ptr; + [DNAFieldAttribute(248, "CustomData", 6, "layers_data", "CustomData", false, 240)] + public CustomData layers_data; + [DNAFieldAttribute(4, "int", 7, "attributes_active_index", "int", false, 488)] + public int attributes_active_index; + [DNAFieldAttribute(4, "char", 8, "_pad2[4]", "System.Char[]", false, 492)] + public char[] _pad2 = new System.Char[4]; + [DNAFieldAttribute(8, "GreasePencilLayerTreeNode", 9, "*active_node", "GreasePencilLayerTreeNode", true, 496)] + public GreasePencilLayerTreeNode active_node; + [DNAListAttribute(8, "Material", "**material_array", 10, "Material", 512, "material_array_size", 11, 504, 0)] public System.Collections.Generic.List material_array; + [DNAFieldAttribute(2, "char", 12, "_pad3[2]", "System.Char[]", false, 514)] + public char[] _pad3 = new System.Char[2]; + [DNAFieldAttribute(4, "int", 13, "flag", "int", false, 516)] + public int flag; + [DNAFieldAttribute(16, "ListBase", 14, "vertex_group_names", "ListBase", false, 520)] + public ListBase vertex_group_names; + [DNAFieldAttribute(4, "int", 15, "vertex_group_active_index", "int", false, 536)] + public int vertex_group_active_index; + [DNAFieldAttribute(4, "char", 16, "_pad4[4]", "System.Char[]", false, 540)] + public char[] _pad4 = new System.Char[4]; + [DNAFieldAttribute(40, "GreasePencilOnionSkinningSettings", 17, "onion_skinning_settings", "GreasePencilOnionSkinningSettings", false, 544)] + public GreasePencilOnionSkinningSettings onion_skinning_settings; + [DNAFieldAttribute(8, "GreasePencilRuntimeHandle", 18, "*runtime", "GreasePencilRuntimeHandle", true, 584)] + public GreasePencilRuntimeHandle runtime; public GreasePencil() { this.id = default; this.adt = default; + this.drawing_array = default; this._pad = default; this.root_group_ptr = default; this.layers_data = default; this.attributes_active_index = default; this._pad2 = default; this.active_node = default; + this.material_array = default; this._pad3 = default; this.flag = default; this.vertex_group_names = default; @@ -65,35 +67,35 @@ namespace BlendFile.DNA { this._pad4 = default; this.onion_skinning_settings = default; this.runtime = default; - this.drawing_array = default; - this.material_array = default; } public GreasePencil( ID id, AnimData adt, + System.Collections.Generic.List drawing_array, char[] _pad, GreasePencilLayerTreeGroup root_group_ptr, CustomData layers_data, int attributes_active_index, char[] _pad2, GreasePencilLayerTreeNode active_node, + System.Collections.Generic.List material_array, char[] _pad3, int flag, ListBase vertex_group_names, int vertex_group_active_index, char[] _pad4, GreasePencilOnionSkinningSettings onion_skinning_settings, - GreasePencilRuntimeHandle runtime, - System.Collections.Generic.List drawing_array, - System.Collections.Generic.List material_array) { + GreasePencilRuntimeHandle runtime) { this.id = id; this.adt = adt; + this.drawing_array = drawing_array; this._pad = _pad; this.root_group_ptr = root_group_ptr; this.layers_data = layers_data; this.attributes_active_index = attributes_active_index; this._pad2 = _pad2; this.active_node = active_node; + this.material_array = material_array; this._pad3 = _pad3; this.flag = flag; this.vertex_group_names = vertex_group_names; @@ -101,8 +103,6 @@ namespace BlendFile.DNA { this._pad4 = _pad4; this.onion_skinning_settings = onion_skinning_settings; this.runtime = runtime; - this.drawing_array = drawing_array; - this.material_array = material_array; } } } diff --git a/BlendFile/DNA/IDPropertyUIDataBool.cs b/BlendFile/DNA/IDPropertyUIDataBool.cs index 4589cbc..cff856a 100644 --- a/BlendFile/DNA/IDPropertyUIDataBool.cs +++ b/BlendFile/DNA/IDPropertyUIDataBool.cs @@ -17,23 +17,23 @@ namespace BlendFile.DNA { public class IDPropertyUIDataBool { [DNAFieldAttribute(16, "IDPropertyUIData", 0, "base", "IDPropertyUIData", false, 0)] public IDPropertyUIData @base; - [DNAFieldAttribute(3, "char", 3, "_pad[3]", "System.Char[]", false, 16)] - public char[] _pad = new System.Char[3]; - [DNAFieldAttribute(1, "int8_t", 4, "default_value", "int8_t", false, 19)] - public sbyte default_value; - [DNAListAttribute(8, "int8_t", "*default_array", 1, "int8_t", "int", "default_array_len", 2, 20, 0)] + [DNAListAttribute(8, "int8_t", "*default_array", 1, "int8_t", 24, "default_array_len", 2, 16, 0)] public System.Collections.Generic.List default_array; + [DNAFieldAttribute(3, "char", 3, "_pad[3]", "System.Char[]", false, 28)] + public char[] _pad = new System.Char[3]; + [DNAFieldAttribute(1, "int8_t", 4, "default_value", "int8_t", false, 31)] + public sbyte default_value; public IDPropertyUIDataBool() { this.@base = default; + this.default_array = default; this._pad = default; this.default_value = default; - this.default_array = default; } - public IDPropertyUIDataBool(IDPropertyUIData @base, char[] _pad, sbyte default_value, System.Collections.Generic.List default_array) { + public IDPropertyUIDataBool(IDPropertyUIData @base, System.Collections.Generic.List default_array, char[] _pad, sbyte default_value) { this.@base = @base; + this.default_array = default_array; this._pad = _pad; this.default_value = default_value; - this.default_array = default_array; } } } diff --git a/BlendFile/DNA/IDPropertyUIDataFloat.cs b/BlendFile/DNA/IDPropertyUIDataFloat.cs index 245772e..c20c1a5 100644 --- a/BlendFile/DNA/IDPropertyUIDataFloat.cs +++ b/BlendFile/DNA/IDPropertyUIDataFloat.cs @@ -17,26 +17,27 @@ namespace BlendFile.DNA { public class IDPropertyUIDataFloat { [DNAFieldAttribute(16, "IDPropertyUIData", 0, "base", "IDPropertyUIData", false, 0)] public IDPropertyUIData @base; - [DNAFieldAttribute(4, "char", 3, "_pad[4]", "System.Char[]", false, 16)] - public char[] _pad = new System.Char[4]; - [DNAFieldAttribute(4, "float", 4, "step", "float", false, 20)] - public float step; - [DNAFieldAttribute(4, "int", 5, "precision", "int", false, 24)] - public int precision; - [DNAFieldAttribute(8, "double", 6, "min", "double", false, 28)] - public double min; - [DNAFieldAttribute(8, "double", 7, "max", "double", false, 36)] - public double max; - [DNAFieldAttribute(8, "double", 8, "soft_min", "double", false, 44)] - public double soft_min; - [DNAFieldAttribute(8, "double", 9, "soft_max", "double", false, 52)] - public double soft_max; - [DNAFieldAttribute(8, "double", 10, "default_value", "double", false, 60)] - public double default_value; - [DNAListAttribute(8, "double", "*default_array", 1, "double", "int", "default_array_len", 2, 68, 0)] + [DNAListAttribute(8, "double", "*default_array", 1, "double", 24, "default_array_len", 2, 16, 0)] public System.Collections.Generic.List default_array; + [DNAFieldAttribute(4, "char", 3, "_pad[4]", "System.Char[]", false, 28)] + public char[] _pad = new System.Char[4]; + [DNAFieldAttribute(4, "float", 4, "step", "float", false, 32)] + public float step; + [DNAFieldAttribute(4, "int", 5, "precision", "int", false, 36)] + public int precision; + [DNAFieldAttribute(8, "double", 6, "min", "double", false, 40)] + public double min; + [DNAFieldAttribute(8, "double", 7, "max", "double", false, 48)] + public double max; + [DNAFieldAttribute(8, "double", 8, "soft_min", "double", false, 56)] + public double soft_min; + [DNAFieldAttribute(8, "double", 9, "soft_max", "double", false, 64)] + public double soft_max; + [DNAFieldAttribute(8, "double", 10, "default_value", "double", false, 72)] + public double default_value; public IDPropertyUIDataFloat() { this.@base = default; + this.default_array = default; this._pad = default; this.step = default; this.precision = default; @@ -45,10 +46,10 @@ namespace BlendFile.DNA { this.soft_min = default; this.soft_max = default; this.default_value = default; - this.default_array = default; } - public IDPropertyUIDataFloat(IDPropertyUIData @base, char[] _pad, float step, int precision, double min, double max, double soft_min, double soft_max, double default_value, System.Collections.Generic.List default_array) { + public IDPropertyUIDataFloat(IDPropertyUIData @base, System.Collections.Generic.List default_array, char[] _pad, float step, int precision, double min, double max, double soft_min, double soft_max, double default_value) { this.@base = @base; + this.default_array = default_array; this._pad = _pad; this.step = step; this.precision = precision; @@ -57,7 +58,6 @@ namespace BlendFile.DNA { this.soft_min = soft_min; this.soft_max = soft_max; this.default_value = default_value; - this.default_array = default_array; } } } diff --git a/BlendFile/DNA/IDPropertyUIDataInt.cs b/BlendFile/DNA/IDPropertyUIDataInt.cs index 7ee39a2..4fb279d 100644 --- a/BlendFile/DNA/IDPropertyUIDataInt.cs +++ b/BlendFile/DNA/IDPropertyUIDataInt.cs @@ -17,26 +17,27 @@ namespace BlendFile.DNA { public class IDPropertyUIDataInt { [DNAFieldAttribute(16, "IDPropertyUIData", 0, "base", "IDPropertyUIData", false, 0)] public IDPropertyUIData @base; - [DNAFieldAttribute(4, "int", 3, "min", "int", false, 16)] - public int min; - [DNAFieldAttribute(4, "int", 4, "max", "int", false, 20)] - public int max; - [DNAFieldAttribute(4, "int", 5, "soft_min", "int", false, 24)] - public int soft_min; - [DNAFieldAttribute(4, "int", 6, "soft_max", "int", false, 28)] - public int soft_max; - [DNAFieldAttribute(4, "int", 7, "step", "int", false, 32)] - public int step; - [DNAFieldAttribute(4, "int", 8, "default_value", "int", false, 36)] - public int default_value; - [DNAFieldAttribute(4, "int", 9, "enum_items_num", "int", false, 40)] - public int enum_items_num; - [DNAFieldAttribute(8, "IDPropertyUIDataEnumItem", 10, "*enum_items", "IDPropertyUIDataEnumItem", true, 44)] - public IDPropertyUIDataEnumItem enum_items; - [DNAListAttribute(8, "int", "*default_array", 1, "int", "int", "default_array_len", 2, 52, 0)] + [DNAListAttribute(8, "int", "*default_array", 1, "int", 24, "default_array_len", 2, 16, 0)] public System.Collections.Generic.List default_array; + [DNAFieldAttribute(4, "int", 3, "min", "int", false, 28)] + public int min; + [DNAFieldAttribute(4, "int", 4, "max", "int", false, 32)] + public int max; + [DNAFieldAttribute(4, "int", 5, "soft_min", "int", false, 36)] + public int soft_min; + [DNAFieldAttribute(4, "int", 6, "soft_max", "int", false, 40)] + public int soft_max; + [DNAFieldAttribute(4, "int", 7, "step", "int", false, 44)] + public int step; + [DNAFieldAttribute(4, "int", 8, "default_value", "int", false, 48)] + public int default_value; + [DNAFieldAttribute(4, "int", 9, "enum_items_num", "int", false, 52)] + public int enum_items_num; + [DNAFieldAttribute(8, "IDPropertyUIDataEnumItem", 10, "*enum_items", "IDPropertyUIDataEnumItem", true, 56)] + public IDPropertyUIDataEnumItem enum_items; public IDPropertyUIDataInt() { this.@base = default; + this.default_array = default; this.min = default; this.max = default; this.soft_min = default; @@ -45,10 +46,10 @@ namespace BlendFile.DNA { this.default_value = default; this.enum_items_num = default; this.enum_items = default; - this.default_array = default; } - public IDPropertyUIDataInt(IDPropertyUIData @base, int min, int max, int soft_min, int soft_max, int step, int default_value, int enum_items_num, IDPropertyUIDataEnumItem enum_items, System.Collections.Generic.List default_array) { + public IDPropertyUIDataInt(IDPropertyUIData @base, System.Collections.Generic.List default_array, int min, int max, int soft_min, int soft_max, int step, int default_value, int enum_items_num, IDPropertyUIDataEnumItem enum_items) { this.@base = @base; + this.default_array = default_array; this.min = min; this.max = max; this.soft_min = soft_min; @@ -57,7 +58,6 @@ namespace BlendFile.DNA { this.default_value = default_value; this.enum_items_num = enum_items_num; this.enum_items = enum_items; - this.default_array = default_array; } } } diff --git a/BlendFile/DNA/bAction.cs b/BlendFile/DNA/bAction.cs index 577bb6c..2057971 100644 --- a/BlendFile/DNA/bAction.cs +++ b/BlendFile/DNA/bAction.cs @@ -17,44 +17,47 @@ namespace BlendFile.DNA { public class bAction { [DNAFieldAttribute(208, "ID", 0, "id", "ID", false, 0)] public ID id; - [DNAFieldAttribute(4, "int", 3, "layer_active_index", "int", false, 208)] - public int layer_active_index; - [DNAFieldAttribute(4, "int", 6, "last_slot_handle", "int", false, 212)] - public int last_slot_handle; - [DNAFieldAttribute(4, "char", 9, "_pad0[4]", "System.Char[]", false, 216)] - public char[] _pad0 = new System.Char[4]; - [DNAFieldAttribute(16, "ListBase", 10, "curves", "ListBase", false, 220)] - public ListBase curves; - [DNAFieldAttribute(16, "ListBase", 11, "chanbase", "ListBase", false, 236)] - public ListBase chanbase; - [DNAFieldAttribute(16, "ListBase", 12, "groups", "ListBase", false, 252)] - public ListBase groups; - [DNAFieldAttribute(16, "ListBase", 13, "markers", "ListBase", false, 268)] - public ListBase markers; - [DNAFieldAttribute(4, "int", 14, "flag", "int", false, 284)] - public int flag; - [DNAFieldAttribute(4, "int", 15, "active_marker", "int", false, 288)] - public int active_marker; - [DNAFieldAttribute(4, "int", 16, "idroot", "int", false, 292)] - public int idroot; - [DNAFieldAttribute(4, "char", 17, "_pad1[4]", "System.Char[]", false, 296)] - public char[] _pad1 = new System.Char[4]; - [DNAFieldAttribute(4, "float", 18, "frame_start", "float", false, 300)] - public float frame_start; - [DNAFieldAttribute(4, "float", 19, "frame_end", "float", false, 304)] - public float frame_end; - [DNAFieldAttribute(8, "PreviewImage", 20, "*preview", "PreviewImage", true, 308)] - public PreviewImage preview; - [DNAListAttribute(8, "ActionLayer", "**layer_array", 1, "ActionLayer", "int", "layer_array_num", 2, 316, 0)] + [DNAListAttribute(8, "ActionLayer", "**layer_array", 1, "ActionLayer", 216, "layer_array_num", 2, 208, 0)] public System.Collections.Generic.List layer_array; - [DNAListAttribute(8, "ActionSlot", "**slot_array", 4, "ActionSlot", "int", "slot_array_num", 5, 328, 0)] + [DNAFieldAttribute(4, "int", 3, "layer_active_index", "int", false, 220)] + public int layer_active_index; + [DNAListAttribute(8, "ActionSlot", "**slot_array", 4, "ActionSlot", 232, "slot_array_num", 5, 224, 0)] public System.Collections.Generic.List slot_array; - [DNAListAttribute(8, "ActionStripKeyframeData", "**strip_keyframe_data_array", 7, "ActionStripKeyframeData", "int", "strip_keyframe_data_array_num", 8, 340, 0)] + [DNAFieldAttribute(4, "int", 6, "last_slot_handle", "int", false, 236)] + public int last_slot_handle; + [DNAListAttribute(8, "ActionStripKeyframeData", "**strip_keyframe_data_array", 7, "ActionStripKeyframeData", 248, "strip_keyframe_data_array_num", 8, 240, 0)] public System.Collections.Generic.List strip_keyframe_data_array; + [DNAFieldAttribute(4, "char", 9, "_pad0[4]", "System.Char[]", false, 252)] + public char[] _pad0 = new System.Char[4]; + [DNAFieldAttribute(16, "ListBase", 10, "curves", "ListBase", false, 256)] + public ListBase curves; + [DNAFieldAttribute(16, "ListBase", 11, "chanbase", "ListBase", false, 272)] + public ListBase chanbase; + [DNAFieldAttribute(16, "ListBase", 12, "groups", "ListBase", false, 288)] + public ListBase groups; + [DNAFieldAttribute(16, "ListBase", 13, "markers", "ListBase", false, 304)] + public ListBase markers; + [DNAFieldAttribute(4, "int", 14, "flag", "int", false, 320)] + public int flag; + [DNAFieldAttribute(4, "int", 15, "active_marker", "int", false, 324)] + public int active_marker; + [DNAFieldAttribute(4, "int", 16, "idroot", "int", false, 328)] + public int idroot; + [DNAFieldAttribute(4, "char", 17, "_pad1[4]", "System.Char[]", false, 332)] + public char[] _pad1 = new System.Char[4]; + [DNAFieldAttribute(4, "float", 18, "frame_start", "float", false, 336)] + public float frame_start; + [DNAFieldAttribute(4, "float", 19, "frame_end", "float", false, 340)] + public float frame_end; + [DNAFieldAttribute(8, "PreviewImage", 20, "*preview", "PreviewImage", true, 344)] + public PreviewImage preview; public bAction() { this.id = default; + this.layer_array = default; this.layer_active_index = default; + this.slot_array = default; this.last_slot_handle = default; + this.strip_keyframe_data_array = default; this._pad0 = default; this.curves = default; this.chanbase = default; @@ -67,14 +70,14 @@ namespace BlendFile.DNA { this.frame_start = default; this.frame_end = default; this.preview = default; - this.layer_array = default; - this.slot_array = default; - this.strip_keyframe_data_array = default; } public bAction( ID id, + System.Collections.Generic.List layer_array, int layer_active_index, + System.Collections.Generic.List slot_array, int last_slot_handle, + System.Collections.Generic.List strip_keyframe_data_array, char[] _pad0, ListBase curves, ListBase chanbase, @@ -86,13 +89,13 @@ namespace BlendFile.DNA { char[] _pad1, float frame_start, float frame_end, - PreviewImage preview, - System.Collections.Generic.List layer_array, - System.Collections.Generic.List slot_array, - System.Collections.Generic.List strip_keyframe_data_array) { + PreviewImage preview) { this.id = id; + this.layer_array = layer_array; this.layer_active_index = layer_active_index; + this.slot_array = slot_array; this.last_slot_handle = last_slot_handle; + this.strip_keyframe_data_array = strip_keyframe_data_array; this._pad0 = _pad0; this.curves = curves; this.chanbase = chanbase; @@ -105,9 +108,6 @@ namespace BlendFile.DNA { this.frame_start = frame_start; this.frame_end = frame_end; this.preview = preview; - this.layer_array = layer_array; - this.slot_array = slot_array; - this.strip_keyframe_data_array = strip_keyframe_data_array; } } } diff --git a/BlendFile/DNA/bArmature.cs b/BlendFile/DNA/bArmature.cs index 8e2c8a0..166d1dd 100644 --- a/BlendFile/DNA/bArmature.cs +++ b/BlendFile/DNA/bArmature.cs @@ -45,22 +45,22 @@ namespace BlendFile.DNA { public short pathflag; [DNAFieldAttribute(16, "ListBase", 14, "collections", "ListBase", false, 288)] public ListBase collections; - [DNAFieldAttribute(4, "int", 17, "collection_root_count", "int", false, 304)] - public int collection_root_count; - [DNAFieldAttribute(64, "char", 18, "active_collection_name[64]", "System.Char[]", false, 308)] - public char[] active_collection_name = new System.Char[64]; - [DNAFieldAttribute(4, "int", 19, "layer_used", "int", false, 372)] - public int layer_used; - [DNAFieldAttribute(4, "int", 20, "layer", "int", false, 376)] - public int layer; - [DNAFieldAttribute(4, "int", 21, "layer_protected", "int", false, 380)] - public int layer_protected; - [DNAFieldAttribute(4, "float", 22, "axes_position", "float", false, 384)] - public float axes_position; - [DNAFieldAttribute(16, "bArmature_Runtime", 23, "runtime", "bArmature_Runtime", false, 388)] - public bArmature_Runtime runtime; - [DNAListAttribute(8, "BoneCollection", "**collection_array", 15, "BoneCollection", "int", "collection_array_num", 16, 404, 0)] + [DNAListAttribute(8, "BoneCollection", "**collection_array", 15, "BoneCollection", 312, "collection_array_num", 16, 304, 0)] public System.Collections.Generic.List collection_array; + [DNAFieldAttribute(4, "int", 17, "collection_root_count", "int", false, 316)] + public int collection_root_count; + [DNAFieldAttribute(64, "char", 18, "active_collection_name[64]", "System.Char[]", false, 320)] + public char[] active_collection_name = new System.Char[64]; + [DNAFieldAttribute(4, "int", 19, "layer_used", "int", false, 384)] + public int layer_used; + [DNAFieldAttribute(4, "int", 20, "layer", "int", false, 388)] + public int layer; + [DNAFieldAttribute(4, "int", 21, "layer_protected", "int", false, 392)] + public int layer_protected; + [DNAFieldAttribute(4, "float", 22, "axes_position", "float", false, 396)] + public float axes_position; + [DNAFieldAttribute(16, "bArmature_Runtime", 23, "runtime", "bArmature_Runtime", false, 400)] + public bArmature_Runtime runtime; public bArmature() { this.id = default; this.adt = default; @@ -77,6 +77,7 @@ namespace BlendFile.DNA { this.deformflag = default; this.pathflag = default; this.collections = default; + this.collection_array = default; this.collection_root_count = default; this.active_collection_name = default; this.layer_used = default; @@ -84,7 +85,6 @@ namespace BlendFile.DNA { this.layer_protected = default; this.axes_position = default; this.runtime = default; - this.collection_array = default; } public bArmature( ID id, @@ -102,14 +102,14 @@ namespace BlendFile.DNA { short deformflag, short pathflag, ListBase collections, + System.Collections.Generic.List collection_array, int collection_root_count, char[] active_collection_name, int layer_used, int layer, int layer_protected, float axes_position, - bArmature_Runtime runtime, - System.Collections.Generic.List collection_array) { + bArmature_Runtime runtime) { this.id = id; this.adt = adt; this.bonebase = bonebase; @@ -125,6 +125,7 @@ namespace BlendFile.DNA { this.deformflag = deformflag; this.pathflag = pathflag; this.collections = collections; + this.collection_array = collection_array; this.collection_root_count = collection_root_count; this.active_collection_name = active_collection_name; this.layer_used = layer_used; @@ -132,7 +133,6 @@ namespace BlendFile.DNA { this.layer_protected = layer_protected; this.axes_position = axes_position; this.runtime = runtime; - this.collection_array = collection_array; } } } diff --git a/BlendFile/Reader.cs b/BlendFile/Reader.cs index 7a14929..815fd52 100644 --- a/BlendFile/Reader.cs +++ b/BlendFile/Reader.cs @@ -219,10 +219,10 @@ public class Reader { throw new NotSupportedException($"Unknown type \"{attrib.OriginalType}\""); } - private object? ConvertListField(FileBlock block, FieldInfo field, DNAListAttribute attrib, IntPtr startOffset) { + private object? ConvertListField(FileBlock block, FieldInfo field, DNAListAttribute attrib, IntPtr startOffset) {/* IntPtr offset = attrib.MemoryOffset + startOffset; int size = Array.Copy((byte[])block.Body, startOffset+attrib.) - var data = new byte[] + var data = new byte[]*/ return null; }