diff --git a/scripts/__node_value_array/__node_value_array.gml b/scripts/__node_value_array/__node_value_array.gml index 5024582f8..c3773aa20 100644 --- a/scripts/__node_value_array/__node_value_array.gml +++ b/scripts/__node_value_array/__node_value_array.gml @@ -1,8 +1,8 @@ function nodeValue_Vector(_name, _node, _value, _data = {}) { - return new NodeValue_Array(_name, _node, _value, "", -1); + return new __NodeValue_Array(_name, _node, _value, "", -1); } -function NodeValue_Array(_name, _node, _value, _tooltip = "", _length = 2) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor { +function __NodeValue_Array(_name, _node, _value, _tooltip = "", _length = 2) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor { type_array = 1; def_length = _length; diff --git a/scripts/__node_value_object/__node_value_object.gml b/scripts/__node_value_object/__node_value_object.gml index 4b1ad44f5..eb764bf50 100644 --- a/scripts/__node_value_object/__node_value_object.gml +++ b/scripts/__node_value_object/__node_value_object.gml @@ -1,6 +1,6 @@ -function nodeValue_Object(_name, _node, _value, _tooltip = "") { return new NodeValue_Object(_name, _node, _value, _tooltip); } +function nodeValue_Object(_name, _node, _value, _tooltip = "") { return new __NodeValue_Object(_name, _node, _value, _tooltip); } -function __NodeValue_Object(_name, _node, _type, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, _type, _value, _tooltip) constructor { +function __NodeValue_Object_Generic(_name, _node, _type, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, _type, _value, _tooltip) constructor { animable = false; @@ -18,6 +18,6 @@ function __NodeValue_Object(_name, _node, _type, _value, _tooltip = "") : NodeVa static arrayLength = arrayLengthSimple; } -function NodeValue_Object(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.object, _value, _tooltip) constructor { +function __NodeValue_Object(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.object, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 794c124ab..f5c4ab289 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -42,7 +42,7 @@ LATEST_VERSION = 1_18_00_0; VERSION = 1_18_01_0; SAVE_VERSION = 1_18_01_0; - VERSION_STRING = MAC? "1.18.003m" : "1.18.2.001"; + VERSION_STRING = MAC? "1.18.003m" : "1.18.2.002"; BUILD_NUMBER = 1_18_01_0; HOTKEYS = ds_map_create(); diff --git a/scripts/nodeValue_drawer/nodeValue_drawer.gml b/scripts/nodeValue_drawer/nodeValue_drawer.gml index 7f070dde5..be123b17e 100644 --- a/scripts/nodeValue_drawer/nodeValue_drawer.gml +++ b/scripts/nodeValue_drawer/nodeValue_drawer.gml @@ -347,7 +347,7 @@ function drawWidget(xx, yy, ww, _m, jun, global_var = true, _hover = false, _foc wid.setInteract(!jun.hasJunctionFrom()); if(_focus) wid.register(_scrollPane); - if(is_instanceof(jun, NodeValue_Dimension)) { + if(is_instanceof(jun, __NodeValue_Dimension)) { var _proj = jun.node.attributes.use_project_dimension; wid.side_button.icon_index = _proj; diff --git a/scripts/node_color_hsv/node_color_hsv.gml b/scripts/node_color_hsv/node_color_hsv.gml index e83c675df..7b9f4773b 100644 --- a/scripts/node_color_hsv/node_color_hsv.gml +++ b/scripts/node_color_hsv/node_color_hsv.gml @@ -23,18 +23,18 @@ function Node_Color_HSV(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) input_display_list = [ 3, 0, 1, 2, 4 ]; - static processData = function(_outSurf, _data, _output_index, _array_index) { #region + static processData = function(_outSurf, _data, _output_index, _array_index) { var nor = _data[3]; return make_color_hsva( - nor? _data[0] * 255 : _data[0], - nor? _data[1] * 255 : _data[1], - nor? _data[2] * 255 : _data[2], - nor? _data[4] * 255 : _data[4], + nor? clamp(_data[0], 0, 1) * 255 : clamp(_data[0], 0, 1), + nor? clamp(_data[1], 0, 1) * 255 : clamp(_data[1], 0, 1), + nor? clamp(_data[2], 0, 1) * 255 : clamp(_data[2], 0, 1), + nor? clamp(_data[4], 0, 1) * 255 : clamp(_data[4], 0, 1), ); - } #endregion + } - static onValueUpdate = function(index = 0) { #region + static onValueUpdate = function(index = 0) { if(index == 3) { var _nor = getInputData(3); @@ -64,9 +64,9 @@ function Node_Color_HSV(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[4].setDisplay(VALUE_DISPLAY.slider, { range: [0, 255, 0.1] }); } } - } #endregion + } - static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { #region + static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { var bbox = drawGetBbox(xx, yy, _s); if(bbox.h < 1) return; @@ -78,9 +78,9 @@ function Node_Color_HSV(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) } drawColor(col, bbox.x0, bbox.y0, bbox.w, bbox.h); - } #endregion + } - static doApplyDeserialize = function() { #region + static doApplyDeserialize = function() { onValueUpdate(3); - } #endregion + } } \ No newline at end of file diff --git a/scripts/node_color_rgb/node_color_rgb.gml b/scripts/node_color_rgb/node_color_rgb.gml index 6432cb5db..6c713df8c 100644 --- a/scripts/node_color_rgb/node_color_rgb.gml +++ b/scripts/node_color_rgb/node_color_rgb.gml @@ -24,7 +24,7 @@ function Node_Color_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) input_display_list = [ 3, 0, 1, 2, 4 ]; - static onValueUpdate = function(index = 0) { #region + static onValueUpdate = function(index = 0) { if(index == 3) { var _nor = getInputData(3); @@ -54,23 +54,23 @@ function Node_Color_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[4].setDisplay(VALUE_DISPLAY.slider, { range: [0, 255, 0.1] }); } } - } #endregion + } - static processData = function(_outSurf, _data, _output_index, _array_index) { #region + static processData = function(_outSurf, _data, _output_index, _array_index) { var nor = _data[3]; if(!is_real(_data[0])) return 0; if(!is_real(_data[1])) return 0; if(!is_real(_data[2])) return 0; return make_color_rgba( - nor? _data[0] * 255 : _data[0], - nor? _data[1] * 255 : _data[1], - nor? _data[2] * 255 : _data[2], - nor? _data[4] * 255 : _data[4], + nor? clamp(_data[0], 0, 1) * 255 : clamp(_data[0], 0, 1), + nor? clamp(_data[1], 0, 1) * 255 : clamp(_data[1], 0, 1), + nor? clamp(_data[2], 0, 1) * 255 : clamp(_data[2], 0, 1), + nor? clamp(_data[4], 0, 1) * 255 : clamp(_data[4], 0, 1), ); - } #endregion + } - static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { #region + static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { var bbox = drawGetBbox(xx, yy, _s); if(bbox.h < 1) return; @@ -82,9 +82,9 @@ function Node_Color_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) } drawColor(col, bbox.x0, bbox.y0, bbox.w, bbox.h); - } #endregion + } - static doApplyDeserialize = function() { #region + static doApplyDeserialize = function() { onValueUpdate(3); - } #endregion + } } \ No newline at end of file diff --git a/scripts/node_grid_warp/node_grid_warp.gml b/scripts/node_grid_warp/node_grid_warp.gml index 27ccc640f..d3d96dace 100644 --- a/scripts/node_grid_warp/node_grid_warp.gml +++ b/scripts/node_grid_warp/node_grid_warp.gml @@ -7,19 +7,40 @@ function Node_Grid_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) active_index = 1; newInput(2, nodeValue_Int("Grid", self, 1, "Amount of grid subdivision. Higher number means more grid, detail.")) - .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 1 ] }); + .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 1 ] }) + .rejectArray(); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// newOutput(0, nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone)); + function createNewInput() { + var index = array_length(inputs); + var i = index - input_fix_len; + + newInput(index, nodeValue_Vec2($"Anchor {i}", self, [ 0, 0 ])) + .setUnitRef(function(index) /*=>*/ {return getDimension(index)}); + + array_push(input_display_list, index); + return inputs[index]; + } + input_display_list = [ 1, 0, - ["Mesh", false], 2, + ["Mesh", false], 2, + ["Anchors", true], ]; + setDynamicInput(1, false); + attribute_surface_depth(); attribute_interpolation(); - + + static resetDisplay = function() { + input_display_list = array_clone(input_display_list_raw, 1); + for( var i = input_display_len, n = array_length(inputs); i < n; i++ ) + array_push(input_display_list, i); + } + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var mx = (_mx - _x) / _s; var my = (_my - _y) / _s; @@ -34,6 +55,17 @@ function Node_Grid_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) var _surf = _data[0]; var _grid = _data[2]; + var _aamo = (_grid + 1) * (_grid + 1); + var _iamo = getInputAmount(); + + if(_iamo < _aamo) { + repeat(_aamo - _iamo) createNewInput(); + resetDisplay(); + + } else if(_iamo > _aamo) { + array_resize(inputs, input_fix_len + _aamo); + resetDisplay(); + } } } \ No newline at end of file diff --git a/scripts/node_string_split/node_string_split.gml b/scripts/node_string_split/node_string_split.gml index f37ad9a4b..fb1bb4153 100644 --- a/scripts/node_string_split/node_string_split.gml +++ b/scripts/node_string_split/node_string_split.gml @@ -4,6 +4,7 @@ function Node_String_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro newInput(0, nodeValue_Text("Text", self, "")) .setVisible(true, true); + newInput(1, nodeValue_Text("Delimiter", self, " ", "Character that used to split text,\nleave blank to create character array.")); inputs[1].editWidget.format = TEXT_AREA_FORMAT.delimiter; @@ -20,10 +21,10 @@ function Node_String_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro } static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { - var str = getInputData(1); + var str = getInputData(1); var bbox = drawGetBbox(xx, yy, _s); - var cx = bbox.xc; - var cy = bbox.yc; + var cx = bbox.xc; + var cy = bbox.yc; if(string_length(str) == 0) { draw_set_text(f_sdf, fa_center, fa_center, COLORS._main_text_sub); @@ -34,7 +35,8 @@ function Node_String_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro _s *= 0.5; draw_set_text(f_sdf, fa_center, fa_center, COLORS._main_text); - draw_text_cut(cx, cy, str, bbox.w, _s); + str = string_cut(str, bbox.w - _s * 32, "...", _s); + draw_text_add(cx, cy, str, _s); var ww = (string_width(str) / 2) * _s; draw_set_text(f_sdf, fa_right, fa_center, COLORS._main_text_sub); diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index de3074eb9..0929d5a87 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -61,7 +61,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru bypass_junc = noone; if(_connect == CONNECT_TYPE.input) { - bypass_junc = new NodeValue_Input_Bypass(self, _name, _node, _type, index); + bypass_junc = new __NodeValue_Input_Bypass(self, _name, _node, _type, index); node.input_bypass[index] = bypass_junc; } #endregion @@ -1554,7 +1554,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru if(!updated) return false; ///////////////////////////////////////////////////////////////////////////////// - if(is_instanceof(self, NodeValue_Dimension)) + if(is_instanceof(self, __NodeValue_Dimension)) node.attributes.use_project_dimension = false; if(connect_type == CONNECT_TYPE.input && self.index >= 0) { diff --git a/scripts/node_value_area/node_value_area.gml b/scripts/node_value_area/node_value_area.gml index a9dd2f31a..87cf71418 100644 --- a/scripts/node_value_area/node_value_area.gml +++ b/scripts/node_value_area/node_value_area.gml @@ -21,9 +21,9 @@ enum AREA_INDEX { #macro DEF_AREA_REF [ 0.5, 0.5, 0.5, 0.5, AREA_SHAPE.rectangle, AREA_MODE.area ] #macro AREA_ARRAY_LENGTH 6 -function nodeValue_Area(_name, _node, _value, _data = {}) { return new NodeValue_Area(_name, _node, _value, _data); } +function nodeValue_Area(_name, _node, _value, _data = {}) { return new __NodeValue_Area(_name, _node, _value, _data); } -function NodeValue_Area(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, "") constructor { +function __NodeValue_Area(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, "") constructor { setDisplay(VALUE_DISPLAY.area, _data); def_length = AREA_ARRAY_LENGTH; diff --git a/scripts/node_value_armature/node_value_armature.gml b/scripts/node_value_armature/node_value_armature.gml index 823d8e77d..a76a3578a 100644 --- a/scripts/node_value_armature/node_value_armature.gml +++ b/scripts/node_value_armature/node_value_armature.gml @@ -1,5 +1,5 @@ -function nodeValue_Armature(_name, _node, _value, _tooltip = "") { return new NodeValue_Armature(_name, _node, _value, _tooltip); } +function nodeValue_Armature(_name, _node, _value, _tooltip = "") { return new __NodeValue_Armature(_name, _node, _value, _tooltip); } -function NodeValue_Armature(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.armature, _value, _tooltip) constructor { +function __NodeValue_Armature(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.armature, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_audioBit/node_value_audioBit.gml b/scripts/node_value_audioBit/node_value_audioBit.gml index 0bf7f02d0..bb370d0f2 100644 --- a/scripts/node_value_audioBit/node_value_audioBit.gml +++ b/scripts/node_value_audioBit/node_value_audioBit.gml @@ -1,5 +1,5 @@ -function nodeValue_AudioBit(_name, _node, _value, _tooltip = "") { return new NodeValue_AudioBit(_name, _node, _value, _tooltip); } +function nodeValue_AudioBit(_name, _node, _value, _tooltip = "") { return new __NodeValue_AudioBit(_name, _node, _value, _tooltip); } -function NodeValue_AudioBit(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.audioBit, _value, _tooltip) constructor { +function __NodeValue_AudioBit(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.audioBit, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_bool/node_value_bool.gml b/scripts/node_value_bool/node_value_bool.gml index 4f1605677..fde321377 100644 --- a/scripts/node_value_bool/node_value_bool.gml +++ b/scripts/node_value_bool/node_value_bool.gml @@ -1,6 +1,6 @@ -function nodeValue_Bool(_name, _node, _value, _tooltip = "") { return new NodeValue_Bool(_name, _node, _value, _tooltip); } +function nodeValue_Bool(_name, _node, _value, _tooltip = "") { return new __NodeValue_Bool(_name, _node, _value, _tooltip); } -function NodeValue_Bool(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.boolean, _value, _tooltip) constructor { +function __NodeValue_Bool(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.boolean, _value, _tooltip) constructor { /////============== GET ============= diff --git a/scripts/node_value_buffer/node_value_buffer.gml b/scripts/node_value_buffer/node_value_buffer.gml index a5914b2bc..2d1164588 100644 --- a/scripts/node_value_buffer/node_value_buffer.gml +++ b/scripts/node_value_buffer/node_value_buffer.gml @@ -1,5 +1,5 @@ -function nodeValue_Buffer(_name, _node, _value, _tooltip = "") { return new NodeValue_Buffer(_name, _node, _value, _tooltip); } +function nodeValue_Buffer(_name, _node, _value, _tooltip = "") { return new __NodeValue_Buffer(_name, _node, _value, _tooltip); } -function NodeValue_Buffer(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.buffer, _value, _tooltip) constructor { +function __NodeValue_Buffer(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.buffer, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_color/node_value_color.gml b/scripts/node_value_color/node_value_color.gml index afa027dd8..9b3087768 100644 --- a/scripts/node_value_color/node_value_color.gml +++ b/scripts/node_value_color/node_value_color.gml @@ -1,6 +1,6 @@ -function nodeValue_Color(_name, _node, _value, _tooltip = "") { return new NodeValue_Color(_name, _node, _value, _tooltip); } +function nodeValue_Color(_name, _node, _value, _tooltip = "") { return new __NodeValue_Color(_name, _node, _value, _tooltip); } -function NodeValue_Color(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.color, _value, _tooltip) constructor { +function __NodeValue_Color(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.color, _value, _tooltip) constructor { /////============== GET ============= diff --git a/scripts/node_value_corner/node_value_corner.gml b/scripts/node_value_corner/node_value_corner.gml index 8a106935c..20eb15c9b 100644 --- a/scripts/node_value_corner/node_value_corner.gml +++ b/scripts/node_value_corner/node_value_corner.gml @@ -1,5 +1,5 @@ -function nodeValue_Corner(_name, _node, _value, _tooltip = "") { return new NodeValue_Corner(_name, _node, _value, _tooltip); } +function nodeValue_Corner(_name, _node, _value, _tooltip = "") { return new __NodeValue_Corner(_name, _node, _value, _tooltip); } -function NodeValue_Corner(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor { +function __NodeValue_Corner(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor { setDisplay(VALUE_DISPLAY.corner); } \ No newline at end of file diff --git a/scripts/node_value_curve/node_value_curve.gml b/scripts/node_value_curve/node_value_curve.gml index f6c63ed28..23702dde6 100644 --- a/scripts/node_value_curve/node_value_curve.gml +++ b/scripts/node_value_curve/node_value_curve.gml @@ -1,6 +1,6 @@ -function nodeValue_Curve(_name, _node, _value) { return new NodeValue_Curve(_name, _node, _value); } +function nodeValue_Curve(_name, _node, _value) { return new __NodeValue_Curve(_name, _node, _value); } -function NodeValue_Curve(_name, _node, _value) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.curve, _value, "") constructor { +function __NodeValue_Curve(_name, _node, _value) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.curve, _value, "") constructor { /////============== GET ============= diff --git a/scripts/node_value_d3_camera/node_value_d3_camera.gml b/scripts/node_value_d3_camera/node_value_d3_camera.gml index 4549798a9..ede98aa35 100644 --- a/scripts/node_value_d3_camera/node_value_d3_camera.gml +++ b/scripts/node_value_d3_camera/node_value_d3_camera.gml @@ -1,5 +1,5 @@ -function nodeValue_D3Camera(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Camera(_name, _node, _value, _tooltip); } +function nodeValue_D3Camera(_name, _node, _value, _tooltip = "") { return new __NodeValue_D3Camera(_name, _node, _value, _tooltip); } -function NodeValue_D3Camera(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.d3Camera, _value, _tooltip) constructor { +function __NodeValue_D3Camera(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.d3Camera, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_d3_light/node_value_d3_light.gml b/scripts/node_value_d3_light/node_value_d3_light.gml index 5a35d8877..9c647dce1 100644 --- a/scripts/node_value_d3_light/node_value_d3_light.gml +++ b/scripts/node_value_d3_light/node_value_d3_light.gml @@ -1,5 +1,5 @@ -function nodeValue_D3Light(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Light(_name, _node, _value, _tooltip); } +function nodeValue_D3Light(_name, _node, _value, _tooltip = "") { return new __NodeValue_D3Light(_name, _node, _value, _tooltip); } -function NodeValue_D3Light(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.d3Light, _value, _tooltip) constructor { +function __NodeValue_D3Light(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.d3Light, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_d3_material/node_value_d3_material.gml b/scripts/node_value_d3_material/node_value_d3_material.gml index edaa79c65..414147d6c 100644 --- a/scripts/node_value_d3_material/node_value_d3_material.gml +++ b/scripts/node_value_d3_material/node_value_d3_material.gml @@ -1,6 +1,6 @@ -function nodeValue_D3Material(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Material(_name, _node, _value, _tooltip); } +function nodeValue_D3Material(_name, _node, _value, _tooltip = "") { return new __NodeValue_D3Material(_name, _node, _value, _tooltip); } -function NodeValue_D3Material(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.d3Material, _value, _tooltip) constructor { +function __NodeValue_D3Material(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.d3Material, _value, _tooltip) constructor { animable = false; diff --git a/scripts/node_value_d3_mesh/node_value_d3_mesh.gml b/scripts/node_value_d3_mesh/node_value_d3_mesh.gml index 36de9506c..3d52d126e 100644 --- a/scripts/node_value_d3_mesh/node_value_d3_mesh.gml +++ b/scripts/node_value_d3_mesh/node_value_d3_mesh.gml @@ -1,5 +1,5 @@ -function nodeValue_D3Mesh(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Mesh(_name, _node, _value, _tooltip); } +function nodeValue_D3Mesh(_name, _node, _value, _tooltip = "") { return new __NodeValue_D3Mesh(_name, _node, _value, _tooltip); } -function NodeValue_D3Mesh(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.d3Mesh, _value, _tooltip) constructor { +function __NodeValue_D3Mesh(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.d3Mesh, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_d3_scene/node_value_d3_scene.gml b/scripts/node_value_d3_scene/node_value_d3_scene.gml index 050a97d38..bf228987a 100644 --- a/scripts/node_value_d3_scene/node_value_d3_scene.gml +++ b/scripts/node_value_d3_scene/node_value_d3_scene.gml @@ -1,5 +1,5 @@ -function nodeValue_D3Scene(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Scene(_name, _node, _value, _tooltip); } +function nodeValue_D3Scene(_name, _node, _value, _tooltip = "") { return new __NodeValue_D3Scene(_name, _node, _value, _tooltip); } -function NodeValue_D3Scene(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.d3Scene, _value, _tooltip) constructor { +function __NodeValue_D3Scene(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.d3Scene, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_dimension/node_value_dimension.gml b/scripts/node_value_dimension/node_value_dimension.gml index d1e5ce4ac..2e00e86a1 100644 --- a/scripts/node_value_dimension/node_value_dimension.gml +++ b/scripts/node_value_dimension/node_value_dimension.gml @@ -1,6 +1,6 @@ -function nodeValue_Dimension(_node, value = DEF_SURF) { return new NodeValue_Dimension(_node, value); } +function nodeValue_Dimension(_node, value = DEF_SURF) { return new __NodeValue_Dimension(_node, value); } -function NodeValue_Dimension(_node, value) : NodeValue("Dimension", _node, CONNECT_TYPE.input, VALUE_TYPE.integer, value, "") constructor { +function __NodeValue_Dimension(_node, value) : NodeValue("Dimension", _node, CONNECT_TYPE.input, VALUE_TYPE.integer, value, "") constructor { setDisplay(VALUE_DISPLAY.vector); def_length = 2; diff --git a/scripts/node_value_enum_button/node_value_enum_button.gml b/scripts/node_value_enum_button/node_value_enum_button.gml index 5a1bc2839..52a93b066 100644 --- a/scripts/node_value_enum_button/node_value_enum_button.gml +++ b/scripts/node_value_enum_button/node_value_enum_button.gml @@ -1,6 +1,6 @@ -function nodeValue_Enum_Button(_name, _node, _value, _data) { return new NodeValue_Enum_Button(_name, _node, _value, _data); } +function nodeValue_Enum_Button(_name, _node, _value, _data) { return new __NodeValue_Enum_Button(_name, _node, _value, _data); } -function NodeValue_Enum_Button(_name, _node, _value, _data) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor { +function __NodeValue_Enum_Button(_name, _node, _value, _data) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor { setDisplay(VALUE_DISPLAY.enum_button, _data); /////============== GET ============= diff --git a/scripts/node_value_enum_scroll/node_value_enum_scroll.gml b/scripts/node_value_enum_scroll/node_value_enum_scroll.gml index 14c9d6f07..a1534d066 100644 --- a/scripts/node_value_enum_scroll/node_value_enum_scroll.gml +++ b/scripts/node_value_enum_scroll/node_value_enum_scroll.gml @@ -1,6 +1,6 @@ -function nodeValue_Enum_Scroll(_name, _node, _value, _data) { return new NodeValue_Enum_Scroll(_name, _node, _value, _data); } +function nodeValue_Enum_Scroll(_name, _node, _value, _data) { return new __NodeValue_Enum_Scroll(_name, _node, _value, _data); } -function NodeValue_Enum_Scroll(_name, _node, _value, _data) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor { +function __NodeValue_Enum_Scroll(_name, _node, _value, _data) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor { setDisplay(VALUE_DISPLAY.enum_scroll, _data); /////============== GET ============= diff --git a/scripts/node_value_fdomain/node_value_fdomain.gml b/scripts/node_value_fdomain/node_value_fdomain.gml index a470dbbe0..ce2ac8d16 100644 --- a/scripts/node_value_fdomain/node_value_fdomain.gml +++ b/scripts/node_value_fdomain/node_value_fdomain.gml @@ -1,5 +1,5 @@ -function nodeValue_Fdomain(_name, _node, _value, _tooltip = "") { return new NodeValue_Fdomain(_name, _node, _value, _tooltip); } +function nodeValue_Fdomain(_name, _node, _value, _tooltip = "") { return new __NodeValue_Fdomain(_name, _node, _value, _tooltip); } -function NodeValue_Fdomain(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.fdomain, _value, _tooltip) constructor { +function __NodeValue_Fdomain(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.fdomain, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_float/node_value_float.gml b/scripts/node_value_float/node_value_float.gml index e3f511147..aaabe5485 100644 --- a/scripts/node_value_float/node_value_float.gml +++ b/scripts/node_value_float/node_value_float.gml @@ -1,6 +1,6 @@ -function nodeValue_Float(_name, _node, _value, _tooltip = "") { return new NodeValue_Float(_name, _node, _value, _tooltip); } +function nodeValue_Float(_name, _node, _value, _tooltip = "") { return new __NodeValue_Float(_name, _node, _value, _tooltip); } -function NodeValue_Float(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor { +function __NodeValue_Float(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor { /////============== GET ============= diff --git a/scripts/node_value_gradient/node_value_gradient.gml b/scripts/node_value_gradient/node_value_gradient.gml index 234ce6931..84510874f 100644 --- a/scripts/node_value_gradient/node_value_gradient.gml +++ b/scripts/node_value_gradient/node_value_gradient.gml @@ -1,6 +1,6 @@ -function nodeValue_Gradient(_name, _node, _value, _tooltip = "") { return new NodeValue_Gradient(_name, _node, _value, _tooltip); } +function nodeValue_Gradient(_name, _node, _value, _tooltip = "") { return new __NodeValue_Gradient(_name, _node, _value, _tooltip); } -function NodeValue_Gradient(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.gradient, _value, _tooltip) constructor { +function __NodeValue_Gradient(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.gradient, _value, _tooltip) constructor { /////============== GET ============= diff --git a/scripts/node_value_int/node_value_int.gml b/scripts/node_value_int/node_value_int.gml index 1709c6cbc..2a9ec2e45 100644 --- a/scripts/node_value_int/node_value_int.gml +++ b/scripts/node_value_int/node_value_int.gml @@ -1,6 +1,6 @@ -function nodeValue_Int(_name, _node, _value, _tooltip = "") { return new NodeValue_Int(_name, _node, _value, _tooltip); } +function nodeValue_Int(_name, _node, _value, _tooltip = "") { return new __NodeValue_Int(_name, _node, _value, _tooltip); } -function NodeValue_Int(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, _tooltip) constructor { +function __NodeValue_Int(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, _tooltip) constructor { /////============== GET ============= diff --git a/scripts/node_value_output/node_value_output.gml b/scripts/node_value_output/node_value_output.gml index a8cf55a3c..621dde581 100644 --- a/scripts/node_value_output/node_value_output.gml +++ b/scripts/node_value_output/node_value_output.gml @@ -1,6 +1,6 @@ -function nodeValue_Output(_name, _node, _type, _value, _tooltip = "") { return new NodeValue_Output(_name, _node, _type, _value, _tooltip); } +function nodeValue_Output(_name, _node, _type, _value, _tooltip = "") { return new __NodeValue_Output(_name, _node, _type, _value, _tooltip); } -function NodeValue_Output(_name, _node, _type, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.output, _type, _value, _tooltip) constructor { +function __NodeValue_Output(_name, _node, _type, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.output, _type, _value, _tooltip) constructor { index = array_length(node.outputs); @@ -37,7 +37,7 @@ function NodeValue_Output(_name, _node, _type, _value, _tooltip = "") : NodeValu } } -function NodeValue_Input_Bypass(_from, _name, _node, _type, _index) : NodeValue_Output(_name, _node, _type, 0, "") constructor { +function __NodeValue_Input_Bypass(_from, _name, _node, _type, _index) : __NodeValue_Output(_name, _node, _type, 0, "") constructor { from_junc = _from; visible = false; index = 1000 + _index; diff --git a/scripts/node_value_padding/node_value_padding.gml b/scripts/node_value_padding/node_value_padding.gml index bf7d74d3e..73018380c 100644 --- a/scripts/node_value_padding/node_value_padding.gml +++ b/scripts/node_value_padding/node_value_padding.gml @@ -1,6 +1,6 @@ -function nodeValue_Padding(_name, _node, _value, _tooltip = "") { return new NodeValue_Padding(_name, _node, _value, _tooltip); } +function nodeValue_Padding(_name, _node, _value, _tooltip = "") { return new __NodeValue_Padding(_name, _node, _value, _tooltip); } -function NodeValue_Padding(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor { +function __NodeValue_Padding(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor { setDisplay(VALUE_DISPLAY.padding); def_length = 4; diff --git a/scripts/node_value_palette/node_value_palette.gml b/scripts/node_value_palette/node_value_palette.gml index ddd01d0b7..965b636eb 100644 --- a/scripts/node_value_palette/node_value_palette.gml +++ b/scripts/node_value_palette/node_value_palette.gml @@ -1,6 +1,6 @@ -function nodeValue_Palette(_name, _node, _value, _tooltip = "") { return new NodeValue_Palette(_name, _node, _value, _tooltip); } +function nodeValue_Palette(_name, _node, _value, _tooltip = "") { return new __NodeValue_Palette(_name, _node, _value, _tooltip); } -function NodeValue_Palette(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.color, _value, _tooltip) constructor {; +function __NodeValue_Palette(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.color, _value, _tooltip) constructor {; setDisplay(VALUE_DISPLAY.palette); diff --git a/scripts/node_value_particle/node_value_particle.gml b/scripts/node_value_particle/node_value_particle.gml index c24d49a38..473e5f6c3 100644 --- a/scripts/node_value_particle/node_value_particle.gml +++ b/scripts/node_value_particle/node_value_particle.gml @@ -1,5 +1,5 @@ -function nodeValue_Particle(_name, _node, _value, _tooltip = "") { return new NodeValue_Particle(_name, _node, _value, _tooltip); } +function nodeValue_Particle(_name, _node, _value, _tooltip = "") { return new __NodeValue_Particle(_name, _node, _value, _tooltip); } -function NodeValue_Particle(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.particle, _value, _tooltip) constructor { +function __NodeValue_Particle(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.particle, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_path/node_value_path.gml b/scripts/node_value_path/node_value_path.gml index 27cc88986..d88194004 100644 --- a/scripts/node_value_path/node_value_path.gml +++ b/scripts/node_value_path/node_value_path.gml @@ -1,6 +1,6 @@ -function nodeValue_Path(_name, _node, _value, _tooltip = "") { return new NodeValue_Path(_name, _node, _value, _tooltip); } +function nodeValue_Path(_name, _node, _value, _tooltip = "") { return new __NodeValue_Path(_name, _node, _value, _tooltip); } -function NodeValue_Path(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.path, _value, _tooltip) constructor { +function __NodeValue_Path(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.path, _value, _tooltip) constructor { /////============== GET ============= diff --git a/scripts/node_value_path_anchor/node_value_path_anchor.gml b/scripts/node_value_path_anchor/node_value_path_anchor.gml index e1703a0f3..a34f16f59 100644 --- a/scripts/node_value_path_anchor/node_value_path_anchor.gml +++ b/scripts/node_value_path_anchor/node_value_path_anchor.gml @@ -1,9 +1,9 @@ -function nodeValue_Path_Anchor(_name, _node, _value, _tooltip = "") { return new NodeValue_Path_Anchor(_name, _node, _value, _tooltip); } -function NodeValue_Path_Anchor(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, _ANCHOR.amount) constructor { +function nodeValue_Path_Anchor(_name, _node, _value, _tooltip = "") { return new __NodeValue_Path_Anchor(_name, _node, _value, _tooltip); } +function __NodeValue_Path_Anchor(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, _ANCHOR.amount) constructor { setDisplay(VALUE_DISPLAY.path_anchor); } -function nodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip = "") { return new NodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip); } -function NodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, _ANCHOR3.amount) constructor { +function nodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip = "") { return new __NodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip); } +function __NodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, _ANCHOR3.amount) constructor { setDisplay(VALUE_DISPLAY.path_anchor); } \ No newline at end of file diff --git a/scripts/node_value_pathnode/node_value_pathnode.gml b/scripts/node_value_pathnode/node_value_pathnode.gml index c8fd0ca1b..f802f8d1f 100644 --- a/scripts/node_value_pathnode/node_value_pathnode.gml +++ b/scripts/node_value_pathnode/node_value_pathnode.gml @@ -1,5 +1,5 @@ -function nodeValue_PathNode(_name, _node, _value, _tooltip = "") { return new NodeValue_PathNode(_name, _node, _value, _tooltip); } +function nodeValue_PathNode(_name, _node, _value, _tooltip = "") { return new __NodeValue_PathNode(_name, _node, _value, _tooltip); } -function NodeValue_PathNode(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.pathnode, _value, _tooltip) constructor { +function __NodeValue_PathNode(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.pathnode, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_quarterion/node_value_quarterion.gml b/scripts/node_value_quarterion/node_value_quarterion.gml index 04a5c73ac..d9e0b595e 100644 --- a/scripts/node_value_quarterion/node_value_quarterion.gml +++ b/scripts/node_value_quarterion/node_value_quarterion.gml @@ -1,6 +1,6 @@ -function nodeValue_Quaternion(_name, _node, _value, _tooltip = "") { return new NodeValue_Quaternion(_name, _node, _value, _tooltip); } +function nodeValue_Quaternion(_name, _node, _value, _tooltip = "") { return new __NodeValue_Quaternion(_name, _node, _value, _tooltip); } -function NodeValue_Quaternion(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor { +function __NodeValue_Quaternion(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor { setDisplay(VALUE_DISPLAY.d3quarternion); /////============== GET ============= diff --git a/scripts/node_value_range/node_value_range.gml b/scripts/node_value_range/node_value_range.gml index 44d1834ef..aa8602fe7 100644 --- a/scripts/node_value_range/node_value_range.gml +++ b/scripts/node_value_range/node_value_range.gml @@ -1,5 +1,5 @@ -function nodeValue_Range(_name, _node, _value, _data = {}) { return new NodeValue_Range(_name, _node, _value, _data); } +function nodeValue_Range(_name, _node, _value, _data = {}) { return new __NodeValue_Range(_name, _node, _value, _data); } -function NodeValue_Range(_name, _node, _value, _data) : NodeValue_Array(_name, _node, _value, "", 2) constructor { +function __NodeValue_Range(_name, _node, _value, _data) : __NodeValue_Array(_name, _node, _value, "", 2) constructor { setDisplay(VALUE_DISPLAY.range, _data); } \ No newline at end of file diff --git a/scripts/node_value_rotation/node_value_rotation.gml b/scripts/node_value_rotation/node_value_rotation.gml index f796fe28c..4a1b12e00 100644 --- a/scripts/node_value_rotation/node_value_rotation.gml +++ b/scripts/node_value_rotation/node_value_rotation.gml @@ -1,6 +1,6 @@ -function nodeValue_Rotation(_name, _node, _value, _tooltip = "") { return new NodeValue_Rotation(_name, _node, _value, _tooltip); } +function nodeValue_Rotation(_name, _node, _value, _tooltip = "") { return new __NodeValue_Rotation(_name, _node, _value, _tooltip); } -function NodeValue_Rotation(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor { +function __NodeValue_Rotation(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor { setDisplay(VALUE_DISPLAY.rotation); /////============== GET ============= diff --git a/scripts/node_value_rotation_random/node_value_rotation_random.gml b/scripts/node_value_rotation_random/node_value_rotation_random.gml index 521d35ffb..13c6808fa 100644 --- a/scripts/node_value_rotation_random/node_value_rotation_random.gml +++ b/scripts/node_value_rotation_random/node_value_rotation_random.gml @@ -1,8 +1,8 @@ #macro ROTATION_RANDOM_LENGTH 5 -function nodeValue_Rotation_Random(_name, _node, _value, _tooltip = "") { return new NodeValue_Rotation_Random(_name, _node, _value, _tooltip); } +function nodeValue_Rotation_Random(_name, _node, _value, _tooltip = "") { return new __NodeValue_Rotation_Random(_name, _node, _value, _tooltip); } -function NodeValue_Rotation_Random(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, ROTATION_RANDOM_LENGTH) constructor { +function __NodeValue_Rotation_Random(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, ROTATION_RANDOM_LENGTH) constructor { setDisplay(VALUE_DISPLAY.rotation_random); } \ No newline at end of file diff --git a/scripts/node_value_rotation_range/node_value_rotation_range.gml b/scripts/node_value_rotation_range/node_value_rotation_range.gml index 4c5ed1c32..967c7d956 100644 --- a/scripts/node_value_rotation_range/node_value_rotation_range.gml +++ b/scripts/node_value_rotation_range/node_value_rotation_range.gml @@ -1,6 +1,6 @@ -function nodeValue_Rotation_Range(_name, _node, _value, _tooltip = "") { return new NodeValue_Rotation_Range(_name, _node, _value, _tooltip); } +function nodeValue_Rotation_Range(_name, _node, _value, _tooltip = "") { return new __NodeValue_Rotation_Range(_name, _node, _value, _tooltip); } -function NodeValue_Rotation_Range(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 2) constructor { +function __NodeValue_Rotation_Range(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, 2) constructor { setDisplay(VALUE_DISPLAY.rotation_range); } \ No newline at end of file diff --git a/scripts/node_value_sdf/node_value_sdf.gml b/scripts/node_value_sdf/node_value_sdf.gml index b492b950e..a8e7638c9 100644 --- a/scripts/node_value_sdf/node_value_sdf.gml +++ b/scripts/node_value_sdf/node_value_sdf.gml @@ -1,5 +1,5 @@ -function nodeValue_SDF(_name, _node, _value, _tooltip = "") { return new NodeValue_SDF(_name, _node, _value, _tooltip); } +function nodeValue_SDF(_name, _node, _value, _tooltip = "") { return new __NodeValue_SDF(_name, _node, _value, _tooltip); } -function NodeValue_SDF(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.sdf, _value, _tooltip) constructor { +function __NodeValue_SDF(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.sdf, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_slider_range/node_value_slider_range.gml b/scripts/node_value_slider_range/node_value_slider_range.gml index 0a6d5acab..12717cd5f 100644 --- a/scripts/node_value_slider_range/node_value_slider_range.gml +++ b/scripts/node_value_slider_range/node_value_slider_range.gml @@ -1,6 +1,6 @@ -function nodeValue_Slider_Range(_name, _node, _value, _data = {}) { return new NodeValue_Slider_Range(_name, _node, _value, _data); } +function nodeValue_Slider_Range(_name, _node, _value, _data = {}) { return new __NodeValue_Slider_Range(_name, _node, _value, _data); } -function NodeValue_Slider_Range(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 2) constructor { +function __NodeValue_Slider_Range(_name, _node, _value, _data = {}) : __NodeValue_Array(_name, _node, _value, "", 2) constructor { setDisplay(VALUE_DISPLAY.slider_range, _data); } \ No newline at end of file diff --git a/scripts/node_value_struct/node_value_struct.gml b/scripts/node_value_struct/node_value_struct.gml index d82816359..ce4a89640 100644 --- a/scripts/node_value_struct/node_value_struct.gml +++ b/scripts/node_value_struct/node_value_struct.gml @@ -1,5 +1,5 @@ -function nodeValue_Struct(_name, _node, _value, _tooltip = "") { return new NodeValue_Struct(_name, _node, _value, _tooltip); } +function nodeValue_Struct(_name, _node, _value, _tooltip = "") { return new __NodeValue_Struct(_name, _node, _value, _tooltip); } -function NodeValue_Struct(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.struct, _value, _tooltip) constructor { +function __NodeValue_Struct(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.struct, _value, _tooltip) constructor { } \ No newline at end of file diff --git a/scripts/node_value_surface/node_value_surface.gml b/scripts/node_value_surface/node_value_surface.gml index c948ebecb..45d607773 100644 --- a/scripts/node_value_surface/node_value_surface.gml +++ b/scripts/node_value_surface/node_value_surface.gml @@ -1,6 +1,6 @@ -function nodeValue_Surface(_name, _node, _value = noone, _tooltip = "") { return new NodeValue_Surface(_name, _node, _value, _tooltip); } +function nodeValue_Surface(_name, _node, _value = noone, _tooltip = "") { return new __NodeValue_Surface(_name, _node, _value, _tooltip); } -function NodeValue_Surface(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.surface, _value, _tooltip) constructor { +function __NodeValue_Surface(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.surface, _value, _tooltip) constructor { animable = false; diff --git a/scripts/node_value_text/node_value_text.gml b/scripts/node_value_text/node_value_text.gml index 6cb6300d6..67eb38bf7 100644 --- a/scripts/node_value_text/node_value_text.gml +++ b/scripts/node_value_text/node_value_text.gml @@ -1,6 +1,6 @@ -function nodeValue_Text(_name, _node, _value, _tooltip = "") { return new NodeValue_Text(_name, _node, _value, _tooltip); } +function nodeValue_Text(_name, _node, _value, _tooltip = "") { return new __NodeValue_Text(_name, _node, _value, _tooltip); } -function NodeValue_Text(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.text, _value, _tooltip) constructor { +function __NodeValue_Text(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.text, _value, _tooltip) constructor { /////============== GET ============= diff --git a/scripts/node_value_toggle/node_value_toggle.gml b/scripts/node_value_toggle/node_value_toggle.gml index a918aa2c9..60e81ba96 100644 --- a/scripts/node_value_toggle/node_value_toggle.gml +++ b/scripts/node_value_toggle/node_value_toggle.gml @@ -1,6 +1,6 @@ -function nodeValue_Toggle(_name, _node, _value, _data = {}) { return new NodeValue_Toggle(_name, _node, _value, _data); } +function nodeValue_Toggle(_name, _node, _value, _data = {}) { return new __NodeValue_Toggle(_name, _node, _value, _data); } -function NodeValue_Toggle(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor { +function __NodeValue_Toggle(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor { setDisplay(VALUE_DISPLAY.toggle, _data); diff --git a/scripts/node_value_trigger/node_value_trigger.gml b/scripts/node_value_trigger/node_value_trigger.gml index b19e475ef..87b6dee9b 100644 --- a/scripts/node_value_trigger/node_value_trigger.gml +++ b/scripts/node_value_trigger/node_value_trigger.gml @@ -1,6 +1,6 @@ -function nodeValue_Trigger(_name, _node, _value, _tooltip = "") { return new NodeValue_Trigger(_name, _node, _value, _tooltip); } +function nodeValue_Trigger(_name, _node, _value, _tooltip = "") { return new __NodeValue_Trigger(_name, _node, _value, _tooltip); } -function NodeValue_Trigger(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.trigger, _value, _tooltip) constructor { +function __NodeValue_Trigger(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.trigger, _value, _tooltip) constructor { /////============== GET ============= diff --git a/scripts/node_value_vec2/node_value_vec2.gml b/scripts/node_value_vec2/node_value_vec2.gml index ce2973eb1..ad8b6f56f 100644 --- a/scripts/node_value_vec2/node_value_vec2.gml +++ b/scripts/node_value_vec2/node_value_vec2.gml @@ -1,6 +1,6 @@ -function nodeValue_Vec2(_name, _node, _value, _data = {}) { return new NodeValue_Vec2(_name, _node, _value, _data); } +function nodeValue_Vec2(_name, _node, _value, _data = {}) { return new __NodeValue_Vec2(_name, _node, _value, _data); } -function NodeValue_Vec2(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, "") constructor { +function __NodeValue_Vec2(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, "") constructor { setDisplay(VALUE_DISPLAY.vector, _data); def_length = 2; diff --git a/scripts/node_value_vec2_range/node_value_vec2_range.gml b/scripts/node_value_vec2_range/node_value_vec2_range.gml index e95f87ca3..9ccde9f9e 100644 --- a/scripts/node_value_vec2_range/node_value_vec2_range.gml +++ b/scripts/node_value_vec2_range/node_value_vec2_range.gml @@ -1,5 +1,5 @@ -function nodeValue_Vec2_Range(_name, _node, _value, _data = {}) { return new NodeValue_Vec2_Range(_name, _node, _value, _data); } +function nodeValue_Vec2_Range(_name, _node, _value, _data = {}) { return new __NodeValue_Vec2_Range(_name, _node, _value, _data); } -function NodeValue_Vec2_Range(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 4) constructor { +function __NodeValue_Vec2_Range(_name, _node, _value, _data = {}) : __NodeValue_Array(_name, _node, _value, "", 4) constructor { setDisplay(VALUE_DISPLAY.vector_range, _data); } \ No newline at end of file diff --git a/scripts/node_value_vec3/node_value_vec3.gml b/scripts/node_value_vec3/node_value_vec3.gml index f5a90db24..9733c5f09 100644 --- a/scripts/node_value_vec3/node_value_vec3.gml +++ b/scripts/node_value_vec3/node_value_vec3.gml @@ -1,5 +1,5 @@ -function nodeValue_Vec3(_name, _node, _value, _data = {}) { return new NodeValue_Vec3(_name, _node, _value, _data); } +function nodeValue_Vec3(_name, _node, _value, _data = {}) { return new __NodeValue_Vec3(_name, _node, _value, _data); } -function NodeValue_Vec3(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 3) constructor { +function __NodeValue_Vec3(_name, _node, _value, _data = {}) : __NodeValue_Array(_name, _node, _value, "", 3) constructor { setDisplay(VALUE_DISPLAY.vector, _data); } \ No newline at end of file diff --git a/scripts/node_value_vec3_range/node_value_vec3_range.gml b/scripts/node_value_vec3_range/node_value_vec3_range.gml index 87fabc91f..779d99914 100644 --- a/scripts/node_value_vec3_range/node_value_vec3_range.gml +++ b/scripts/node_value_vec3_range/node_value_vec3_range.gml @@ -1,6 +1,6 @@ -function nodeValue_Vec3_Range(_name, _node, _value, _tooltip = "") { return new NodeValue_Vec3_Range(_name, _node, _value, _tooltip); } +function nodeValue_Vec3_Range(_name, _node, _value, _tooltip = "") { return new __NodeValue_Vec3_Range(_name, _node, _value, _tooltip); } -function NodeValue_Vec3_Range(_name, _node, _value, _data, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 6) constructor { +function __NodeValue_Vec3_Range(_name, _node, _value, _data, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, 6) constructor { setDisplay(VALUE_DISPLAY.vector_range, _data); } \ No newline at end of file diff --git a/scripts/node_value_vec4/node_value_vec4.gml b/scripts/node_value_vec4/node_value_vec4.gml index 4ee3c7d07..a179b1daa 100644 --- a/scripts/node_value_vec4/node_value_vec4.gml +++ b/scripts/node_value_vec4/node_value_vec4.gml @@ -1,5 +1,5 @@ -function nodeValue_Vec4(_name, _node, _value, _data = {}) { return new NodeValue_Vec4(_name, _node, _value, _data); } +function nodeValue_Vec4(_name, _node, _value, _data = {}) { return new __NodeValue_Vec4(_name, _node, _value, _data); } -function NodeValue_Vec4(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 4) constructor { +function __NodeValue_Vec4(_name, _node, _value, _data = {}) : __NodeValue_Array(_name, _node, _value, "", 4) constructor { setDisplay(VALUE_DISPLAY.vector, _data); } \ No newline at end of file diff --git a/scripts/panel_patreon/panel_patreon.gml b/scripts/panel_patreon/panel_patreon.gml index 048d0036f..e95a7061d 100644 --- a/scripts/panel_patreon/panel_patreon.gml +++ b/scripts/panel_patreon/panel_patreon.gml @@ -39,10 +39,12 @@ function Panel_Patreon() : PanelContent() constructor { return; } - var key = keys[0]; + var key = keys[0]; var member = map[$ key]; + var stat = string_replace_all(string_lower(member.status), " ", "_"); + print(stat); - if(member.status == "active_patron") { + if(string_pos("active", stat) > 0) { var _mail = member.email; var _code = patreon_generate_activation_key(_mail); //yea we doing this on client now. verify_code = _code;