diff --git a/scripts/_node_strand_affector/_node_strand_affector.gml b/scripts/_node_strand_affector/_node_strand_affector.gml index 53ffab0bf..140ac81ec 100644 --- a/scripts/_node_strand_affector/_node_strand_affector.gml +++ b/scripts/_node_strand_affector/_node_strand_affector.gml @@ -38,7 +38,7 @@ function _Node_Strand_Affector(_x, _y, _group = noone) : Node(_x, _y, _group) co name = "Affector"; color = COLORS.node_blend_strand; icon = THEME.strandSim; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Strand", self, JUNCTION_CONNECT.input, VALUE_TYPE.strands, noone) .setVisible(true, true); diff --git a/scripts/node_anim_curve/node_anim_curve.gml b/scripts/node_anim_curve/node_anim_curve.gml index ef98e2d77..cd4d7bec7 100644 --- a/scripts/node_anim_curve/node_anim_curve.gml +++ b/scripts/node_anim_curve/node_anim_curve.gml @@ -2,7 +2,7 @@ function Node_Anim_Curve(_x, _y, _group = noone) : Node_Processor(_x, _y, _group name = "Evaluate Curve"; update_on_frame = true; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Curve", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_01); inputs[| 1] = nodeValue("Progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) diff --git a/scripts/node_area/node_area.gml b/scripts/node_area/node_area.gml index a41ac66a3..6689c228f 100644 --- a/scripts/node_area/node_area.gml +++ b/scripts/node_area/node_area.gml @@ -1,8 +1,7 @@ function Node_Area(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Area"; color = COLORS.node_blend_number; - - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) .setDisplay(VALUE_DISPLAY.vector) diff --git a/scripts/node_array/node_array.gml b/scripts/node_array/node_array.gml index 3f7abfe21..6d04630cc 100644 --- a/scripts/node_array/node_array.gml +++ b/scripts/node_array/node_array.gml @@ -1,7 +1,7 @@ function Node_Array(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Array"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Type", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0 ) .setDisplay(VALUE_DISPLAY.enum_scroll, { data: [ "Any", "Surface", "Number", "Color", "Text" ], update_hover: false }) @@ -179,7 +179,7 @@ function Node_Array(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { if(outputs[| 0].type == VALUE_TYPE.surface) w = 128; else - w = 96; + setDimension(96, 80); } #endregion static postConnect = function() { #region diff --git a/scripts/node_array_shuffle/node_array_shuffle.gml b/scripts/node_array_shuffle/node_array_shuffle.gml index 6e2119287..9d40ff1bc 100644 --- a/scripts/node_array_shuffle/node_array_shuffle.gml +++ b/scripts/node_array_shuffle/node_array_shuffle.gml @@ -1,7 +1,7 @@ function Node_Array_Shuffle(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Shuffle Array"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Array in", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, []) .setVisible(true, true); diff --git a/scripts/node_array_sort/node_array_sort.gml b/scripts/node_array_sort/node_array_sort.gml index 5fc344028..826c1d6c2 100644 --- a/scripts/node_array_sort/node_array_sort.gml +++ b/scripts/node_array_sort/node_array_sort.gml @@ -1,7 +1,7 @@ function Node_Array_Sort(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Sort Array"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Array in", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, []) .setVisible(true, true); diff --git a/scripts/node_base_convert/node_base_convert.gml b/scripts/node_base_convert/node_base_convert.gml index 61728344b..35dc00db4 100644 --- a/scripts/node_base_convert/node_base_convert.gml +++ b/scripts/node_base_convert/node_base_convert.gml @@ -2,7 +2,7 @@ function Node_Base_Convert(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro name = "Convert Base"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setVisible(true, true); diff --git a/scripts/node_collection/node_collection.gml b/scripts/node_collection/node_collection.gml index 9a38bf487..42f7ff057 100644 --- a/scripts/node_collection/node_collection.gml +++ b/scripts/node_collection/node_collection.gml @@ -454,6 +454,7 @@ function Node_Collection(_x, _y, _group = noone) : Node(_x, _y, _group) construc for( var i = 0; i < _ilen; i++ ) array_push_unique(_iarr, i); for( var i = array_length(_iarr) - 1; i >= 0; i-- ) { + if(is_array(_iarr[i])) continue; if(_iarr[i] >= _ilen) array_delete(_iarr, i, 1); } @@ -467,8 +468,8 @@ function Node_Collection(_x, _y, _group = noone) : Node(_x, _y, _group) construc for( var i = 0; i < _olen; i++ ) array_push_unique(_oarr, i); for( var i = array_length(_oarr) - 1; i >= 0; i-- ) { - if(_oarr[i] >= _olen) - array_delete(_oarr, i, 1); + if(is_array(_iarr[i])) continue; + if(_oarr[i] >= _olen) array_delete(_oarr, i, 1); } output_display_list = attributes.output_display_list; @@ -610,12 +611,49 @@ function Node_Collection(_x, _y, _group = noone) : Node(_x, _y, _group) construc return _attr; } #endregion - static doApplyDeserialize = function() { #region + static preApplyDeserialize = function() { #region var attr = attributes; + if(LOADING_VERSION < 11690) { #region + var pr = ds_priority_create(); + + for( var i = ds_list_size(inputs) - 1; i >= custom_input_index; i-- ) { + if(!struct_has(inputs[| i].attributes, "input_priority")) continue; + + var _pri = inputs[| i].attributes.input_priority; + ds_priority_add(pr, inputs[| i], _pri); + ds_list_delete(inputs, i); + } + + repeat(ds_priority_size(pr)) ds_list_add(inputs, ds_priority_delete_min(pr)); + + for( var i = ds_list_size(outputs) - 1; i >= custom_output_index; i-- ) { + if(!struct_has(outputs[| i].attributes, "output_priority")) continue; + + var _pri = outputs[| i].attributes.output_priority; + ds_priority_add(pr, outputs[| i], _pri); + ds_list_delete(outputs, i); + } + + repeat(ds_priority_size(pr)) ds_list_add(outputs, ds_priority_delete_min(pr)); + + ds_priority_destroy(pr); + return; + } #endregion + if(struct_has(attr, "custom_input_list")) { var _ilist = attr.custom_input_list; var _inarr = {}; + var _dilst = []; + + //for( var i = custom_input_index, n = ds_list_size(inputs); i < n; i++ ) { + // if(struct_has(inputs[| i], "from")) + // array_push(_dilst, inputs[| i].from.node_id); + //} + + if(APPENDING) + for( var i = 0, n = array_length(_ilist); i < n; i++ ) + _ilist[i] = ds_map_try_get(APPEND_MAP, _ilist[i], _ilist[i]); for( var i = ds_list_size(inputs) - 1; i >= custom_input_index; i-- ) { if(!struct_has(inputs[| i], "from")) continue; @@ -632,12 +670,24 @@ function Node_Collection(_x, _y, _group = noone) : Node(_x, _y, _group) construc ds_list_add(inputs, _inarr[$ _ilist[i]]); } + + //var custom_input_list = []; + //for( var i = custom_input_index, n = ds_list_size(inputs); i < n; i++ ) { + // if(struct_has(inputs[| i], "from")) + // array_push(custom_input_list, inputs[| i].from.node_id); + //} + + //print($"\n\ti: {_ilist}\n\td: {_dilst}\n\to: {custom_input_list}\n"); } if(struct_has(attr, "custom_output_list")) { var _ilist = attr.custom_output_list; var _inarr = {}; + if(APPENDING) + for( var i = 0, n = array_length(_ilist); i < n; i++ ) + _ilist[i] = ds_map_try_get(APPEND_MAP, _ilist[i], _ilist[i]); + for( var i = ds_list_size(outputs) - 1; i >= custom_output_index; i-- ) { if(!struct_has(outputs[| i], "from")) continue; @@ -655,12 +705,6 @@ function Node_Collection(_x, _y, _group = noone) : Node(_x, _y, _group) construc } } - var custom_input_list = []; - for( var i = custom_input_index, n = ds_list_size(inputs); i < n; i++ ) { - if(struct_has(inputs[| i], "from")) - array_push(custom_input_list, inputs[| i].from.node_id); - } - } #endregion static processSerialize = function(_map) { #region diff --git a/scripts/node_color/node_color.gml b/scripts/node_color/node_color.gml index 44093b5fa..82ef1498b 100644 --- a/scripts/node_color/node_color.gml +++ b/scripts/node_color/node_color.gml @@ -1,6 +1,6 @@ function Node_Color(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Color"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); diff --git a/scripts/node_color_data/node_color_data.gml b/scripts/node_color_data/node_color_data.gml index b27a7e325..8b823a07b 100644 --- a/scripts/node_color_data/node_color_data.gml +++ b/scripts/node_color_data/node_color_data.gml @@ -1,6 +1,6 @@ function Node_Color_Data(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Color Data"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white) .setVisible(true, true); diff --git a/scripts/node_color_hsv/node_color_hsv.gml b/scripts/node_color_hsv/node_color_hsv.gml index 2d0f34af9..a48a2657d 100644 --- a/scripts/node_color_hsv/node_color_hsv.gml +++ b/scripts/node_color_hsv/node_color_hsv.gml @@ -1,7 +1,7 @@ function Node_Color_HSV(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "HSV Color"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Hue", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) .setDisplay(VALUE_DISPLAY.slider) diff --git a/scripts/node_color_rgb/node_color_rgb.gml b/scripts/node_color_rgb/node_color_rgb.gml index 53e9fcf63..03123f535 100644 --- a/scripts/node_color_rgb/node_color_rgb.gml +++ b/scripts/node_color_rgb/node_color_rgb.gml @@ -1,7 +1,7 @@ function Node_Color_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "RGB Color"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Red", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) .setDisplay(VALUE_DISPLAY.slider) diff --git a/scripts/node_compare/node_compare.gml b/scripts/node_compare/node_compare.gml index 99048979d..deccccc0d 100644 --- a/scripts/node_compare/node_compare.gml +++ b/scripts/node_compare/node_compare.gml @@ -31,7 +31,7 @@ function Node_Compare(_x, _y, _group = noone) : Node(_x, _y, _group) constructor name = "Compare"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Type", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) .setDisplay(VALUE_DISPLAY.enum_scroll, [ new scrollItem("Equal", s_node_condition_type, 0), diff --git a/scripts/node_condition/node_condition.gml b/scripts/node_condition/node_condition.gml index 58fc55206..57d016d9c 100644 --- a/scripts/node_condition/node_condition.gml +++ b/scripts/node_condition/node_condition.gml @@ -1,7 +1,7 @@ function Node_Condition(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Condition"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Check value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) .setVisible(true, true); diff --git a/scripts/node_counter/node_counter.gml b/scripts/node_counter/node_counter.gml index ac9092cdc..cb6930c2b 100644 --- a/scripts/node_counter/node_counter.gml +++ b/scripts/node_counter/node_counter.gml @@ -2,7 +2,7 @@ function Node_Counter(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c name = "Frame Index"; update_on_frame = true; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Start", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index 4d6a5c49b..4d2eb0486 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -2129,6 +2129,8 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { static processDeserialize = function() {} static applyDeserialize = function(preset = false) { #region + preApplyDeserialize(); + var _inputs = load_map.inputs; var amo = min(ds_list_size(inputs), array_length(_inputs)); @@ -2166,7 +2168,8 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { doApplyDeserialize(); } #endregion - static doApplyDeserialize = function() {} + static preApplyDeserialize = function() {} + static doApplyDeserialize = function() {} static loadGroup = function(context = noone) { #region if(_group == noone) { diff --git a/scripts/node_find_pixel/node_find_pixel.gml b/scripts/node_find_pixel/node_find_pixel.gml index e641bad39..479f613a8 100644 --- a/scripts/node_find_pixel/node_find_pixel.gml +++ b/scripts/node_find_pixel/node_find_pixel.gml @@ -1,6 +1,6 @@ function Node_Find_Pixel(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Find pixel"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, noone); diff --git a/scripts/node_group_input/node_group_input.gml b/scripts/node_group_input/node_group_input.gml index c92d7bcbc..01a85bfc5 100644 --- a/scripts/node_group_input/node_group_input.gml +++ b/scripts/node_group_input/node_group_input.gml @@ -367,6 +367,10 @@ function Node_Group_Input(_x, _y, _group = noone) : Node(_x, _y, _group) constru if(is_undefined(inParent)) return; } #endregion + static getGraphPreviewSurface = function() { #region + return inputs[| 0].getValue(); + } #endregion + static postDeserialize = function() { createInput(false); } static doApplyDeserialize = function() { #region diff --git a/scripts/node_group_output/node_group_output.gml b/scripts/node_group_output/node_group_output.gml index 2020c9d22..27d9d4dc5 100644 --- a/scripts/node_group_output/node_group_output.gml +++ b/scripts/node_group_output/node_group_output.gml @@ -1,7 +1,6 @@ function Node_Group_Output(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Group Output"; color = COLORS.node_blend_collection; - preview_draw = false; is_group_io = true; destroy_when_upgroup = true; @@ -103,6 +102,10 @@ function Node_Group_Output(_x, _y, _group = noone) : Node(_x, _y, _group) constr outParent.display_type = inputs[| 0].display_type; } #endregion + static getGraphPreviewSurface = function() { #region + return inputs[| 0].getValue(); + } #endregion + static postDeserialize = function() { #region if(group == noone) return; diff --git a/scripts/node_lerp/node_lerp.gml b/scripts/node_lerp/node_lerp.gml index e4d6459a9..29cb8a2dc 100644 --- a/scripts/node_lerp/node_lerp.gml +++ b/scripts/node_lerp/node_lerp.gml @@ -2,7 +2,7 @@ function Node_Lerp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons name = "Lerp"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("a", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); inputs[| 1] = nodeValue("b", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); diff --git a/scripts/node_logic/node_logic.gml b/scripts/node_logic/node_logic.gml index c255be90b..8d8712aeb 100644 --- a/scripts/node_logic/node_logic.gml +++ b/scripts/node_logic/node_logic.gml @@ -30,7 +30,7 @@ function Node_Logic(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Logic Opr"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Type", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) .setDisplay(VALUE_DISPLAY.enum_scroll, [ new scrollItem("And" , s_node_logic, 0), diff --git a/scripts/node_math/node_math.gml b/scripts/node_math/node_math.gml index 08a408234..e5e201f21 100644 --- a/scripts/node_math/node_math.gml +++ b/scripts/node_math/node_math.gml @@ -56,8 +56,7 @@ enum MATH_OPERATOR { function Node_Math(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Math"; color = COLORS.node_blend_number; - - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Type", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) .setDisplay(VALUE_DISPLAY.enum_scroll, [ diff --git a/scripts/node_mesh_create_path/node_mesh_create_path.gml b/scripts/node_mesh_create_path/node_mesh_create_path.gml index 310a17770..b1e3bfdaf 100644 --- a/scripts/node_mesh_create_path/node_mesh_create_path.gml +++ b/scripts/node_mesh_create_path/node_mesh_create_path.gml @@ -1,7 +1,7 @@ function Node_Mesh_Create_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Path to Mesh"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) .setVisible(true, true); diff --git a/scripts/node_mesh_to_path/node_mesh_to_path.gml b/scripts/node_mesh_to_path/node_mesh_to_path.gml index a6e371be2..f7d68b777 100644 --- a/scripts/node_mesh_to_path/node_mesh_to_path.gml +++ b/scripts/node_mesh_to_path/node_mesh_to_path.gml @@ -1,7 +1,7 @@ function Node_Mesh_To_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Mesh to Path"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.mesh, noone) .setVisible(true, true); diff --git a/scripts/node_move_point/node_move_point.gml b/scripts/node_move_point/node_move_point.gml index 85b221d6d..d33196bdd 100644 --- a/scripts/node_move_point/node_move_point.gml +++ b/scripts/node_move_point/node_move_point.gml @@ -2,7 +2,7 @@ function Node_Move_Point(_x, _y, _group = noone) : Node_Processor(_x, _y, _group name = "Translate Point"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Point", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, ]) .setDisplay(VALUE_DISPLAY.vector) diff --git a/scripts/node_path/node_path.gml b/scripts/node_path/node_path.gml index 81e9fd134..c69874deb 100644 --- a/scripts/node_path/node_path.gml +++ b/scripts/node_path/node_path.gml @@ -12,7 +12,7 @@ enum _ANCHOR { function Node_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Path"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Path progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0, "Sample position from path.") .setDisplay(VALUE_DISPLAY.slider); diff --git a/scripts/node_path_anchor/node_path_anchor.gml b/scripts/node_path_anchor/node_path_anchor.gml index 997298256..ee787d87e 100644 --- a/scripts/node_path_anchor/node_path_anchor.gml +++ b/scripts/node_path_anchor/node_path_anchor.gml @@ -1,7 +1,7 @@ function Node_Path_Anchor(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Path Anchor"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Postion", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) .setDisplay(VALUE_DISPLAY.vector) diff --git a/scripts/node_path_l_system/node_path_l_system.gml b/scripts/node_path_l_system/node_path_l_system.gml index f8fa98670..25620cc2a 100644 --- a/scripts/node_path_l_system/node_path_l_system.gml +++ b/scripts/node_path_l_system/node_path_l_system.gml @@ -10,7 +10,7 @@ function L_Turtle(x = 0, y = 0, ang = 90, w = 1, color = c_white) constructor { function Node_Path_L_System(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "L System"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Length", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 8); diff --git a/scripts/node_path_separate_folder/node_path_separate_folder.gml b/scripts/node_path_separate_folder/node_path_separate_folder.gml index c492c4aff..faf766126 100644 --- a/scripts/node_path_separate_folder/node_path_separate_folder.gml +++ b/scripts/node_path_separate_folder/node_path_separate_folder.gml @@ -1,7 +1,7 @@ function Node_Path_Separate_Folder(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Separate File Path"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") .setVisible(true, true); diff --git a/scripts/node_random/node_random.gml b/scripts/node_random/node_random.gml index d9c0770de..e97d350bd 100644 --- a/scripts/node_random/node_random.gml +++ b/scripts/node_random/node_random.gml @@ -2,7 +2,7 @@ function Node_Random(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co name = "Random"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, irandom(99999)); diff --git a/scripts/node_sampler/node_sampler.gml b/scripts/node_sampler/node_sampler.gml index 491ab2c15..d65330b18 100644 --- a/scripts/node_sampler/node_sampler.gml +++ b/scripts/node_sampler/node_sampler.gml @@ -1,6 +1,6 @@ function Node_Sampler(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Sampler"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, noone); diff --git a/scripts/node_scatter_points/node_scatter_points.gml b/scripts/node_scatter_points/node_scatter_points.gml index 9fd16e865..2462a13fd 100644 --- a/scripts/node_scatter_points/node_scatter_points.gml +++ b/scripts/node_scatter_points/node_scatter_points.gml @@ -2,7 +2,7 @@ function Node_Scatter_Points(_x, _y, _group = noone) : Node(_x, _y, _group) cons name = "Scatter Points"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); onSurfaceSize = function() { return getInputData(7, DEF_SURF); }; inputs[| 0] = nodeValue("Point area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA_REF ) diff --git a/scripts/node_statistic/node_statistic.gml b/scripts/node_statistic/node_statistic.gml index ba5d2364f..821d1596c 100644 --- a/scripts/node_statistic/node_statistic.gml +++ b/scripts/node_statistic/node_statistic.gml @@ -28,7 +28,7 @@ enum STAT_OPERATOR { function Node_Statistic(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Statistic"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Type", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) .setDisplay(VALUE_DISPLAY.enum_scroll, [ "Sum", "Mean", "Median", "Max", "Min" ]) diff --git a/scripts/node_string_get_char/node_string_get_char.gml b/scripts/node_string_get_char/node_string_get_char.gml index 42935bd63..ab4447e94 100644 --- a/scripts/node_string_get_char/node_string_get_char.gml +++ b/scripts/node_string_get_char/node_string_get_char.gml @@ -1,6 +1,6 @@ function Node_String_Get_Char(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Get Character"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setVisible(true, true); diff --git a/scripts/node_string_join/node_string_join.gml b/scripts/node_string_join/node_string_join.gml index 162e3a073..1022c7f34 100644 --- a/scripts/node_string_join/node_string_join.gml +++ b/scripts/node_string_join/node_string_join.gml @@ -1,7 +1,7 @@ function Node_String_Join(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Join Text"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Text array", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, []) .setVisible(true, true); diff --git a/scripts/node_string_length/node_string_length.gml b/scripts/node_string_length/node_string_length.gml index 2a0df79d4..33fde03a0 100644 --- a/scripts/node_string_length/node_string_length.gml +++ b/scripts/node_string_length/node_string_length.gml @@ -1,7 +1,7 @@ function Node_String_Length(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Text Length"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setVisible(true, true); diff --git a/scripts/node_string_merge/node_string_merge.gml b/scripts/node_string_merge/node_string_merge.gml index 45f6482ba..8abb80145 100644 --- a/scripts/node_string_merge/node_string_merge.gml +++ b/scripts/node_string_merge/node_string_merge.gml @@ -1,7 +1,7 @@ function Node_String_Merge(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Combine Text"; - w = 96; + setDimension(96, 80); setIsDynamicInput(1); diff --git a/scripts/node_string_regex_match/node_string_regex_match.gml b/scripts/node_string_regex_match/node_string_regex_match.gml index ff7bb8820..b07e68cfb 100644 --- a/scripts/node_string_regex_match/node_string_regex_match.gml +++ b/scripts/node_string_regex_match/node_string_regex_match.gml @@ -1,7 +1,7 @@ function Node_String_Regex_Match(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "RegEx Match"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setVisible(true, true); diff --git a/scripts/node_string_regex_replace/node_string_regex_replace.gml b/scripts/node_string_regex_replace/node_string_regex_replace.gml index db9bcb26d..d85c818ed 100644 --- a/scripts/node_string_regex_replace/node_string_regex_replace.gml +++ b/scripts/node_string_regex_replace/node_string_regex_replace.gml @@ -1,7 +1,7 @@ function Node_String_Regex_Replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "RegEx Replace"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setVisible(true, true); diff --git a/scripts/node_string_regex_search/node_string_regex_search.gml b/scripts/node_string_regex_search/node_string_regex_search.gml index 83b5d4046..7b963d364 100644 --- a/scripts/node_string_regex_search/node_string_regex_search.gml +++ b/scripts/node_string_regex_search/node_string_regex_search.gml @@ -1,7 +1,7 @@ function Node_String_Regex_Search(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "RegEx Search"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setVisible(true, true); diff --git a/scripts/node_string_split/node_string_split.gml b/scripts/node_string_split/node_string_split.gml index 6adc7db0f..5a9337e69 100644 --- a/scripts/node_string_split/node_string_split.gml +++ b/scripts/node_string_split/node_string_split.gml @@ -1,6 +1,6 @@ function Node_String_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Split Text"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setVisible(true, true); diff --git a/scripts/node_string_trim/node_string_trim.gml b/scripts/node_string_trim/node_string_trim.gml index d8a1461f7..fa2b3f184 100644 --- a/scripts/node_string_trim/node_string_trim.gml +++ b/scripts/node_string_trim/node_string_trim.gml @@ -1,7 +1,7 @@ function Node_String_Trim(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Trim Text"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") diff --git a/scripts/node_struct/node_struct.gml b/scripts/node_struct/node_struct.gml index 9c67ab65d..8e3fb1c72 100644 --- a/scripts/node_struct/node_struct.gml +++ b/scripts/node_struct/node_struct.gml @@ -1,7 +1,7 @@ function Node_Struct(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Struct"; - w = 96; + setDimension(96, 80); outputs[| 0] = nodeValue("Struct", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, {}); diff --git a/scripts/node_struct_get/node_struct_get.gml b/scripts/node_struct_get/node_struct_get.gml index 5f725a704..895d9ce70 100644 --- a/scripts/node_struct_get/node_struct_get.gml +++ b/scripts/node_struct_get/node_struct_get.gml @@ -1,7 +1,7 @@ function Node_Struct_Get(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Struct Get"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Struct", self, JUNCTION_CONNECT.input, VALUE_TYPE.struct, {}) .setVisible(true, true); diff --git a/scripts/node_struct_set/node_struct_set.gml b/scripts/node_struct_set/node_struct_set.gml index 584a7e2b9..23ea6beb8 100644 --- a/scripts/node_struct_set/node_struct_set.gml +++ b/scripts/node_struct_set/node_struct_set.gml @@ -1,7 +1,7 @@ function Node_Struct_Set(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Struct Set"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Struct", self, JUNCTION_CONNECT.input, VALUE_TYPE.struct, {}) .setVisible(true, true); diff --git a/scripts/node_surface_data/node_surface_data.gml b/scripts/node_surface_data/node_surface_data.gml index bf13238b8..cf41d9e8e 100644 --- a/scripts/node_surface_data/node_surface_data.gml +++ b/scripts/node_surface_data/node_surface_data.gml @@ -9,7 +9,7 @@ function Node_Surface_data(_x, _y, _group = noone) : Node(_x, _y, _group) constr outputs[| 1] = nodeValue("Array length", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 0); - w = 96; + setDimension(96, 80); static update = function(frame = CURRENT_FRAME) { var _insurf = getInputData(0); diff --git a/scripts/node_switch/node_switch.gml b/scripts/node_switch/node_switch.gml index 89c8b556c..9a124e71a 100644 --- a/scripts/node_switch/node_switch.gml +++ b/scripts/node_switch/node_switch.gml @@ -1,7 +1,7 @@ function Node_Switch(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Switch"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Index", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ) .setVisible(true, true) diff --git a/scripts/node_timeline_preview/node_timeline_preview.gml b/scripts/node_timeline_preview/node_timeline_preview.gml index bd6c1c0e6..56e312be4 100644 --- a/scripts/node_timeline_preview/node_timeline_preview.gml +++ b/scripts/node_timeline_preview/node_timeline_preview.gml @@ -3,7 +3,7 @@ function Node_Timeline_Preview(_x, _y, _group = noone) : Node(_x, _y, _group) co use_cache = CACHE_USE.auto; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); PANEL_ANIMATION.timeline_preview = self; diff --git a/scripts/node_to_number/node_to_number.gml b/scripts/node_to_number/node_to_number.gml index 6f746bb6c..30b1bba78 100644 --- a/scripts/node_to_number/node_to_number.gml +++ b/scripts/node_to_number/node_to_number.gml @@ -2,7 +2,7 @@ function Node_To_Number(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) name = "To Number"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setVisible(true, true); diff --git a/scripts/node_to_text/node_to_text.gml b/scripts/node_to_text/node_to_text.gml index efe5b07d9..92d5a1df2 100644 --- a/scripts/node_to_text/node_to_text.gml +++ b/scripts/node_to_text/node_to_text.gml @@ -1,7 +1,7 @@ function Node_To_Text(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "To Text"; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); diff --git a/scripts/node_transform_array/node_transform_array.gml b/scripts/node_transform_array/node_transform_array.gml index eafa925cc..8fe59f0ba 100644 --- a/scripts/node_transform_array/node_transform_array.gml +++ b/scripts/node_transform_array/node_transform_array.gml @@ -2,7 +2,7 @@ function Node_Transform_Array(_x, _y, _group = noone) : Node_Processor(_x, _y, _ name = "Transform Array"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Postion", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) .setDisplay(VALUE_DISPLAY.vector) diff --git a/scripts/node_tunnel_in/node_tunnel_in.gml b/scripts/node_tunnel_in/node_tunnel_in.gml index ca5057a77..4f415570d 100644 --- a/scripts/node_tunnel_in/node_tunnel_in.gml +++ b/scripts/node_tunnel_in/node_tunnel_in.gml @@ -4,7 +4,7 @@ function Node_Tunnel_In(_x, _y, _group = noone) : Node(_x, _y, _group) construct is_group_io = true; preview_draw = false; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ) .setDisplay(VALUE_DISPLAY.text_tunnel) diff --git a/scripts/node_tunnel_out/node_tunnel_out.gml b/scripts/node_tunnel_out/node_tunnel_out.gml index 4200bbb35..9be7265e7 100644 --- a/scripts/node_tunnel_out/node_tunnel_out.gml +++ b/scripts/node_tunnel_out/node_tunnel_out.gml @@ -4,7 +4,7 @@ function Node_Tunnel_Out(_x, _y, _group = noone) : Node(_x, _y, _group) construc is_group_io = true; preview_draw = false; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ) .setDisplay(VALUE_DISPLAY.text_tunnel) diff --git a/scripts/node_unicode/node_unicode.gml b/scripts/node_unicode/node_unicode.gml index 0363bc693..58c71245c 100644 --- a/scripts/node_unicode/node_unicode.gml +++ b/scripts/node_unicode/node_unicode.gml @@ -2,7 +2,7 @@ function Node_Unicode(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c name = "Unicode"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Unicode", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 64); diff --git a/scripts/node_vector_cross_2D/node_vector_cross_2D.gml b/scripts/node_vector_cross_2D/node_vector_cross_2D.gml index a23b2d4e5..a11ffa3eb 100644 --- a/scripts/node_vector_cross_2D/node_vector_cross_2D.gml +++ b/scripts/node_vector_cross_2D/node_vector_cross_2D.gml @@ -2,7 +2,7 @@ function Node_Vector_Cross_2D(_x, _y, _group = noone) : Node_Processor(_x, _y, _ name = "Cross Product 2D"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Point 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector) diff --git a/scripts/node_vector_cross_3D/node_vector_cross_3D.gml b/scripts/node_vector_cross_3D/node_vector_cross_3D.gml index 978d8fbe1..733729efe 100644 --- a/scripts/node_vector_cross_3D/node_vector_cross_3D.gml +++ b/scripts/node_vector_cross_3D/node_vector_cross_3D.gml @@ -2,7 +2,7 @@ function Node_Vector_Cross_3D(_x, _y, _group = noone) : Node_Processor(_x, _y, _ name = "Cross Product 3D"; color = COLORS.node_blend_number; - w = 96; + setDimension(96, 80); inputs[| 0] = nodeValue("Point 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector) diff --git a/scripts/node_vector_dot/node_vector_dot.gml b/scripts/node_vector_dot/node_vector_dot.gml index b8649fd11..58f7f10b0 100644 --- a/scripts/node_vector_dot/node_vector_dot.gml +++ b/scripts/node_vector_dot/node_vector_dot.gml @@ -1,8 +1,7 @@ function Node_Vector_Dot(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { - name = "Dot Product"; - color = COLORS.node_blend_number; - - w = 96; + name = "Dot Product"; + color = COLORS.node_blend_number; + setDimension(96, 80); inputs[| 0] = nodeValue("Point 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector)