diff --git a/BlendFile/DNA/ActionChannelBag.cs b/BlendFile/DNA/ActionChannelBag.cs index 1d5dd6a..0fd7fcc 100644 --- a/BlendFile/DNA/ActionChannelBag.cs +++ b/BlendFile/DNA/ActionChannelBag.cs @@ -17,10 +17,10 @@ namespace BlendFile.DNA { public int slot_handle; public int group_array_num; public bActionGroup ptr_ptr_group_array; - public uchar[] _pad = new uchar[4]; + public byte[] _pad = new System.Byte[4]; public int fcurve_array_num; public FCurve ptr_ptr_fcurve_array; - public ActionChannelBag(int slot_handle, int group_array_num, bActionGroup ptr_ptr_group_array, uchar[] _pad, int fcurve_array_num, FCurve ptr_ptr_fcurve_array) { + public ActionChannelBag(int slot_handle, int group_array_num, bActionGroup ptr_ptr_group_array, byte[] _pad, int fcurve_array_num, FCurve ptr_ptr_fcurve_array) { this.slot_handle = slot_handle; this.group_array_num = group_array_num; this.ptr_ptr_group_array = ptr_ptr_group_array; diff --git a/BlendFile/DNA/ActionLayer.cs b/BlendFile/DNA/ActionLayer.cs index f109ae0..d788bed 100644 --- a/BlendFile/DNA/ActionLayer.cs +++ b/BlendFile/DNA/ActionLayer.cs @@ -16,13 +16,13 @@ namespace BlendFile.DNA { public class ActionLayer { public char[] name = new System.Char[64]; public float influence; - public uchar layer_flags; - public int8_t layer_mix_mode; - public uchar[] _pad0 = new uchar[2]; + public byte layer_flags; + public sbyte layer_mix_mode; + public byte[] _pad0 = new System.Byte[2]; public ActionStrip ptr_ptr_strip_array; public int strip_array_num; - public uchar[] _pad1 = new uchar[4]; - public ActionLayer(char[] name, float influence, uchar layer_flags, int8_t layer_mix_mode, uchar[] _pad0, ActionStrip ptr_ptr_strip_array, int strip_array_num, uchar[] _pad1) { + public byte[] _pad1 = new System.Byte[4]; + public ActionLayer(char[] name, float influence, byte layer_flags, sbyte layer_mix_mode, byte[] _pad0, ActionStrip ptr_ptr_strip_array, int strip_array_num, byte[] _pad1) { this.name = name; this.influence = influence; this.layer_flags = layer_flags; diff --git a/BlendFile/DNA/ActionSlot.cs b/BlendFile/DNA/ActionSlot.cs index 040bdbe..417c203 100644 --- a/BlendFile/DNA/ActionSlot.cs +++ b/BlendFile/DNA/ActionSlot.cs @@ -15,13 +15,13 @@ namespace BlendFile.DNA { public class ActionSlot { public char[] name = new System.Char[66]; - public uchar[] _pad0 = new uchar[2]; + public byte[] _pad0 = new System.Byte[2]; public int idtype; public int handle; - public int8_t slot_flags; - public uchar[] _pad1 = new uchar[3]; + public sbyte slot_flags; + public byte[] _pad1 = new System.Byte[3]; public ActionSlotRuntimeHandle ptr_runtime; - public ActionSlot(char[] name, uchar[] _pad0, int idtype, int handle, int8_t slot_flags, uchar[] _pad1, ActionSlotRuntimeHandle ptr_runtime) { + public ActionSlot(char[] name, byte[] _pad0, int idtype, int handle, sbyte slot_flags, byte[] _pad1, ActionSlotRuntimeHandle ptr_runtime) { this.name = name; this._pad0 = _pad0; this.idtype = idtype; diff --git a/BlendFile/DNA/ActionStrip.cs b/BlendFile/DNA/ActionStrip.cs index 053473a..6801d32 100644 --- a/BlendFile/DNA/ActionStrip.cs +++ b/BlendFile/DNA/ActionStrip.cs @@ -14,14 +14,14 @@ using System; namespace BlendFile.DNA { public struct ActionStrip { - public int8_t strip_type; - public uchar[] _pad0 = new uchar[3]; + public sbyte strip_type; + public byte[] _pad0 = new System.Byte[3]; public int data_index; public float frame_start; public float frame_end; public float frame_offset; - public uchar[] _pad1 = new uchar[4]; - public ActionStrip(int8_t strip_type, uchar[] _pad0, int data_index, float frame_start, float frame_end, float frame_offset, uchar[] _pad1) { + public byte[] _pad1 = new System.Byte[4]; + public ActionStrip(sbyte strip_type, byte[] _pad0, int data_index, float frame_start, float frame_end, float frame_offset, byte[] _pad1) { this.strip_type = strip_type; this._pad0 = _pad0; this.data_index = data_index; diff --git a/BlendFile/DNA/ActionStripKeyframeData.cs b/BlendFile/DNA/ActionStripKeyframeData.cs index 180962a..80d8105 100644 --- a/BlendFile/DNA/ActionStripKeyframeData.cs +++ b/BlendFile/DNA/ActionStripKeyframeData.cs @@ -16,8 +16,8 @@ namespace BlendFile.DNA { public class ActionStripKeyframeData { public ActionChannelBag ptr_ptr_channelbag_array; public int channelbag_array_num; - public uchar[] _pad = new uchar[4]; - public ActionStripKeyframeData(ActionChannelBag ptr_ptr_channelbag_array, int channelbag_array_num, uchar[] _pad) { + public byte[] _pad = new System.Byte[4]; + public ActionStripKeyframeData(ActionChannelBag ptr_ptr_channelbag_array, int channelbag_array_num, byte[] _pad) { this.ptr_ptr_channelbag_array = ptr_ptr_channelbag_array; this.channelbag_array_num = channelbag_array_num; this._pad = _pad; diff --git a/BlendFile/DNA/AnimData.cs b/BlendFile/DNA/AnimData.cs index fdff586..f1fc2d4 100644 --- a/BlendFile/DNA/AnimData.cs +++ b/BlendFile/DNA/AnimData.cs @@ -17,11 +17,11 @@ namespace BlendFile.DNA { public bAction ptr_action; public int slot_handle; public char[] slot_name = new System.Char[66]; - public uchar[] _pad0 = new uchar[2]; + public byte[] _pad0 = new System.Byte[2]; public bAction ptr_tmpact; public int tmp_slot_handle; public char[] tmp_slot_name = new System.Char[66]; - public uchar[] _pad1 = new uchar[2]; + public byte[] _pad1 = new System.Byte[2]; public ListBase nla_tracks; public NlaTrack ptr_act_track; public NlaStrip ptr_actstrip; @@ -32,16 +32,16 @@ namespace BlendFile.DNA { public short act_blendmode; public short act_extendmode; public float act_influence; - public uchar[] _pad2 = new uchar[4]; + public byte[] _pad2 = new System.Byte[4]; public AnimData( bAction ptr_action, int slot_handle, char[] slot_name, - uchar[] _pad0, + byte[] _pad0, bAction ptr_tmpact, int tmp_slot_handle, char[] tmp_slot_name, - uchar[] _pad1, + byte[] _pad1, ListBase nla_tracks, NlaTrack ptr_act_track, NlaStrip ptr_actstrip, @@ -52,7 +52,7 @@ namespace BlendFile.DNA { short act_blendmode, short act_extendmode, float act_influence, - uchar[] _pad2) { + byte[] _pad2) { this.ptr_action = ptr_action; this.slot_handle = slot_handle; this.slot_name = slot_name; diff --git a/BlendFile/DNA/BPoint.cs b/BlendFile/DNA/BPoint.cs index 7451806..9bdb7db 100644 --- a/BlendFile/DNA/BPoint.cs +++ b/BlendFile/DNA/BPoint.cs @@ -17,12 +17,12 @@ namespace BlendFile.DNA { public float[] vec = new System.Single[4]; public float alfa; public float weight; - public uchar f1; + public byte f1; public char[] _pad1 = new System.Char[1]; public short hide; public float radius; public char[] _pad = new System.Char[4]; - public BPoint(float[] vec, float alfa, float weight, uchar f1, char[] _pad1, short hide, float radius, char[] _pad) { + public BPoint(float[] vec, float alfa, float weight, byte f1, char[] _pad1, short hide, float radius, char[] _pad) { this.vec = vec; this.alfa = alfa; this.weight = weight; diff --git a/BlendFile/DNA/BezTriple.cs b/BlendFile/DNA/BezTriple.cs index b9cad96..c1f5e4f 100644 --- a/BlendFile/DNA/BezTriple.cs +++ b/BlendFile/DNA/BezTriple.cs @@ -19,11 +19,11 @@ namespace BlendFile.DNA { public float weight; public float radius; public char ipo; - public uchar h1; - public uchar h2; - public uchar f1; - public uchar f2; - public uchar f3; + public byte h1; + public byte h2; + public byte f1; + public byte f2; + public byte f3; public char hide; public char easing; public float back; @@ -37,11 +37,11 @@ namespace BlendFile.DNA { float weight, float radius, char ipo, - uchar h1, - uchar h2, - uchar f1, - uchar f2, - uchar f3, + byte h1, + byte h2, + byte f1, + byte f2, + byte f3, char hide, char easing, float back, diff --git a/BlendFile/DNA/BoneCollection.cs b/BlendFile/DNA/BoneCollection.cs index 6684fb0..d61abf0 100644 --- a/BlendFile/DNA/BoneCollection.cs +++ b/BlendFile/DNA/BoneCollection.cs @@ -18,12 +18,12 @@ namespace BlendFile.DNA { public BoneCollection ptr_prev; public char[] name = new System.Char[64]; public ListBase bones; - public uchar flags; - public uchar[] _pad0 = new uchar[7]; + public byte flags; + public byte[] _pad0 = new System.Byte[7]; public int child_index; public int child_count; public IDProperty ptr_prop; - public BoneCollection(BoneCollection ptr_next, BoneCollection ptr_prev, char[] name, ListBase bones, uchar flags, uchar[] _pad0, int child_index, int child_count, IDProperty ptr_prop) { + public BoneCollection(BoneCollection ptr_next, BoneCollection ptr_prev, char[] name, ListBase bones, byte flags, byte[] _pad0, int child_index, int child_count, IDProperty ptr_prop) { this.ptr_next = ptr_next; this.ptr_prev = ptr_prev; this.name = name; diff --git a/BlendFile/DNA/BoneColor.cs b/BlendFile/DNA/BoneColor.cs index ff65d81..4f972fe 100644 --- a/BlendFile/DNA/BoneColor.cs +++ b/BlendFile/DNA/BoneColor.cs @@ -14,10 +14,10 @@ using System; namespace BlendFile.DNA { public struct BoneColor { - public int8_t palette_index; - public uchar[] _pad0 = new uchar[7]; + public sbyte palette_index; + public byte[] _pad0 = new System.Byte[7]; public ThemeWireColor custom; - public BoneColor(int8_t palette_index, uchar[] _pad0, ThemeWireColor custom) { + public BoneColor(sbyte palette_index, byte[] _pad0, ThemeWireColor custom) { this.palette_index = palette_index; this._pad0 = _pad0; this.custom = custom; diff --git a/BlendFile/DNA/BrushCurvesSculptSettings.cs b/BlendFile/DNA/BrushCurvesSculptSettings.cs index ce434ac..838a140 100644 --- a/BlendFile/DNA/BrushCurvesSculptSettings.cs +++ b/BlendFile/DNA/BrushCurvesSculptSettings.cs @@ -22,10 +22,10 @@ namespace BlendFile.DNA { public float minimum_distance; public float curve_radius; public int density_add_attempts; - public uchar density_mode; + public byte density_mode; public char[] _pad = new System.Char[7]; public CurveMapping ptr_curve_parameter_falloff; - public BrushCurvesSculptSettings(int add_amount, int points_per_curve, int flag, float minimum_length, float curve_length, float minimum_distance, float curve_radius, int density_add_attempts, uchar density_mode, char[] _pad, CurveMapping ptr_curve_parameter_falloff) { + public BrushCurvesSculptSettings(int add_amount, int points_per_curve, int flag, float minimum_length, float curve_length, float minimum_distance, float curve_radius, int density_add_attempts, byte density_mode, char[] _pad, CurveMapping ptr_curve_parameter_falloff) { this.add_amount = add_amount; this.points_per_curve = points_per_curve; this.flag = flag; diff --git a/BlendFile/DNA/BrushGpencilSettings.cs b/BlendFile/DNA/BrushGpencilSettings.cs index 335b843..6833742 100644 --- a/BlendFile/DNA/BrushGpencilSettings.cs +++ b/BlendFile/DNA/BrushGpencilSettings.cs @@ -28,7 +28,7 @@ namespace BlendFile.DNA { public short fill_direction; public float fill_threshold; public char[] _pad2 = new System.Char[2]; - public int8_t caps_type; + public sbyte caps_type; public char[] _pad = new System.Char[1]; public int flag2; public int fill_simplylvl; @@ -84,7 +84,7 @@ namespace BlendFile.DNA { short fill_direction, float fill_threshold, char[] _pad2, - int8_t caps_type, + sbyte caps_type, char[] _pad, int flag2, int fill_simplylvl, diff --git a/BlendFile/DNA/Collection.cs b/BlendFile/DNA/Collection.cs index 2a618bc..f08cf5f 100644 --- a/BlendFile/DNA/Collection.cs +++ b/BlendFile/DNA/Collection.cs @@ -24,13 +24,13 @@ namespace BlendFile.DNA { public PreviewImage ptr_preview; public int layer; public float[] dupli_ofs = new System.Single[3]; - public uchar flag; - public int8_t color_tag; + public byte flag; + public sbyte color_tag; public char[] _pad1 = new System.Char[2]; - public uchar lineart_usage; - public uchar lineart_flags; - public uchar lineart_intersection_mask; - public uchar lineart_intersection_priority; + public byte lineart_usage; + public byte lineart_flags; + public byte lineart_intersection_mask; + public byte lineart_intersection_priority; public ViewLayer ptr_view_layer; public Collection_Runtime runtime; public Collection( @@ -44,13 +44,13 @@ namespace BlendFile.DNA { PreviewImage ptr_preview, int layer, float[] dupli_ofs, - uchar flag, - int8_t color_tag, + byte flag, + sbyte color_tag, char[] _pad1, - uchar lineart_usage, - uchar lineart_flags, - uchar lineart_intersection_mask, - uchar lineart_intersection_priority, + byte lineart_usage, + byte lineart_flags, + byte lineart_intersection_mask, + byte lineart_intersection_priority, ViewLayer ptr_view_layer, Collection_Runtime runtime) { this.id = id; diff --git a/BlendFile/DNA/CollectionLightLinking.cs b/BlendFile/DNA/CollectionLightLinking.cs index 852b512..d30c8fb 100644 --- a/BlendFile/DNA/CollectionLightLinking.cs +++ b/BlendFile/DNA/CollectionLightLinking.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct CollectionLightLinking { - public uchar link_state; - public uchar[] _pad = new uchar[3]; - public CollectionLightLinking(uchar link_state, uchar[] _pad) { + public byte link_state; + public byte[] _pad = new System.Byte[3]; + public CollectionLightLinking(byte link_state, byte[] _pad) { this.link_state = link_state; this._pad = _pad; } diff --git a/BlendFile/DNA/Collection_Runtime.cs b/BlendFile/DNA/Collection_Runtime.cs index 4b74568..1a8747e 100644 --- a/BlendFile/DNA/Collection_Runtime.cs +++ b/BlendFile/DNA/Collection_Runtime.cs @@ -18,9 +18,9 @@ namespace BlendFile.DNA { public ListBase object_cache_instanced; public ListBase parents; public GHash ptr_gobject_hash; - public uchar tag; + public byte tag; public char[] _pad0 = new System.Char[7]; - public Collection_Runtime(ListBase object_cache, ListBase object_cache_instanced, ListBase parents, GHash ptr_gobject_hash, uchar tag, char[] _pad0) { + public Collection_Runtime(ListBase object_cache, ListBase object_cache_instanced, ListBase parents, GHash ptr_gobject_hash, byte tag, char[] _pad0) { this.object_cache = object_cache; this.object_cache_instanced = object_cache_instanced; this.parents = parents; diff --git a/BlendFile/DNA/CustomData_MeshMasks.cs b/BlendFile/DNA/CustomData_MeshMasks.cs index cdf45da..29011d7 100644 --- a/BlendFile/DNA/CustomData_MeshMasks.cs +++ b/BlendFile/DNA/CustomData_MeshMasks.cs @@ -14,12 +14,12 @@ using System; namespace BlendFile.DNA { public struct CustomData_MeshMasks { - public uint64_t vmask; - public uint64_t emask; - public uint64_t fmask; - public uint64_t pmask; - public uint64_t lmask; - public CustomData_MeshMasks(uint64_t vmask, uint64_t emask, uint64_t fmask, uint64_t pmask, uint64_t lmask) { + public ulong vmask; + public ulong emask; + public ulong fmask; + public ulong pmask; + public ulong lmask; + public CustomData_MeshMasks(ulong vmask, ulong emask, ulong fmask, ulong pmask, ulong lmask) { this.vmask = vmask; this.emask = emask; this.fmask = fmask; diff --git a/BlendFile/DNA/Editing.cs b/BlendFile/DNA/Editing.cs index 21bd0b8..4ca97b6 100644 --- a/BlendFile/DNA/Editing.cs +++ b/BlendFile/DNA/Editing.cs @@ -35,7 +35,7 @@ namespace BlendFile.DNA { public float recycle_max_cost; public int cache_flag; public PrefetchJob ptr_prefetch_job; - public int64_t disk_cache_timestamp; + public long disk_cache_timestamp; public EditingRuntime runtime; public Editing( ListBase ptr_seqbasep, @@ -59,7 +59,7 @@ namespace BlendFile.DNA { float recycle_max_cost, int cache_flag, PrefetchJob ptr_prefetch_job, - int64_t disk_cache_timestamp, + long disk_cache_timestamp, EditingRuntime runtime) { this.ptr_seqbasep = ptr_seqbasep; this.ptr_displayed_channels = ptr_displayed_channels; diff --git a/BlendFile/DNA/FileGlobal.cs b/BlendFile/DNA/FileGlobal.cs index 6cffa0b..ba6d4f7 100644 --- a/BlendFile/DNA/FileGlobal.cs +++ b/BlendFile/DNA/FileGlobal.cs @@ -25,10 +25,10 @@ namespace BlendFile.DNA { public object ptr__pad1; public int fileflags; public int globalf; - public uint64_t build_commit_timestamp; + public ulong build_commit_timestamp; public char[] build_hash = new System.Char[16]; public char[] filename = new System.Char[1024]; - public FileGlobal(char[] subvstr, short subversion, short minversion, short minsubversion, char[] _pad, bScreen ptr_curscreen, Scene ptr_curscene, ViewLayer ptr_cur_view_layer, object ptr__pad1, int fileflags, int globalf, uint64_t build_commit_timestamp, char[] build_hash, char[] filename) { + public FileGlobal(char[] subvstr, short subversion, short minversion, short minsubversion, char[] _pad, bScreen ptr_curscreen, Scene ptr_curscene, ViewLayer ptr_cur_view_layer, object ptr__pad1, int fileflags, int globalf, ulong build_commit_timestamp, char[] build_hash, char[] filename) { this.subvstr = subvstr; this.subversion = subversion; this.minversion = minversion; diff --git a/BlendFile/DNA/FileSelectParams.cs b/BlendFile/DNA/FileSelectParams.cs index 7424efe..6e68491 100644 --- a/BlendFile/DNA/FileSelectParams.cs +++ b/BlendFile/DNA/FileSelectParams.cs @@ -24,7 +24,7 @@ namespace BlendFile.DNA { public object ptr__pad3; public char[] filter_glob = new System.Char[256]; public char[] filter_search = new System.Char[64]; - public uint64_t filter_id; + public ulong filter_id; public int active_file; public int highlight_file; public int sel_first; @@ -51,7 +51,7 @@ namespace BlendFile.DNA { object ptr__pad3, char[] filter_glob, char[] filter_search, - uint64_t filter_id, + ulong filter_id, int active_file, int highlight_file, int sel_first, diff --git a/BlendFile/DNA/GreasePencilDrawingBase.cs b/BlendFile/DNA/GreasePencilDrawingBase.cs index 73a32e8..9ca7ac1 100644 --- a/BlendFile/DNA/GreasePencilDrawingBase.cs +++ b/BlendFile/DNA/GreasePencilDrawingBase.cs @@ -14,10 +14,10 @@ using System; namespace BlendFile.DNA { public struct GreasePencilDrawingBase { - public int8_t type; + public sbyte type; public char[] _pad = new System.Char[3]; public int flag; - public GreasePencilDrawingBase(int8_t type, char[] _pad, int flag) { + public GreasePencilDrawingBase(sbyte type, char[] _pad, int flag) { this.type = type; this._pad = _pad; this.flag = flag; diff --git a/BlendFile/DNA/GreasePencilFrame.cs b/BlendFile/DNA/GreasePencilFrame.cs index 444a499..d3c0b02 100644 --- a/BlendFile/DNA/GreasePencilFrame.cs +++ b/BlendFile/DNA/GreasePencilFrame.cs @@ -16,9 +16,9 @@ namespace BlendFile.DNA { public struct GreasePencilFrame { public int drawing_index; public int flag; - public int8_t type; + public sbyte type; public char[] _pad = new System.Char[3]; - public GreasePencilFrame(int drawing_index, int flag, int8_t type, char[] _pad) { + public GreasePencilFrame(int drawing_index, int flag, sbyte type, char[] _pad) { this.drawing_index = drawing_index; this.flag = flag; this.type = type; diff --git a/BlendFile/DNA/GreasePencilLayer.cs b/BlendFile/DNA/GreasePencilLayer.cs index b30bdf7..c3e466c 100644 --- a/BlendFile/DNA/GreasePencilLayer.cs +++ b/BlendFile/DNA/GreasePencilLayer.cs @@ -16,7 +16,7 @@ namespace BlendFile.DNA { public class GreasePencilLayer { public GreasePencilLayerTreeNode @base; public GreasePencilLayerFramesMapStorage frames_storage; - public int8_t blend_mode; + public sbyte blend_mode; public char[] _pad = new System.Char[3]; public float opacity; public ListBase masks; @@ -34,7 +34,7 @@ namespace BlendFile.DNA { public GreasePencilLayer( GreasePencilLayerTreeNode @base, GreasePencilLayerFramesMapStorage frames_storage, - int8_t blend_mode, + sbyte blend_mode, char[] _pad, float opacity, ListBase masks, diff --git a/BlendFile/DNA/GreasePencilLayerTreeGroup.cs b/BlendFile/DNA/GreasePencilLayerTreeGroup.cs index f426ceb..ce9485c 100644 --- a/BlendFile/DNA/GreasePencilLayerTreeGroup.cs +++ b/BlendFile/DNA/GreasePencilLayerTreeGroup.cs @@ -16,10 +16,10 @@ namespace BlendFile.DNA { public class GreasePencilLayerTreeGroup { public GreasePencilLayerTreeNode @base; public ListBase children; - public int8_t color_tag; + public sbyte color_tag; public char[] _pad = new System.Char[7]; public GreasePencilLayerGroupRuntimeHandle ptr_runtime; - public GreasePencilLayerTreeGroup(GreasePencilLayerTreeNode @base, ListBase children, int8_t color_tag, char[] _pad, GreasePencilLayerGroupRuntimeHandle ptr_runtime) { + public GreasePencilLayerTreeGroup(GreasePencilLayerTreeNode @base, ListBase children, sbyte color_tag, char[] _pad, GreasePencilLayerGroupRuntimeHandle ptr_runtime) { this.@base = @base; this.children = children; this.color_tag = color_tag; diff --git a/BlendFile/DNA/GreasePencilLayerTreeNode.cs b/BlendFile/DNA/GreasePencilLayerTreeNode.cs index 1c3f4e6..3ef65f5 100644 --- a/BlendFile/DNA/GreasePencilLayerTreeNode.cs +++ b/BlendFile/DNA/GreasePencilLayerTreeNode.cs @@ -18,10 +18,10 @@ namespace BlendFile.DNA { public GreasePencilLayerTreeNode ptr_prev; public GreasePencilLayerTreeGroup ptr_parent; public char ptr_name; - public int8_t type; - public uchar[] color = new uchar[3]; + public sbyte type; + public byte[] color = new System.Byte[3]; public int flag; - public GreasePencilLayerTreeNode(GreasePencilLayerTreeNode ptr_next, GreasePencilLayerTreeNode ptr_prev, GreasePencilLayerTreeGroup ptr_parent, char ptr_name, int8_t type, uchar[] color, int flag) { + public GreasePencilLayerTreeNode(GreasePencilLayerTreeNode ptr_next, GreasePencilLayerTreeNode ptr_prev, GreasePencilLayerTreeGroup ptr_parent, char ptr_name, sbyte type, byte[] color, int flag) { this.ptr_next = ptr_next; this.ptr_prev = ptr_prev; this.ptr_parent = ptr_parent; diff --git a/BlendFile/DNA/GreasePencilOnionSkinningSettings.cs b/BlendFile/DNA/GreasePencilOnionSkinningSettings.cs index 79bac74..5e26352 100644 --- a/BlendFile/DNA/GreasePencilOnionSkinningSettings.cs +++ b/BlendFile/DNA/GreasePencilOnionSkinningSettings.cs @@ -15,16 +15,16 @@ namespace BlendFile.DNA { public struct GreasePencilOnionSkinningSettings { public float opacity; - public int8_t mode; - public uchar flag; - public uchar filter; + public sbyte mode; + public byte flag; + public byte filter; public char[] _pad = new System.Char[1]; public short num_frames_before; public short num_frames_after; public float[] color_before = new System.Single[3]; public float[] color_after = new System.Single[3]; public char[] _pad2 = new System.Char[4]; - public GreasePencilOnionSkinningSettings(float opacity, int8_t mode, uchar flag, uchar filter, char[] _pad, short num_frames_before, short num_frames_after, float[] color_before, float[] color_after, char[] _pad2) { + public GreasePencilOnionSkinningSettings(float opacity, sbyte mode, byte flag, byte filter, char[] _pad, short num_frames_before, short num_frames_after, float[] color_before, float[] color_after, char[] _pad2) { this.opacity = opacity; this.mode = mode; this.flag = flag; diff --git a/BlendFile/DNA/IDPropertyUIDataBool.cs b/BlendFile/DNA/IDPropertyUIDataBool.cs index 08a8eff..8d9956f 100644 --- a/BlendFile/DNA/IDPropertyUIDataBool.cs +++ b/BlendFile/DNA/IDPropertyUIDataBool.cs @@ -15,11 +15,11 @@ namespace BlendFile.DNA { public class IDPropertyUIDataBool { public IDPropertyUIData @base; - public int8_t ptr_default_array; + public sbyte ptr_default_array; public int default_array_len; public char[] _pad = new System.Char[3]; - public int8_t default_value; - public IDPropertyUIDataBool(IDPropertyUIData @base, int8_t ptr_default_array, int default_array_len, char[] _pad, int8_t default_value) { + public sbyte default_value; + public IDPropertyUIDataBool(IDPropertyUIData @base, sbyte ptr_default_array, int default_array_len, char[] _pad, sbyte default_value) { this.@base = @base; this.ptr_default_array = ptr_default_array; this.default_array_len = default_array_len; diff --git a/BlendFile/DNA/LayoutPanelState.cs b/BlendFile/DNA/LayoutPanelState.cs index c54b035..3daad3a 100644 --- a/BlendFile/DNA/LayoutPanelState.cs +++ b/BlendFile/DNA/LayoutPanelState.cs @@ -17,9 +17,9 @@ namespace BlendFile.DNA { public LayoutPanelState ptr_next; public LayoutPanelState ptr_prev; public char ptr_idname; - public uchar flag; + public byte flag; public char[] _pad = new System.Char[7]; - public LayoutPanelState(LayoutPanelState ptr_next, LayoutPanelState ptr_prev, char ptr_idname, uchar flag, char[] _pad) { + public LayoutPanelState(LayoutPanelState ptr_next, LayoutPanelState ptr_prev, char ptr_idname, byte flag, char[] _pad) { this.ptr_next = ptr_next; this.ptr_prev = ptr_prev; this.ptr_idname = ptr_idname; diff --git a/BlendFile/DNA/LightLinkingRuntime.cs b/BlendFile/DNA/LightLinkingRuntime.cs index 14c395c..0f5ec94 100644 --- a/BlendFile/DNA/LightLinkingRuntime.cs +++ b/BlendFile/DNA/LightLinkingRuntime.cs @@ -14,12 +14,12 @@ using System; namespace BlendFile.DNA { public struct LightLinkingRuntime { - public uint64_t light_set_membership; - public uint64_t shadow_set_membership; - public uchar receiver_light_set; - public uchar blocker_shadow_set; - public uchar[] _pad = new uchar[6]; - public LightLinkingRuntime(uint64_t light_set_membership, uint64_t shadow_set_membership, uchar receiver_light_set, uchar blocker_shadow_set, uchar[] _pad) { + public ulong light_set_membership; + public ulong shadow_set_membership; + public byte receiver_light_set; + public byte blocker_shadow_set; + public byte[] _pad = new System.Byte[6]; + public LightLinkingRuntime(ulong light_set_membership, ulong shadow_set_membership, byte receiver_light_set, byte blocker_shadow_set, byte[] _pad) { this.light_set_membership = light_set_membership; this.shadow_set_membership = shadow_set_membership; this.receiver_light_set = receiver_light_set; diff --git a/BlendFile/DNA/LightProbeConnectivityData.cs b/BlendFile/DNA/LightProbeConnectivityData.cs index 0d79973..b9bb358 100644 --- a/BlendFile/DNA/LightProbeConnectivityData.cs +++ b/BlendFile/DNA/LightProbeConnectivityData.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public class LightProbeConnectivityData { - public uchar ptr_validity; - public LightProbeConnectivityData(uchar ptr_validity) { + public byte ptr_validity; + public LightProbeConnectivityData(byte ptr_validity) { this.ptr_validity = ptr_validity; } } diff --git a/BlendFile/DNA/MBoolProperty.cs b/BlendFile/DNA/MBoolProperty.cs index 7100b40..570597b 100644 --- a/BlendFile/DNA/MBoolProperty.cs +++ b/BlendFile/DNA/MBoolProperty.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct MBoolProperty { - public uchar b; - public MBoolProperty(uchar b) { + public byte b; + public MBoolProperty(byte b) { this.b = b; } } diff --git a/BlendFile/DNA/MInt8Property.cs b/BlendFile/DNA/MInt8Property.cs index 4b02459..81a98c5 100644 --- a/BlendFile/DNA/MInt8Property.cs +++ b/BlendFile/DNA/MInt8Property.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct MInt8Property { - public int8_t i; - public MInt8Property(int8_t i) { + public sbyte i; + public MInt8Property(sbyte i) { this.i = i; } } diff --git a/BlendFile/DNA/MirrorModifierData.cs b/BlendFile/DNA/MirrorModifierData.cs index dd9cbef..b45ee88 100644 --- a/BlendFile/DNA/MirrorModifierData.cs +++ b/BlendFile/DNA/MirrorModifierData.cs @@ -19,13 +19,13 @@ namespace BlendFile.DNA { public short flag; public float tolerance; public float bisect_threshold; - public uchar use_correct_order_on_merge; + public byte use_correct_order_on_merge; public char[] _pad = new System.Char[3]; public float[] uv_offset = new System.Single[2]; public float[] uv_offset_copy = new System.Single[2]; public Object ptr_mirror_ob; public object ptr__pad1; - public MirrorModifierData(ModifierData modifier, short axis, short flag, float tolerance, float bisect_threshold, uchar use_correct_order_on_merge, char[] _pad, float[] uv_offset, float[] uv_offset_copy, Object ptr_mirror_ob, object ptr__pad1) { + public MirrorModifierData(ModifierData modifier, short axis, short flag, float tolerance, float bisect_threshold, byte use_correct_order_on_merge, char[] _pad, float[] uv_offset, float[] uv_offset_copy, Object ptr_mirror_ob, object ptr__pad1) { this.modifier = modifier; this.axis = axis; this.flag = flag; diff --git a/BlendFile/DNA/NodeAccumulateField.cs b/BlendFile/DNA/NodeAccumulateField.cs index de4a3ff..4a35d90 100644 --- a/BlendFile/DNA/NodeAccumulateField.cs +++ b/BlendFile/DNA/NodeAccumulateField.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeAccumulateField { - public uchar data_type; - public uchar domain; - public NodeAccumulateField(uchar data_type, uchar domain) { + public byte data_type; + public byte domain; + public NodeAccumulateField(byte data_type, byte domain) { this.data_type = data_type; this.domain = domain; } diff --git a/BlendFile/DNA/NodeCMPCombSepColor.cs b/BlendFile/DNA/NodeCMPCombSepColor.cs index 68a1b43..67feb93 100644 --- a/BlendFile/DNA/NodeCMPCombSepColor.cs +++ b/BlendFile/DNA/NodeCMPCombSepColor.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeCMPCombSepColor { - public uchar mode; - public uchar ycc_mode; - public NodeCMPCombSepColor(uchar mode, uchar ycc_mode) { + public byte mode; + public byte ycc_mode; + public NodeCMPCombSepColor(byte mode, byte ycc_mode) { this.mode = mode; this.ycc_mode = ycc_mode; } diff --git a/BlendFile/DNA/NodeCombSepColor.cs b/BlendFile/DNA/NodeCombSepColor.cs index b22e0db..c0571ce 100644 --- a/BlendFile/DNA/NodeCombSepColor.cs +++ b/BlendFile/DNA/NodeCombSepColor.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeCombSepColor { - public int8_t mode; - public NodeCombSepColor(int8_t mode) { + public sbyte mode; + public NodeCombSepColor(sbyte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeForeachGeometryElementGenerationItem.cs b/BlendFile/DNA/NodeForeachGeometryElementGenerationItem.cs index 1acd8a6..ada1814 100644 --- a/BlendFile/DNA/NodeForeachGeometryElementGenerationItem.cs +++ b/BlendFile/DNA/NodeForeachGeometryElementGenerationItem.cs @@ -16,10 +16,10 @@ namespace BlendFile.DNA { public class NodeForeachGeometryElementGenerationItem { public char ptr_name; public short socket_type; - public uchar domain; + public byte domain; public char[] _pad = new System.Char[1]; public int identifier; - public NodeForeachGeometryElementGenerationItem(char ptr_name, short socket_type, uchar domain, char[] _pad, int identifier) { + public NodeForeachGeometryElementGenerationItem(char ptr_name, short socket_type, byte domain, char[] _pad, int identifier) { this.ptr_name = ptr_name; this.socket_type = socket_type; this.domain = domain; diff --git a/BlendFile/DNA/NodeFunctionCompare.cs b/BlendFile/DNA/NodeFunctionCompare.cs index c9fa4cb..e6d1c22 100644 --- a/BlendFile/DNA/NodeFunctionCompare.cs +++ b/BlendFile/DNA/NodeFunctionCompare.cs @@ -14,11 +14,11 @@ using System; namespace BlendFile.DNA { public struct NodeFunctionCompare { - public int8_t operation; - public int8_t data_type; - public int8_t mode; + public sbyte operation; + public sbyte data_type; + public sbyte mode; public char[] _pad = new System.Char[1]; - public NodeFunctionCompare(int8_t operation, int8_t data_type, int8_t mode, char[] _pad) { + public NodeFunctionCompare(sbyte operation, sbyte data_type, sbyte mode, char[] _pad) { this.operation = operation; this.data_type = data_type; this.mode = mode; diff --git a/BlendFile/DNA/NodeGeometryAttributeCapture.cs b/BlendFile/DNA/NodeGeometryAttributeCapture.cs index 83de3ca..f3195e6 100644 --- a/BlendFile/DNA/NodeGeometryAttributeCapture.cs +++ b/BlendFile/DNA/NodeGeometryAttributeCapture.cs @@ -14,14 +14,14 @@ using System; namespace BlendFile.DNA { public class NodeGeometryAttributeCapture { - public int8_t data_type; - public int8_t domain; + public sbyte data_type; + public sbyte domain; public char[] _pad = new System.Char[2]; public int next_identifier; public NodeGeometryAttributeCaptureItem ptr_capture_items; public int capture_items_num; public int active_index; - public NodeGeometryAttributeCapture(int8_t data_type, int8_t domain, char[] _pad, int next_identifier, NodeGeometryAttributeCaptureItem ptr_capture_items, int capture_items_num, int active_index) { + public NodeGeometryAttributeCapture(sbyte data_type, sbyte domain, char[] _pad, int next_identifier, NodeGeometryAttributeCaptureItem ptr_capture_items, int capture_items_num, int active_index) { this.data_type = data_type; this.domain = domain; this._pad = _pad; diff --git a/BlendFile/DNA/NodeGeometryAttributeCaptureItem.cs b/BlendFile/DNA/NodeGeometryAttributeCaptureItem.cs index 754af91..c86494b 100644 --- a/BlendFile/DNA/NodeGeometryAttributeCaptureItem.cs +++ b/BlendFile/DNA/NodeGeometryAttributeCaptureItem.cs @@ -14,11 +14,11 @@ using System; namespace BlendFile.DNA { public class NodeGeometryAttributeCaptureItem { - public int8_t data_type; + public sbyte data_type; public char[] _pad = new System.Char[3]; public int identifier; public char ptr_name; - public NodeGeometryAttributeCaptureItem(int8_t data_type, char[] _pad, int identifier, char ptr_name) { + public NodeGeometryAttributeCaptureItem(sbyte data_type, char[] _pad, int identifier, char ptr_name) { this.data_type = data_type; this._pad = _pad; this.identifier = identifier; diff --git a/BlendFile/DNA/NodeGeometryCollectionInfo.cs b/BlendFile/DNA/NodeGeometryCollectionInfo.cs index 68a9f4c..69293fe 100644 --- a/BlendFile/DNA/NodeGeometryCollectionInfo.cs +++ b/BlendFile/DNA/NodeGeometryCollectionInfo.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCollectionInfo { - public uchar transform_space; - public NodeGeometryCollectionInfo(uchar transform_space) { + public byte transform_space; + public NodeGeometryCollectionInfo(byte transform_space) { this.transform_space = transform_space; } } diff --git a/BlendFile/DNA/NodeGeometryCurveFill.cs b/BlendFile/DNA/NodeGeometryCurveFill.cs index 73d571f..834d94b 100644 --- a/BlendFile/DNA/NodeGeometryCurveFill.cs +++ b/BlendFile/DNA/NodeGeometryCurveFill.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurveFill { - public uchar mode; - public NodeGeometryCurveFill(uchar mode) { + public byte mode; + public NodeGeometryCurveFill(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryCurveFillet.cs b/BlendFile/DNA/NodeGeometryCurveFillet.cs index 66e5caa..3bcc750 100644 --- a/BlendFile/DNA/NodeGeometryCurveFillet.cs +++ b/BlendFile/DNA/NodeGeometryCurveFillet.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurveFillet { - public uchar mode; - public NodeGeometryCurveFillet(uchar mode) { + public byte mode; + public NodeGeometryCurveFillet(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryCurvePrimitiveArc.cs b/BlendFile/DNA/NodeGeometryCurvePrimitiveArc.cs index d97d692..8a13261 100644 --- a/BlendFile/DNA/NodeGeometryCurvePrimitiveArc.cs +++ b/BlendFile/DNA/NodeGeometryCurvePrimitiveArc.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurvePrimitiveArc { - public uchar mode; - public NodeGeometryCurvePrimitiveArc(uchar mode) { + public byte mode; + public NodeGeometryCurvePrimitiveArc(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryCurvePrimitiveBezierSegment.cs b/BlendFile/DNA/NodeGeometryCurvePrimitiveBezierSegment.cs index 2c9bdfa..8eaec8e 100644 --- a/BlendFile/DNA/NodeGeometryCurvePrimitiveBezierSegment.cs +++ b/BlendFile/DNA/NodeGeometryCurvePrimitiveBezierSegment.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurvePrimitiveBezierSegment { - public uchar mode; - public NodeGeometryCurvePrimitiveBezierSegment(uchar mode) { + public byte mode; + public NodeGeometryCurvePrimitiveBezierSegment(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryCurvePrimitiveCircle.cs b/BlendFile/DNA/NodeGeometryCurvePrimitiveCircle.cs index 10b0fcd..2d5bb4e 100644 --- a/BlendFile/DNA/NodeGeometryCurvePrimitiveCircle.cs +++ b/BlendFile/DNA/NodeGeometryCurvePrimitiveCircle.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurvePrimitiveCircle { - public uchar mode; - public NodeGeometryCurvePrimitiveCircle(uchar mode) { + public byte mode; + public NodeGeometryCurvePrimitiveCircle(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryCurvePrimitiveLine.cs b/BlendFile/DNA/NodeGeometryCurvePrimitiveLine.cs index 83f59a1..7fbc3d6 100644 --- a/BlendFile/DNA/NodeGeometryCurvePrimitiveLine.cs +++ b/BlendFile/DNA/NodeGeometryCurvePrimitiveLine.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurvePrimitiveLine { - public uchar mode; - public NodeGeometryCurvePrimitiveLine(uchar mode) { + public byte mode; + public NodeGeometryCurvePrimitiveLine(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryCurvePrimitiveQuad.cs b/BlendFile/DNA/NodeGeometryCurvePrimitiveQuad.cs index 0a920d3..bed68a8 100644 --- a/BlendFile/DNA/NodeGeometryCurvePrimitiveQuad.cs +++ b/BlendFile/DNA/NodeGeometryCurvePrimitiveQuad.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurvePrimitiveQuad { - public uchar mode; - public NodeGeometryCurvePrimitiveQuad(uchar mode) { + public byte mode; + public NodeGeometryCurvePrimitiveQuad(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryCurveResample.cs b/BlendFile/DNA/NodeGeometryCurveResample.cs index b211296..374403f 100644 --- a/BlendFile/DNA/NodeGeometryCurveResample.cs +++ b/BlendFile/DNA/NodeGeometryCurveResample.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurveResample { - public uchar mode; - public NodeGeometryCurveResample(uchar mode) { + public byte mode; + public NodeGeometryCurveResample(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryCurveSample.cs b/BlendFile/DNA/NodeGeometryCurveSample.cs index 8571ee4..115efad 100644 --- a/BlendFile/DNA/NodeGeometryCurveSample.cs +++ b/BlendFile/DNA/NodeGeometryCurveSample.cs @@ -14,11 +14,11 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurveSample { - public uchar mode; - public int8_t use_all_curves; - public int8_t data_type; + public byte mode; + public sbyte use_all_curves; + public sbyte data_type; public char[] _pad = new System.Char[1]; - public NodeGeometryCurveSample(uchar mode, int8_t use_all_curves, int8_t data_type, char[] _pad) { + public NodeGeometryCurveSample(byte mode, sbyte use_all_curves, sbyte data_type, char[] _pad) { this.mode = mode; this.use_all_curves = use_all_curves; this.data_type = data_type; diff --git a/BlendFile/DNA/NodeGeometryCurveSelectHandles.cs b/BlendFile/DNA/NodeGeometryCurveSelectHandles.cs index d25048d..b0329f9 100644 --- a/BlendFile/DNA/NodeGeometryCurveSelectHandles.cs +++ b/BlendFile/DNA/NodeGeometryCurveSelectHandles.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurveSelectHandles { - public uchar handle_type; - public uchar mode; - public NodeGeometryCurveSelectHandles(uchar handle_type, uchar mode) { + public byte handle_type; + public byte mode; + public NodeGeometryCurveSelectHandles(byte handle_type, byte mode) { this.handle_type = handle_type; this.mode = mode; } diff --git a/BlendFile/DNA/NodeGeometryCurveSetHandles.cs b/BlendFile/DNA/NodeGeometryCurveSetHandles.cs index 56abef8..4aec6f8 100644 --- a/BlendFile/DNA/NodeGeometryCurveSetHandles.cs +++ b/BlendFile/DNA/NodeGeometryCurveSetHandles.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurveSetHandles { - public uchar handle_type; - public uchar mode; - public NodeGeometryCurveSetHandles(uchar handle_type, uchar mode) { + public byte handle_type; + public byte mode; + public NodeGeometryCurveSetHandles(byte handle_type, byte mode) { this.handle_type = handle_type; this.mode = mode; } diff --git a/BlendFile/DNA/NodeGeometryCurveSplineType.cs b/BlendFile/DNA/NodeGeometryCurveSplineType.cs index 9a62b35..6d8116b 100644 --- a/BlendFile/DNA/NodeGeometryCurveSplineType.cs +++ b/BlendFile/DNA/NodeGeometryCurveSplineType.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurveSplineType { - public uchar spline_type; - public NodeGeometryCurveSplineType(uchar spline_type) { + public byte spline_type; + public NodeGeometryCurveSplineType(byte spline_type) { this.spline_type = spline_type; } } diff --git a/BlendFile/DNA/NodeGeometryCurveToPoints.cs b/BlendFile/DNA/NodeGeometryCurveToPoints.cs index d5bb8ef..152ae99 100644 --- a/BlendFile/DNA/NodeGeometryCurveToPoints.cs +++ b/BlendFile/DNA/NodeGeometryCurveToPoints.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurveToPoints { - public uchar mode; - public NodeGeometryCurveToPoints(uchar mode) { + public byte mode; + public NodeGeometryCurveToPoints(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryCurveTrim.cs b/BlendFile/DNA/NodeGeometryCurveTrim.cs index 78b12d2..c4cc71a 100644 --- a/BlendFile/DNA/NodeGeometryCurveTrim.cs +++ b/BlendFile/DNA/NodeGeometryCurveTrim.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryCurveTrim { - public uchar mode; - public NodeGeometryCurveTrim(uchar mode) { + public byte mode; + public NodeGeometryCurveTrim(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryDeleteGeometry.cs b/BlendFile/DNA/NodeGeometryDeleteGeometry.cs index bc4e9e9..dce59bf 100644 --- a/BlendFile/DNA/NodeGeometryDeleteGeometry.cs +++ b/BlendFile/DNA/NodeGeometryDeleteGeometry.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryDeleteGeometry { - public int8_t domain; - public int8_t mode; - public NodeGeometryDeleteGeometry(int8_t domain, int8_t mode) { + public sbyte domain; + public sbyte mode; + public NodeGeometryDeleteGeometry(sbyte domain, sbyte mode) { this.domain = domain; this.mode = mode; } diff --git a/BlendFile/DNA/NodeGeometryDistributePointsInVolume.cs b/BlendFile/DNA/NodeGeometryDistributePointsInVolume.cs index 358682d..25268cf 100644 --- a/BlendFile/DNA/NodeGeometryDistributePointsInVolume.cs +++ b/BlendFile/DNA/NodeGeometryDistributePointsInVolume.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryDistributePointsInVolume { - public uchar mode; - public NodeGeometryDistributePointsInVolume(uchar mode) { + public byte mode; + public NodeGeometryDistributePointsInVolume(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryDuplicateElements.cs b/BlendFile/DNA/NodeGeometryDuplicateElements.cs index ce6c52a..c431a45 100644 --- a/BlendFile/DNA/NodeGeometryDuplicateElements.cs +++ b/BlendFile/DNA/NodeGeometryDuplicateElements.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryDuplicateElements { - public int8_t domain; - public NodeGeometryDuplicateElements(int8_t domain) { + public sbyte domain; + public NodeGeometryDuplicateElements(sbyte domain) { this.domain = domain; } } diff --git a/BlendFile/DNA/NodeGeometryExtrudeMesh.cs b/BlendFile/DNA/NodeGeometryExtrudeMesh.cs index d2cdfba..4763f9c 100644 --- a/BlendFile/DNA/NodeGeometryExtrudeMesh.cs +++ b/BlendFile/DNA/NodeGeometryExtrudeMesh.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryExtrudeMesh { - public uchar mode; - public NodeGeometryExtrudeMesh(uchar mode) { + public byte mode; + public NodeGeometryExtrudeMesh(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryForeachGeometryElementOutput.cs b/BlendFile/DNA/NodeGeometryForeachGeometryElementOutput.cs index 390bfe6..a0c4fbe 100644 --- a/BlendFile/DNA/NodeGeometryForeachGeometryElementOutput.cs +++ b/BlendFile/DNA/NodeGeometryForeachGeometryElementOutput.cs @@ -18,9 +18,9 @@ namespace BlendFile.DNA { public NodeForeachGeometryElementMainItems main_items; public NodeForeachGeometryElementGenerationItems generation_items; public int inspection_index; - public uchar domain; + public byte domain; public char[] _pad = new System.Char[3]; - public NodeGeometryForeachGeometryElementOutput(NodeForeachGeometryElementInputItems input_items, NodeForeachGeometryElementMainItems main_items, NodeForeachGeometryElementGenerationItems generation_items, int inspection_index, uchar domain, char[] _pad) { + public NodeGeometryForeachGeometryElementOutput(NodeForeachGeometryElementInputItems input_items, NodeForeachGeometryElementMainItems main_items, NodeForeachGeometryElementGenerationItems generation_items, int inspection_index, byte domain, char[] _pad) { this.input_items = input_items; this.main_items = main_items; this.generation_items = generation_items; diff --git a/BlendFile/DNA/NodeGeometryImageTexture.cs b/BlendFile/DNA/NodeGeometryImageTexture.cs index 24ee6fd..dd31e36 100644 --- a/BlendFile/DNA/NodeGeometryImageTexture.cs +++ b/BlendFile/DNA/NodeGeometryImageTexture.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryImageTexture { - public int8_t interpolation; - public int8_t extension; - public NodeGeometryImageTexture(int8_t interpolation, int8_t extension) { + public sbyte interpolation; + public sbyte extension; + public NodeGeometryImageTexture(sbyte interpolation, sbyte extension) { this.interpolation = interpolation; this.extension = extension; } diff --git a/BlendFile/DNA/NodeGeometryInputNamedAttribute.cs b/BlendFile/DNA/NodeGeometryInputNamedAttribute.cs index eb81e7a..76153d2 100644 --- a/BlendFile/DNA/NodeGeometryInputNamedAttribute.cs +++ b/BlendFile/DNA/NodeGeometryInputNamedAttribute.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryInputNamedAttribute { - public int8_t data_type; - public NodeGeometryInputNamedAttribute(int8_t data_type) { + public sbyte data_type; + public NodeGeometryInputNamedAttribute(sbyte data_type) { this.data_type = data_type; } } diff --git a/BlendFile/DNA/NodeGeometryMergeByDistance.cs b/BlendFile/DNA/NodeGeometryMergeByDistance.cs index 13ae015..f253aa9 100644 --- a/BlendFile/DNA/NodeGeometryMergeByDistance.cs +++ b/BlendFile/DNA/NodeGeometryMergeByDistance.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryMergeByDistance { - public uchar mode; - public NodeGeometryMergeByDistance(uchar mode) { + public byte mode; + public NodeGeometryMergeByDistance(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryMergeLayers.cs b/BlendFile/DNA/NodeGeometryMergeLayers.cs index d690a05..9f945ab 100644 --- a/BlendFile/DNA/NodeGeometryMergeLayers.cs +++ b/BlendFile/DNA/NodeGeometryMergeLayers.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryMergeLayers { - public int8_t mode; - public NodeGeometryMergeLayers(int8_t mode) { + public sbyte mode; + public NodeGeometryMergeLayers(sbyte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryMeshCircle.cs b/BlendFile/DNA/NodeGeometryMeshCircle.cs index 0515675..2f8236f 100644 --- a/BlendFile/DNA/NodeGeometryMeshCircle.cs +++ b/BlendFile/DNA/NodeGeometryMeshCircle.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryMeshCircle { - public uchar fill_type; - public NodeGeometryMeshCircle(uchar fill_type) { + public byte fill_type; + public NodeGeometryMeshCircle(byte fill_type) { this.fill_type = fill_type; } } diff --git a/BlendFile/DNA/NodeGeometryMeshCone.cs b/BlendFile/DNA/NodeGeometryMeshCone.cs index 0f84bc5..92388a0 100644 --- a/BlendFile/DNA/NodeGeometryMeshCone.cs +++ b/BlendFile/DNA/NodeGeometryMeshCone.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryMeshCone { - public uchar fill_type; - public NodeGeometryMeshCone(uchar fill_type) { + public byte fill_type; + public NodeGeometryMeshCone(byte fill_type) { this.fill_type = fill_type; } } diff --git a/BlendFile/DNA/NodeGeometryMeshCylinder.cs b/BlendFile/DNA/NodeGeometryMeshCylinder.cs index 3642966..3456774 100644 --- a/BlendFile/DNA/NodeGeometryMeshCylinder.cs +++ b/BlendFile/DNA/NodeGeometryMeshCylinder.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryMeshCylinder { - public uchar fill_type; - public NodeGeometryMeshCylinder(uchar fill_type) { + public byte fill_type; + public NodeGeometryMeshCylinder(byte fill_type) { this.fill_type = fill_type; } } diff --git a/BlendFile/DNA/NodeGeometryMeshLine.cs b/BlendFile/DNA/NodeGeometryMeshLine.cs index d446d84..052f393 100644 --- a/BlendFile/DNA/NodeGeometryMeshLine.cs +++ b/BlendFile/DNA/NodeGeometryMeshLine.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryMeshLine { - public uchar mode; - public uchar count_mode; - public NodeGeometryMeshLine(uchar mode, uchar count_mode) { + public byte mode; + public byte count_mode; + public NodeGeometryMeshLine(byte mode, byte count_mode) { this.mode = mode; this.count_mode = count_mode; } diff --git a/BlendFile/DNA/NodeGeometryMeshToPoints.cs b/BlendFile/DNA/NodeGeometryMeshToPoints.cs index 7454763..8e5069b 100644 --- a/BlendFile/DNA/NodeGeometryMeshToPoints.cs +++ b/BlendFile/DNA/NodeGeometryMeshToPoints.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryMeshToPoints { - public uchar mode; - public NodeGeometryMeshToPoints(uchar mode) { + public byte mode; + public NodeGeometryMeshToPoints(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryMeshToVolume.cs b/BlendFile/DNA/NodeGeometryMeshToVolume.cs index 792a338..5d5c992 100644 --- a/BlendFile/DNA/NodeGeometryMeshToVolume.cs +++ b/BlendFile/DNA/NodeGeometryMeshToVolume.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryMeshToVolume { - public uchar resolution_mode; - public NodeGeometryMeshToVolume(uchar resolution_mode) { + public byte resolution_mode; + public NodeGeometryMeshToVolume(byte resolution_mode) { this.resolution_mode = resolution_mode; } } diff --git a/BlendFile/DNA/NodeGeometryObjectInfo.cs b/BlendFile/DNA/NodeGeometryObjectInfo.cs index dc8fdca..d399e8e 100644 --- a/BlendFile/DNA/NodeGeometryObjectInfo.cs +++ b/BlendFile/DNA/NodeGeometryObjectInfo.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryObjectInfo { - public uchar transform_space; - public NodeGeometryObjectInfo(uchar transform_space) { + public byte transform_space; + public NodeGeometryObjectInfo(byte transform_space) { this.transform_space = transform_space; } } diff --git a/BlendFile/DNA/NodeGeometryPointsToVolume.cs b/BlendFile/DNA/NodeGeometryPointsToVolume.cs index bb28c3c..7274a4c 100644 --- a/BlendFile/DNA/NodeGeometryPointsToVolume.cs +++ b/BlendFile/DNA/NodeGeometryPointsToVolume.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryPointsToVolume { - public uchar resolution_mode; - public uchar input_type_radius; - public NodeGeometryPointsToVolume(uchar resolution_mode, uchar input_type_radius) { + public byte resolution_mode; + public byte input_type_radius; + public NodeGeometryPointsToVolume(byte resolution_mode, byte input_type_radius) { this.resolution_mode = resolution_mode; this.input_type_radius = input_type_radius; } diff --git a/BlendFile/DNA/NodeGeometryProximity.cs b/BlendFile/DNA/NodeGeometryProximity.cs index ad165b3..998e8bd 100644 --- a/BlendFile/DNA/NodeGeometryProximity.cs +++ b/BlendFile/DNA/NodeGeometryProximity.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryProximity { - public uchar target_element; - public NodeGeometryProximity(uchar target_element) { + public byte target_element; + public NodeGeometryProximity(byte target_element) { this.target_element = target_element; } } diff --git a/BlendFile/DNA/NodeGeometryRaycast.cs b/BlendFile/DNA/NodeGeometryRaycast.cs index b937707..4bd6dae 100644 --- a/BlendFile/DNA/NodeGeometryRaycast.cs +++ b/BlendFile/DNA/NodeGeometryRaycast.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryRaycast { - public uchar mapping; - public int8_t data_type; - public NodeGeometryRaycast(uchar mapping, int8_t data_type) { + public byte mapping; + public sbyte data_type; + public NodeGeometryRaycast(byte mapping, sbyte data_type) { this.mapping = mapping; this.data_type = data_type; } diff --git a/BlendFile/DNA/NodeGeometrySampleIndex.cs b/BlendFile/DNA/NodeGeometrySampleIndex.cs index 09c1149..323129b 100644 --- a/BlendFile/DNA/NodeGeometrySampleIndex.cs +++ b/BlendFile/DNA/NodeGeometrySampleIndex.cs @@ -14,11 +14,11 @@ using System; namespace BlendFile.DNA { public struct NodeGeometrySampleIndex { - public int8_t data_type; - public int8_t domain; - public int8_t clamp; + public sbyte data_type; + public sbyte domain; + public sbyte clamp; public char[] _pad = new System.Char[1]; - public NodeGeometrySampleIndex(int8_t data_type, int8_t domain, int8_t clamp, char[] _pad) { + public NodeGeometrySampleIndex(sbyte data_type, sbyte domain, sbyte clamp, char[] _pad) { this.data_type = data_type; this.domain = domain; this.clamp = clamp; diff --git a/BlendFile/DNA/NodeGeometrySeparateGeometry.cs b/BlendFile/DNA/NodeGeometrySeparateGeometry.cs index 0a37f89..b658fb3 100644 --- a/BlendFile/DNA/NodeGeometrySeparateGeometry.cs +++ b/BlendFile/DNA/NodeGeometrySeparateGeometry.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometrySeparateGeometry { - public int8_t domain; - public NodeGeometrySeparateGeometry(int8_t domain) { + public sbyte domain; + public NodeGeometrySeparateGeometry(sbyte domain) { this.domain = domain; } } diff --git a/BlendFile/DNA/NodeGeometrySetCurveHandlePositions.cs b/BlendFile/DNA/NodeGeometrySetCurveHandlePositions.cs index 0f244a5..5b4269a 100644 --- a/BlendFile/DNA/NodeGeometrySetCurveHandlePositions.cs +++ b/BlendFile/DNA/NodeGeometrySetCurveHandlePositions.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometrySetCurveHandlePositions { - public uchar mode; - public NodeGeometrySetCurveHandlePositions(uchar mode) { + public byte mode; + public NodeGeometrySetCurveHandlePositions(byte mode) { this.mode = mode; } } diff --git a/BlendFile/DNA/NodeGeometryStoreNamedAttribute.cs b/BlendFile/DNA/NodeGeometryStoreNamedAttribute.cs index 263e48f..2412ac6 100644 --- a/BlendFile/DNA/NodeGeometryStoreNamedAttribute.cs +++ b/BlendFile/DNA/NodeGeometryStoreNamedAttribute.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryStoreNamedAttribute { - public int8_t data_type; - public int8_t domain; - public NodeGeometryStoreNamedAttribute(int8_t data_type, int8_t domain) { + public sbyte data_type; + public sbyte domain; + public NodeGeometryStoreNamedAttribute(sbyte data_type, sbyte domain) { this.data_type = data_type; this.domain = domain; } diff --git a/BlendFile/DNA/NodeGeometryStringToCurves.cs b/BlendFile/DNA/NodeGeometryStringToCurves.cs index 3871fc8..7be99c1 100644 --- a/BlendFile/DNA/NodeGeometryStringToCurves.cs +++ b/BlendFile/DNA/NodeGeometryStringToCurves.cs @@ -14,11 +14,11 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryStringToCurves { - public uchar overflow; - public uchar align_x; - public uchar align_y; - public uchar pivot_mode; - public NodeGeometryStringToCurves(uchar overflow, uchar align_x, uchar align_y, uchar pivot_mode) { + public byte overflow; + public byte align_x; + public byte align_y; + public byte pivot_mode; + public NodeGeometryStringToCurves(byte overflow, byte align_x, byte align_y, byte pivot_mode) { this.overflow = overflow; this.align_x = align_x; this.align_y = align_y; diff --git a/BlendFile/DNA/NodeGeometrySubdivisionSurface.cs b/BlendFile/DNA/NodeGeometrySubdivisionSurface.cs index 922ad83..67b8c65 100644 --- a/BlendFile/DNA/NodeGeometrySubdivisionSurface.cs +++ b/BlendFile/DNA/NodeGeometrySubdivisionSurface.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeGeometrySubdivisionSurface { - public uchar uv_smooth; - public uchar boundary_smooth; - public NodeGeometrySubdivisionSurface(uchar uv_smooth, uchar boundary_smooth) { + public byte uv_smooth; + public byte boundary_smooth; + public NodeGeometrySubdivisionSurface(byte uv_smooth, byte boundary_smooth) { this.uv_smooth = uv_smooth; this.boundary_smooth = boundary_smooth; } diff --git a/BlendFile/DNA/NodeGeometryTransferAttribute.cs b/BlendFile/DNA/NodeGeometryTransferAttribute.cs index 227e77f..426bb76 100644 --- a/BlendFile/DNA/NodeGeometryTransferAttribute.cs +++ b/BlendFile/DNA/NodeGeometryTransferAttribute.cs @@ -14,11 +14,11 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryTransferAttribute { - public int8_t data_type; - public int8_t domain; - public uchar mode; + public sbyte data_type; + public sbyte domain; + public byte mode; public char[] _pad = new System.Char[1]; - public NodeGeometryTransferAttribute(int8_t data_type, int8_t domain, uchar mode, char[] _pad) { + public NodeGeometryTransferAttribute(sbyte data_type, sbyte domain, byte mode, char[] _pad) { this.data_type = data_type; this.domain = domain; this.mode = mode; diff --git a/BlendFile/DNA/NodeGeometryUVUnwrap.cs b/BlendFile/DNA/NodeGeometryUVUnwrap.cs index d264694..665bb36 100644 --- a/BlendFile/DNA/NodeGeometryUVUnwrap.cs +++ b/BlendFile/DNA/NodeGeometryUVUnwrap.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryUVUnwrap { - public uchar method; - public NodeGeometryUVUnwrap(uchar method) { + public byte method; + public NodeGeometryUVUnwrap(byte method) { this.method = method; } } diff --git a/BlendFile/DNA/NodeGeometryViewer.cs b/BlendFile/DNA/NodeGeometryViewer.cs index 92d3242..01cc6ed 100644 --- a/BlendFile/DNA/NodeGeometryViewer.cs +++ b/BlendFile/DNA/NodeGeometryViewer.cs @@ -14,9 +14,9 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryViewer { - public int8_t data_type; - public int8_t domain; - public NodeGeometryViewer(int8_t data_type, int8_t domain) { + public sbyte data_type; + public sbyte domain; + public NodeGeometryViewer(sbyte data_type, sbyte domain) { this.data_type = data_type; this.domain = domain; } diff --git a/BlendFile/DNA/NodeGeometryVolumeToMesh.cs b/BlendFile/DNA/NodeGeometryVolumeToMesh.cs index bab1aa0..cf97839 100644 --- a/BlendFile/DNA/NodeGeometryVolumeToMesh.cs +++ b/BlendFile/DNA/NodeGeometryVolumeToMesh.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeGeometryVolumeToMesh { - public uchar resolution_mode; - public NodeGeometryVolumeToMesh(uchar resolution_mode) { + public byte resolution_mode; + public NodeGeometryVolumeToMesh(byte resolution_mode) { this.resolution_mode = resolution_mode; } } diff --git a/BlendFile/DNA/NodeInputBool.cs b/BlendFile/DNA/NodeInputBool.cs index e00acad..f5d52df 100644 --- a/BlendFile/DNA/NodeInputBool.cs +++ b/BlendFile/DNA/NodeInputBool.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeInputBool { - public uchar boolean; - public NodeInputBool(uchar boolean) { + public byte boolean; + public NodeInputBool(byte boolean) { this.boolean = boolean; } } diff --git a/BlendFile/DNA/NodeMapRange.cs b/BlendFile/DNA/NodeMapRange.cs index f7350e0..ec8349f 100644 --- a/BlendFile/DNA/NodeMapRange.cs +++ b/BlendFile/DNA/NodeMapRange.cs @@ -14,11 +14,11 @@ using System; namespace BlendFile.DNA { public struct NodeMapRange { - public uchar data_type; - public uchar interpolation_type; - public uchar clamp; + public byte data_type; + public byte interpolation_type; + public byte clamp; public char[] _pad = new System.Char[5]; - public NodeMapRange(uchar data_type, uchar interpolation_type, uchar clamp, char[] _pad) { + public NodeMapRange(byte data_type, byte interpolation_type, byte clamp, char[] _pad) { this.data_type = data_type; this.interpolation_type = interpolation_type; this.clamp = clamp; diff --git a/BlendFile/DNA/NodeMenuSwitch.cs b/BlendFile/DNA/NodeMenuSwitch.cs index b13464d..d27263c 100644 --- a/BlendFile/DNA/NodeMenuSwitch.cs +++ b/BlendFile/DNA/NodeMenuSwitch.cs @@ -15,9 +15,9 @@ namespace BlendFile.DNA { public struct NodeMenuSwitch { public NodeEnumDefinition enum_definition; - public uchar data_type; + public byte data_type; public char[] _pad = new System.Char[7]; - public NodeMenuSwitch(NodeEnumDefinition enum_definition, uchar data_type, char[] _pad) { + public NodeMenuSwitch(NodeEnumDefinition enum_definition, byte data_type, char[] _pad) { this.enum_definition = enum_definition; this.data_type = data_type; this._pad = _pad; diff --git a/BlendFile/DNA/NodeRandomValue.cs b/BlendFile/DNA/NodeRandomValue.cs index 96927b7..dbb4fa4 100644 --- a/BlendFile/DNA/NodeRandomValue.cs +++ b/BlendFile/DNA/NodeRandomValue.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeRandomValue { - public uchar data_type; - public NodeRandomValue(uchar data_type) { + public byte data_type; + public NodeRandomValue(byte data_type) { this.data_type = data_type; } } diff --git a/BlendFile/DNA/NodeShaderMix.cs b/BlendFile/DNA/NodeShaderMix.cs index f0c5680..499c954 100644 --- a/BlendFile/DNA/NodeShaderMix.cs +++ b/BlendFile/DNA/NodeShaderMix.cs @@ -14,13 +14,13 @@ using System; namespace BlendFile.DNA { public struct NodeShaderMix { - public int8_t data_type; - public int8_t factor_mode; - public int8_t clamp_factor; - public int8_t clamp_result; - public int8_t blend_type; + public sbyte data_type; + public sbyte factor_mode; + public sbyte clamp_factor; + public sbyte clamp_result; + public sbyte blend_type; public char[] _pad = new System.Char[3]; - public NodeShaderMix(int8_t data_type, int8_t factor_mode, int8_t clamp_factor, int8_t clamp_result, int8_t blend_type, char[] _pad) { + public NodeShaderMix(sbyte data_type, sbyte factor_mode, sbyte clamp_factor, sbyte clamp_result, sbyte blend_type, char[] _pad) { this.data_type = data_type; this.factor_mode = factor_mode; this.clamp_factor = clamp_factor; diff --git a/BlendFile/DNA/NodeSwitch.cs b/BlendFile/DNA/NodeSwitch.cs index dc557ef..a4a07c5 100644 --- a/BlendFile/DNA/NodeSwitch.cs +++ b/BlendFile/DNA/NodeSwitch.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct NodeSwitch { - public uchar input_type; - public NodeSwitch(uchar input_type) { + public byte input_type; + public NodeSwitch(byte input_type) { this.input_type = input_type; } } diff --git a/BlendFile/DNA/NodeTexNoise.cs b/BlendFile/DNA/NodeTexNoise.cs index d57b30e..833e9a5 100644 --- a/BlendFile/DNA/NodeTexNoise.cs +++ b/BlendFile/DNA/NodeTexNoise.cs @@ -16,10 +16,10 @@ namespace BlendFile.DNA { public struct NodeTexNoise { public NodeTexBase @base; public int dimensions; - public uchar type; - public uchar normalize; + public byte type; + public byte normalize; public char[] _pad = new System.Char[2]; - public NodeTexNoise(NodeTexBase @base, int dimensions, uchar type, uchar normalize, char[] _pad) { + public NodeTexNoise(NodeTexBase @base, int dimensions, byte type, byte normalize, char[] _pad) { this.@base = @base; this.dimensions = dimensions; this.type = type; diff --git a/BlendFile/DNA/NodesModifierBake.cs b/BlendFile/DNA/NodesModifierBake.cs index 10786c9..62c35f6 100644 --- a/BlendFile/DNA/NodesModifierBake.cs +++ b/BlendFile/DNA/NodesModifierBake.cs @@ -16,8 +16,8 @@ namespace BlendFile.DNA { public class NodesModifierBake { public int id; public int flag; - public uchar bake_mode; - public int8_t bake_target; + public byte bake_mode; + public sbyte bake_target; public char[] _pad = new System.Char[6]; public char ptr_directory; public int frame_start; @@ -27,8 +27,8 @@ namespace BlendFile.DNA { public NodesModifierDataBlock ptr_data_blocks; public NodesModifierPackedBake ptr_packed; public object ptr__pad2; - public int64_t bake_size; - public NodesModifierBake(int id, int flag, uchar bake_mode, int8_t bake_target, char[] _pad, char ptr_directory, int frame_start, int frame_end, int data_blocks_num, int active_data_block, NodesModifierDataBlock ptr_data_blocks, NodesModifierPackedBake ptr_packed, object ptr__pad2, int64_t bake_size) { + public long bake_size; + public NodesModifierBake(int id, int flag, byte bake_mode, sbyte bake_target, char[] _pad, char ptr_directory, int frame_start, int frame_end, int data_blocks_num, int active_data_block, NodesModifierDataBlock ptr_data_blocks, NodesModifierPackedBake ptr_packed, object ptr__pad2, long bake_size) { this.id = id; this.flag = flag; this.bake_mode = bake_mode; diff --git a/BlendFile/DNA/NodesModifierData.cs b/BlendFile/DNA/NodesModifierData.cs index 6d3d001..bf60aab 100644 --- a/BlendFile/DNA/NodesModifierData.cs +++ b/BlendFile/DNA/NodesModifierData.cs @@ -18,8 +18,8 @@ namespace BlendFile.DNA { public bNodeTree ptr_node_group; public NodesModifierSettings settings; public char ptr_simulation_bake_directory; - public int8_t flag; - public int8_t bake_target; + public sbyte flag; + public sbyte bake_target; public char[] _pad = new System.Char[2]; public int bakes_num; public NodesModifierBake ptr_bakes; @@ -27,7 +27,7 @@ namespace BlendFile.DNA { public int panels_num; public NodesModifierPanel ptr_panels; public NodesModifierRuntimeHandle ptr_runtime; - public NodesModifierData(ModifierData modifier, bNodeTree ptr_node_group, NodesModifierSettings settings, char ptr_simulation_bake_directory, int8_t flag, int8_t bake_target, char[] _pad, int bakes_num, NodesModifierBake ptr_bakes, char[] _pad2, int panels_num, NodesModifierPanel ptr_panels, NodesModifierRuntimeHandle ptr_runtime) { + public NodesModifierData(ModifierData modifier, bNodeTree ptr_node_group, NodesModifierSettings settings, char ptr_simulation_bake_directory, sbyte flag, sbyte bake_target, char[] _pad, int bakes_num, NodesModifierBake ptr_bakes, char[] _pad2, int panels_num, NodesModifierPanel ptr_panels, NodesModifierRuntimeHandle ptr_runtime) { this.modifier = modifier; this.ptr_node_group = ptr_node_group; this.settings = settings; diff --git a/BlendFile/DNA/Object.cs b/BlendFile/DNA/Object.cs index edc9741..3a8211a 100644 --- a/BlendFile/DNA/Object.cs +++ b/BlendFile/DNA/Object.cs @@ -113,7 +113,7 @@ namespace BlendFile.DNA { public char empty_image_visibility_flag; public char empty_image_depth; public char empty_image_flag; - public uchar modifier_flag; + public byte modifier_flag; public char[] _pad8 = new System.Char[4]; public PreviewImage ptr_preview; public ObjectLineArt lineart; @@ -221,7 +221,7 @@ namespace BlendFile.DNA { char empty_image_visibility_flag, char empty_image_depth, char empty_image_flag, - uchar modifier_flag, + byte modifier_flag, char[] _pad8, PreviewImage ptr_preview, ObjectLineArt lineart, diff --git a/BlendFile/DNA/Sequence.cs b/BlendFile/DNA/Sequence.cs index 3a87db8..7e77f37 100644 --- a/BlendFile/DNA/Sequence.cs +++ b/BlendFile/DNA/Sequence.cs @@ -65,7 +65,7 @@ namespace BlendFile.DNA { public int anim_endofs; public int blend_mode; public float blend_opacity; - public int8_t color_tag; + public sbyte color_tag; public char alpha_mode; public char[] _pad2 = new System.Char[2]; public int cache_flag; @@ -134,7 +134,7 @@ namespace BlendFile.DNA { int anim_endofs, int blend_mode, float blend_opacity, - int8_t color_tag, + sbyte color_tag, char alpha_mode, char[] _pad2, int cache_flag, diff --git a/BlendFile/DNA/SessionUID.cs b/BlendFile/DNA/SessionUID.cs index 00bd27c..69e305a 100644 --- a/BlendFile/DNA/SessionUID.cs +++ b/BlendFile/DNA/SessionUID.cs @@ -14,8 +14,8 @@ using System; namespace BlendFile.DNA { public struct SessionUID { - public uint64_t uid_; - public SessionUID(uint64_t uid_) { + public ulong uid_; + public SessionUID(ulong uid_) { this.uid_ = uid_; } } diff --git a/BlendFile/DNA/SpaceSpreadsheet.cs b/BlendFile/DNA/SpaceSpreadsheet.cs index 21919f6..99176ed 100644 --- a/BlendFile/DNA/SpaceSpreadsheet.cs +++ b/BlendFile/DNA/SpaceSpreadsheet.cs @@ -25,10 +25,10 @@ namespace BlendFile.DNA { public ViewerPath viewer_path; public SpreadsheetInstanceID ptr_instance_ids; public int instance_ids_num; - public uchar filter_flag; - public uchar geometry_component_type; - public uchar attribute_domain; - public uchar object_eval_state; + public byte filter_flag; + public byte geometry_component_type; + public byte attribute_domain; + public byte object_eval_state; public int active_layer_index; public int flag; public SpaceSpreadsheet_Runtime ptr_runtime; @@ -44,10 +44,10 @@ namespace BlendFile.DNA { ViewerPath viewer_path, SpreadsheetInstanceID ptr_instance_ids, int instance_ids_num, - uchar filter_flag, - uchar geometry_component_type, - uchar attribute_domain, - uchar object_eval_state, + byte filter_flag, + byte geometry_component_type, + byte attribute_domain, + byte object_eval_state, int active_layer_index, int flag, SpaceSpreadsheet_Runtime ptr_runtime) { diff --git a/BlendFile/DNA/SpreadsheetColumn.cs b/BlendFile/DNA/SpreadsheetColumn.cs index 3248ccd..53b69a5 100644 --- a/BlendFile/DNA/SpreadsheetColumn.cs +++ b/BlendFile/DNA/SpreadsheetColumn.cs @@ -17,10 +17,10 @@ namespace BlendFile.DNA { public SpreadsheetColumn ptr_next; public SpreadsheetColumn ptr_prev; public SpreadsheetColumnID ptr_id; - public uchar data_type; + public byte data_type; public char[] _pad0 = new System.Char[7]; public char ptr_display_name; - public SpreadsheetColumn(SpreadsheetColumn ptr_next, SpreadsheetColumn ptr_prev, SpreadsheetColumnID ptr_id, uchar data_type, char[] _pad0, char ptr_display_name) { + public SpreadsheetColumn(SpreadsheetColumn ptr_next, SpreadsheetColumn ptr_prev, SpreadsheetColumnID ptr_id, byte data_type, char[] _pad0, char ptr_display_name) { this.ptr_next = ptr_next; this.ptr_prev = ptr_prev; this.ptr_id = ptr_id; diff --git a/BlendFile/DNA/SpreadsheetRowFilter.cs b/BlendFile/DNA/SpreadsheetRowFilter.cs index 30e8592..fbb7ff4 100644 --- a/BlendFile/DNA/SpreadsheetRowFilter.cs +++ b/BlendFile/DNA/SpreadsheetRowFilter.cs @@ -17,8 +17,8 @@ namespace BlendFile.DNA { public SpreadsheetRowFilter ptr_next; public SpreadsheetRowFilter ptr_prev; public char[] column_name = new System.Char[64]; - public uchar operation; - public uchar flag; + public byte operation; + public byte flag; public char[] _pad0 = new System.Char[2]; public int value_int; public int[] value_int2 = new System.Int32[2]; @@ -29,7 +29,7 @@ namespace BlendFile.DNA { public float[] value_float3 = new System.Single[3]; public float[] value_color = new System.Single[4]; public char[] _pad1 = new System.Char[4]; - public SpreadsheetRowFilter(SpreadsheetRowFilter ptr_next, SpreadsheetRowFilter ptr_prev, char[] column_name, uchar operation, uchar flag, char[] _pad0, int value_int, int[] value_int2, char ptr_value_string, float value_float, float threshold, float[] value_float2, float[] value_float3, float[] value_color, char[] _pad1) { + public SpreadsheetRowFilter(SpreadsheetRowFilter ptr_next, SpreadsheetRowFilter ptr_prev, char[] column_name, byte operation, byte flag, char[] _pad0, int value_int, int[] value_int2, char ptr_value_string, float value_float, float threshold, float[] value_float2, float[] value_float3, float[] value_color, char[] _pad1) { this.ptr_next = ptr_next; this.ptr_prev = ptr_prev; this.column_name = column_name; diff --git a/BlendFile/DNA/UserDef.cs b/BlendFile/DNA/UserDef.cs index f88f728..5a05986 100644 --- a/BlendFile/DNA/UserDef.cs +++ b/BlendFile/DNA/UserDef.cs @@ -83,8 +83,8 @@ namespace BlendFile.DNA { public short active_asset_library; public short active_extension_repo; public char extension_flag; - public uchar network_timeout; - public uchar network_connection_limit; + public byte network_timeout; + public byte network_connection_limit; public char[] _pad14 = new System.Char[3]; public short undosteps; public int undomemory; @@ -258,8 +258,8 @@ namespace BlendFile.DNA { short active_asset_library, short active_extension_repo, char extension_flag, - uchar network_timeout, - uchar network_connection_limit, + byte network_timeout, + byte network_connection_limit, char[] _pad14, short undosteps, int undomemory, diff --git a/BlendFile/DNA/UserDef_FileSpaceData.cs b/BlendFile/DNA/UserDef_FileSpaceData.cs index 999c52c..e2159f3 100644 --- a/BlendFile/DNA/UserDef_FileSpaceData.cs +++ b/BlendFile/DNA/UserDef_FileSpaceData.cs @@ -20,10 +20,10 @@ namespace BlendFile.DNA { public int details_flags; public int flag; public int _pad0; - public uint64_t filter_id; + public ulong filter_id; public int temp_win_sizex; public int temp_win_sizey; - public UserDef_FileSpaceData(int display_type, int thumbnail_size, int sort_type, int details_flags, int flag, int _pad0, uint64_t filter_id, int temp_win_sizex, int temp_win_sizey) { + public UserDef_FileSpaceData(int display_type, int thumbnail_size, int sort_type, int details_flags, int flag, int _pad0, ulong filter_id, int temp_win_sizex, int temp_win_sizey) { this.display_type = display_type; this.thumbnail_size = thumbnail_size; this.sort_type = sort_type; diff --git a/BlendFile/DNA/UvSculpt.cs b/BlendFile/DNA/UvSculpt.cs index 7f8485e..10579ca 100644 --- a/BlendFile/DNA/UvSculpt.cs +++ b/BlendFile/DNA/UvSculpt.cs @@ -17,9 +17,9 @@ namespace BlendFile.DNA { public CurveMapping ptr_strength_curve; public int size; public float strength; - public int8_t curve_preset; + public sbyte curve_preset; public char[] _pad = new System.Char[7]; - public UvSculpt(CurveMapping ptr_strength_curve, int size, float strength, int8_t curve_preset, char[] _pad) { + public UvSculpt(CurveMapping ptr_strength_curve, int size, float strength, sbyte curve_preset, char[] _pad) { this.ptr_strength_curve = ptr_strength_curve; this.size = size; this.strength = strength; diff --git a/BlendFile/DNA/World.cs b/BlendFile/DNA/World.cs index 6fc2124..7bf1fab 100644 --- a/BlendFile/DNA/World.cs +++ b/BlendFile/DNA/World.cs @@ -52,7 +52,7 @@ namespace BlendFile.DNA { public LightgroupMembership ptr_lightgroup; public object ptr__pad1; public ListBase gpumaterial; - public uint64_t last_update; + public ulong last_update; public World( ID id, AnimData ptr_adt, @@ -92,7 +92,7 @@ namespace BlendFile.DNA { LightgroupMembership ptr_lightgroup, object ptr__pad1, ListBase gpumaterial, - uint64_t last_update) { + ulong last_update) { this.id = id; this.ptr_adt = ptr_adt; this.drawdata = drawdata; diff --git a/BlendFile/DNA/_ExtraTypes.cs b/BlendFile/DNA/_ExtraTypes.cs new file mode 100644 index 0000000..bdbc73d --- /dev/null +++ b/BlendFile/DNA/_ExtraTypes.cs @@ -0,0 +1,268 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using BlendFile.CompatTypes; +using System; + + +namespace BlendFile.DNA { + + public struct DrawData { + } + public struct IDOverrideLibraryRuntime { + } + public struct Depsgraph { + } + public struct UniqueName_Map { + } + public struct FileData { + } + public struct PreviewImageRuntimeHandle { + } + public struct GPUVertBufHandle { + } + public struct GPUBatchHandle { + } + public struct Mat4 { + } + public struct bPoseChannelDrawData { + } + public struct GHash { + } + public struct ActionSlotRuntimeHandle { + } + public struct ExprPyLike_Parsed { + } + public struct EditBone { + } + public struct AssetTypeInfo { + } + public struct ImBuf { + } + public struct CacheArchiveHandle { + } + public struct GSet { + } + public struct LinkNode { + } + public struct CacheReader { + } + public struct EditNurb { + } + public struct EditFont { + } + public struct CurvesGeometryRuntimeHandle { + } + public struct ImplicitSharingInfoHandle { + } + public struct BLI_mempool { + } + public struct PaintSurfaceData { + } + public struct Particle { + } + public struct MANTA { + } + public struct GPUTexture { + } + public struct GpencilBatchCache { + } + public struct LineartCache { + } + public struct GPencilUpdateCache { + } + public struct LatticeDeformData { + } + public struct LineartData { + } + public struct ShrinkwrapTreeData { + } + public struct GreasePencilDrawingRuntimeHandle { + } + public struct GreasePencilLayerRuntimeHandle { + } + public struct GreasePencilLayerGroupRuntimeHandle { + } + public struct GreasePencilRuntimeHandle { + } + public struct ImBufAnim { + } + public struct RenderResult { + } + public struct PartialUpdateRegister { + } + public struct PartialUpdateUser { + } + public struct MovieCache { + } + public struct EditLatt { + } + public struct DrawEngineType { + } + public struct SceneStats { + } + public struct MeshRuntimeHandle { + } + public struct Cloth { + } + public struct ClothHairData { + } + public struct ClothSolverResult { + } + public struct BVHTree { + } + public struct BVHTreeFromMesh { + } + public struct Ocean { + } + public struct OceanCache { + } + public struct NodesModifierRuntimeHandle { + } + public struct MovieClipCache { + } + public struct bNodeTreeInterfaceRuntimeHandle { + } + public struct bNodeSocketTypeHandle { + } + public struct bNodeSocketRuntimeHandle { + } + public struct bNodeTypeHandle { + } + public struct bNodeRuntimeHandle { + } + public struct bNodeTreeTypeHandle { + } + public struct NodeInstanceHashHandle { + } + public struct bNodeTreeRuntimeHandle { + } + public struct RuntimeNodeEnumItemsHandle { + } + public struct BodyPoint { + } + public struct BodySpring { + } + public struct SBScratch { + } + public struct SculptSession { + } + public struct ObjectRuntimeHandle { + } + public struct PTCacheEdit { + } + public struct ParticleCacheKey { + } + public struct KDTree_3d { + } + public struct ParticleDrawData { + } + public struct PointCloudRuntimeHandle { + } + public struct RigidBodyOb_Shared { + } + public struct ColorSpace { + } + public struct SceneRuntimeHandle { + } + public struct wmTimer { + } + public struct wmTooltipState { + } + public struct PanelType { + } + public struct uiLayout { + } + public struct Panel_Runtime { + } + public struct uiListType { + } + public struct uiListDyn { + } + public struct SpaceType { + } + public struct ARegionType { + } + public struct wmGizmoMap { + } + public struct wmDrawBuffer { + } + public struct AssetShelfType { + } + public struct FileHandlerTypeHandle { + } + public struct SequenceLookup { + } + public struct MediaPresence { + } + public struct ThumbnailCache { + } + public struct SeqCache { + } + public struct PrefetchJob { + } + public struct DRWShadingGroup { + } + public struct SpaceProperties_Runtime { + } + public struct SpaceOutliner_Runtime { + } + public struct SpaceSeq_Runtime { + } + public struct FileFolderLists { + } + public struct FileList { + } + public struct FileLayout { + } + public struct SpaceFile_Runtime { + } + public struct SpaceText_Runtime { + } + public struct SpaceNode_Runtime { + } + public struct SpaceSpreadsheet_Runtime { + } + public struct VFontData { + } + public struct SmoothView2DStore { + } + public struct ViewRender { + } + public struct SmoothView3DStore { + } + public struct VolumeRuntimeHandle { + } + public struct std_mutex_type { + } + public struct wmXrRuntimeData { + } + public struct wmNotifier { + } + public struct UndoStack { + } + public struct wmMsgBus { + } + public struct WindowManagerRuntimeHandle { + } + public struct wmEvent_ConsecutiveData { + } + public struct wmEvent { + } + public struct wmIMEData { + } + public struct PointerRNA { + } + public struct wmOperatorType { + } + public struct bToolRef_Runtime { + } + public struct WorkSpaceRuntimeHandle { + } +} diff --git a/BlendFile/DNA/bArmature_Runtime.cs b/BlendFile/DNA/bArmature_Runtime.cs index 00c45d5..0cd8036 100644 --- a/BlendFile/DNA/bArmature_Runtime.cs +++ b/BlendFile/DNA/bArmature_Runtime.cs @@ -15,9 +15,9 @@ namespace BlendFile.DNA { public class bArmature_Runtime { public int active_collection_index; - public uchar[] _pad0 = new uchar[4]; + public byte[] _pad0 = new System.Byte[4]; public BoneCollection ptr_active_collection; - public bArmature_Runtime(int active_collection_index, uchar[] _pad0, BoneCollection ptr_active_collection) { + public bArmature_Runtime(int active_collection_index, byte[] _pad0, BoneCollection ptr_active_collection) { this.active_collection_index = active_collection_index; this._pad0 = _pad0; this.ptr_active_collection = ptr_active_collection; diff --git a/BlendFile/DNA/bNode.cs b/BlendFile/DNA/bNode.cs index fbef319..4f15cd1 100644 --- a/BlendFile/DNA/bNode.cs +++ b/BlendFile/DNA/bNode.cs @@ -29,7 +29,7 @@ namespace BlendFile.DNA { public short custom2; public float custom3; public float custom4; - public int8_t warning_propagation; + public sbyte warning_propagation; public char[] _pad = new System.Char[7]; public ID ptr_id; public object ptr_storage; @@ -62,7 +62,7 @@ namespace BlendFile.DNA { short custom2, float custom3, float custom4, - int8_t warning_propagation, + sbyte warning_propagation, char[] _pad, ID ptr_id, object ptr_storage, diff --git a/BlendFile/DNA/bUUID.cs b/BlendFile/DNA/bUUID.cs index 427b2d6..822bd37 100644 --- a/BlendFile/DNA/bUUID.cs +++ b/BlendFile/DNA/bUUID.cs @@ -17,10 +17,10 @@ namespace BlendFile.DNA { public int time_low; public ushort time_mid; public ushort time_hi_and_version; - public uchar clock_seq_hi_and_reserved; - public uchar clock_seq_low; - public uchar[] node = new uchar[6]; - public bUUID(int time_low, ushort time_mid, ushort time_hi_and_version, uchar clock_seq_hi_and_reserved, uchar clock_seq_low, uchar[] node) { + public byte clock_seq_hi_and_reserved; + public byte clock_seq_low; + public byte[] node = new System.Byte[6]; + public bUUID(int time_low, ushort time_mid, ushort time_hi_and_version, byte clock_seq_hi_and_reserved, byte clock_seq_low, byte[] node) { this.time_low = time_low; this.time_mid = time_mid; this.time_hi_and_version = time_hi_and_version; diff --git a/BlendFile/DNA/bUserExtensionRepo.cs b/BlendFile/DNA/bUserExtensionRepo.cs index ffc3008..fddbf9b 100644 --- a/BlendFile/DNA/bUserExtensionRepo.cs +++ b/BlendFile/DNA/bUserExtensionRepo.cs @@ -21,10 +21,10 @@ namespace BlendFile.DNA { public char ptr_access_token; public char[] custom_dirpath = new System.Char[1024]; public char[] remote_url = new System.Char[1024]; - public uchar flag; - public uchar source; + public byte flag; + public byte source; public char[] _pad0 = new System.Char[6]; - public bUserExtensionRepo(bUserExtensionRepo ptr_next, bUserExtensionRepo ptr_prev, char[] name, char[] module, char ptr_access_token, char[] custom_dirpath, char[] remote_url, uchar flag, uchar source, char[] _pad0) { + public bUserExtensionRepo(bUserExtensionRepo ptr_next, bUserExtensionRepo ptr_prev, char[] name, char[] module, char ptr_access_token, char[] custom_dirpath, char[] remote_url, byte flag, byte source, char[] _pad0) { this.ptr_next = ptr_next; this.ptr_prev = ptr_prev; this.name = name; diff --git a/BlendFile/DNA/wmKeyMapItem.cs b/BlendFile/DNA/wmKeyMapItem.cs index 0952c32..4e1fddc 100644 --- a/BlendFile/DNA/wmKeyMapItem.cs +++ b/BlendFile/DNA/wmKeyMapItem.cs @@ -21,8 +21,8 @@ namespace BlendFile.DNA { public char[] propvalue_str = new System.Char[64]; public short propvalue; public short type; - public int8_t val; - public int8_t direction; + public sbyte val; + public sbyte direction; public short shift; public short ctrl; public short alt; @@ -41,8 +41,8 @@ namespace BlendFile.DNA { char[] propvalue_str, short propvalue, short type, - int8_t val, - int8_t direction, + sbyte val, + sbyte direction, short shift, short ctrl, short alt, diff --git a/BlendFile/DNA/wmWindow.cs b/BlendFile/DNA/wmWindow.cs index 79bae98..cf163d0 100644 --- a/BlendFile/DNA/wmWindow.cs +++ b/BlendFile/DNA/wmWindow.cs @@ -59,7 +59,7 @@ namespace BlendFile.DNA { public Stereo3dFormat ptr_stereo3d_format; public ListBase drawcalls; public object ptr_cursor_keymap_status; - public uint64_t eventstate_prev_press_time_ms; + public ulong eventstate_prev_press_time_ms; public wmWindow( wmWindow ptr_next, wmWindow ptr_prev, @@ -106,7 +106,7 @@ namespace BlendFile.DNA { Stereo3dFormat ptr_stereo3d_format, ListBase drawcalls, object ptr_cursor_keymap_status, - uint64_t eventstate_prev_press_time_ms) { + ulong eventstate_prev_press_time_ms) { this.ptr_next = ptr_next; this.ptr_prev = ptr_prev; this.ptr_ghostwin = ptr_ghostwin; diff --git a/BlendFile/DNA/wmWindowManager.cs b/BlendFile/DNA/wmWindowManager.cs index d187cb5..8eec2b0 100644 --- a/BlendFile/DNA/wmWindowManager.cs +++ b/BlendFile/DNA/wmWindowManager.cs @@ -18,7 +18,7 @@ namespace BlendFile.DNA { public wmWindow ptr_windrawable; public wmWindow ptr_winactive; public ListBase windows; - public uchar init_flag; + public byte init_flag; public char[] _pad0 = new System.Char[1]; public short file_saved; public short op_undo_depth; @@ -49,7 +49,7 @@ namespace BlendFile.DNA { wmWindow ptr_windrawable, wmWindow ptr_winactive, ListBase windows, - uchar init_flag, + byte init_flag, char[] _pad0, short file_saved, short op_undo_depth, diff --git a/CodeGenerator/Program.cs b/CodeGenerator/Program.cs index 280af33..42b33e1 100644 --- a/CodeGenerator/Program.cs +++ b/CodeGenerator/Program.cs @@ -23,6 +23,7 @@ namespace CodeGenerator { private const string OutPath = @"Blendfile\DNA"; private const string Namespace = "BlendFile.DNA"; private static readonly string[] AdaptedTypes = new[] { "uchar" }; + private static HashSet customTypes; public static void Log(string message) { sb.AppendLine(message); @@ -56,11 +57,17 @@ namespace CodeGenerator { private static CodeNamespace GenerateTypes() { CodeNamespace ns = new CodeNamespace(Namespace); + + customTypes = new(); + foreach (var type in blendfile.SdnaStructs) { Log($"Generating struct {type.Type}"); bool referenceSelf = false; bool referencePointer = false; + //Add the type to the custom types list + customTypes.Add(type.Type); + //Create a new type declaration var ctd = new CodeTypeDeclaration(type.Type); @@ -115,7 +122,10 @@ namespace CodeGenerator { CodeMemberField cmf; //Check if the type is a built-in type or a custom type if (t != null) cmf = new(t, field.Name.ParseFName()); //Built-in type - else cmf = new(new CodeTypeReference(field.Type), field.Name.ParseFName()); //Custom type + else { + cmf = new(new CodeTypeReference(field.Type), field.Name.ParseFName()); //Custom type + customTypes.Add(field.Type); + } cmf.Attributes = MemberAttributes.Public; return cmf; } @@ -144,7 +154,10 @@ namespace CodeGenerator { //Check if the type is a built-in type or a custom type if (t != null) cmf = new(t, name); //Built-in type - else cmf = new(field.Type, name); //Custom type + else { + cmf = new(field.Type, name); //Custom type + customTypes.Add(field.Type); + } //Set the field attributes cmf.Attributes = MemberAttributes.Public; @@ -211,7 +224,8 @@ namespace CodeGenerator { return cc; } - private static void SetupCCU(out CodeGeneratorOptions genOpts, out CSharpCodeProvider provider, out CodeCompileUnit ccu) { + private static void SetupCCU(out CodeGeneratorOptions genOpts, out CSharpCodeProvider provider, + out CodeCompileUnit ccu) { genOpts = new() { BlankLinesBetweenMembers = false, BracingStyle = "Block", @@ -245,6 +259,17 @@ namespace CodeGenerator { provider.GenerateCodeFromCompileUnit(ccu, sw, codeGeneratorOptions); tempNs.Types.Remove(type); } + customTypes.ExceptWith(ns.Types.OfType().Select(t => t.Name)); + foreach (var type in customTypes) { + Log($"Creating empty struct for missing {type}"); + var ctd = new CodeTypeDeclaration(type) { + IsStruct = true, + Attributes = MemberAttributes.Public + }; + tempNs.Types.Add(ctd); + } + using var finalsw = new StreamWriter($"{OutPath}\\_ExtraTypes.cs"); + provider.GenerateCodeFromCompileUnit(ccu, finalsw, codeGeneratorOptions); } } } \ No newline at end of file diff --git a/CodeGenerator/StrExt.cs b/CodeGenerator/StrExt.cs index 1568fdd..e12d090 100644 --- a/CodeGenerator/StrExt.cs +++ b/CodeGenerator/StrExt.cs @@ -15,6 +15,10 @@ namespace CodeGenerator { "string" => typeof(string).AssemblyQualifiedName, "void" => typeof(object).AssemblyQualifiedName, "ushort" => typeof(ushort).AssemblyQualifiedName, + "uchar" => typeof(byte).AssemblyQualifiedName, + "int64_t" => typeof(long).AssemblyQualifiedName, + "int8_t" => typeof(sbyte).AssemblyQualifiedName, + "uint64_t" => typeof(ulong).AssemblyQualifiedName, _ => str }; }