diff --git a/scripts/__node_3d_plane/__node_3d_plane.gml b/scripts/__node_3d_plane/__node_3d_plane.gml index 01d3c6f89..21aef3d64 100644 --- a/scripts/__node_3d_plane/__node_3d_plane.gml +++ b/scripts/__node_3d_plane/__node_3d_plane.gml @@ -126,7 +126,7 @@ function __Node_3D_Plane(_x, _y, _group = noone) : Node_Processor(_x, _y, _group var _out = outputs[| 0].getValue(); if(!is_surface(_out) || !surface_exists(_out)) return; - _3d_gizmo(active, _x, _y, _s, _mx, _my, _snx, _sny,, false); + _3d_gizmo(active, _x, _y, _s, _mx, _my, _snx, _sny); } static submit_vertex = function(index = 0) { diff --git a/scripts/_node_strand_affector/_node_strand_affector.gml b/scripts/_node_strand_affector/_node_strand_affector.gml index dd2618011..60ee1d7ac 100644 --- a/scripts/_node_strand_affector/_node_strand_affector.gml +++ b/scripts/_node_strand_affector/_node_strand_affector.gml @@ -144,7 +144,7 @@ function _Node_Strand_Affector(_x, _y, _group = noone) : Node(_x, _y, _group) co active &= inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= inputs[| 4].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); - active &= inputs[| 3].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny, 0, 1, THEME.anchor_scale_hori); + active &= inputs[| 3].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); } static update = function(frame = CURRENT_FRAME) { diff --git a/scripts/canvas_tool_node/canvas_tool_node.gml b/scripts/canvas_tool_node/canvas_tool_node.gml index 96b1094be..45f1bcc6b 100644 --- a/scripts/canvas_tool_node/canvas_tool_node.gml +++ b/scripts/canvas_tool_node/canvas_tool_node.gml @@ -3,6 +3,7 @@ function canvas_tool_node(canvas, node) : canvas_tool() constructor { self.canvas = canvas; self.node = node; override = true; + panel = noone; applySelection = false; @@ -28,6 +29,7 @@ function canvas_tool_node(canvas, node) : canvas_tool() constructor { } } + if(panel) panel.remove(); node.nodeTool = noone; UNDO_HOLDING = false; } @@ -81,7 +83,9 @@ function canvas_tool_node(canvas, node) : canvas_tool() constructor { return noone; } - panelAdd("Panel_Inspector", true, false).content.setInspecting(nodeObject, true, false); + panel = panelAdd("Panel_Inspector", true, false); + panel.content.setInspecting(nodeObject, true, false); + panel.destroy_on_click_out = false; return self; } @@ -192,8 +196,12 @@ function canvas_tool_node(canvas, node) : canvas_tool() constructor { draw_surface_ext_safe(destiSurface, _dx, _dy, _s, _s); draw_surface_ext_safe(maskedSurface, _dx, _dy, _s, _s); - if(mouse_press(mb_left, active)) { apply(); MOUSE_BLOCK = true; } - else if(mouse_press(mb_right, active)) { destroy(); MOUSE_BLOCK = true; } + var hov = nodeObject.drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + + if(is_undefined(hov) || !hov) { + if(mouse_press(mb_left, active)) { apply(); MOUSE_BLOCK = true; } + else if(mouse_press(mb_right, active)) { destroy(); MOUSE_BLOCK = true; } + } } } \ No newline at end of file diff --git a/scripts/node_2d_light/node_2d_light.gml b/scripts/node_2d_light/node_2d_light.gml index 876cf3808..24656d351 100644 --- a/scripts/node_2d_light/node_2d_light.gml +++ b/scripts/node_2d_light/node_2d_light.gml @@ -81,6 +81,7 @@ function Node_2D_light(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) PROCESSOR_OVERLAY_CHECK var _shape = current_data[1]; + var _hov = false; switch(_shape) { case LIGHT_SHAPE_2D.point : @@ -88,16 +89,18 @@ function Node_2D_light(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) var px = _x + pos[0] * _s; var py = _y + pos[1] * _s; - inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 3].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= bool(hv); + var hv = inputs[| 3].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); _hov |= bool(hv); break; case LIGHT_SHAPE_2D.line : case LIGHT_SHAPE_2D.line_asym : case LIGHT_SHAPE_2D.spot : - inputs[| 6].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 7].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 6].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= bool(hv); + var hv = inputs[| 7].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= bool(hv); break; } + + return _hov; } static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_bevel/node_bevel.gml b/scripts/node_bevel/node_bevel.gml index f08460261..39e676eda 100644 --- a/scripts/node_bevel/node_bevel.gml +++ b/scripts/node_bevel/node_bevel.gml @@ -51,12 +51,15 @@ function Node_Bevel(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con PROCESSOR_OVERLAY_CHECK var _surf = current_data[0]; - if(!is_surface(_surf)) return; + if(!is_surface(_surf)) return false; var _pw = surface_get_width_safe(_surf) * _s / 2; var _ph = surface_get_height_safe(_surf) * _s / 2; + var _hov = false; - inputs[| 2].drawOverlay(hover, active, _x + _pw, _y + _ph, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 2].drawOverlay(hover, active, _x + _pw, _y + _ph, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } #endregion static step = function() { #region diff --git a/scripts/node_bloom/node_bloom.gml b/scripts/node_bloom/node_bloom.gml index 52c22e987..209e4b325 100644 --- a/scripts/node_bloom/node_bloom.gml +++ b/scripts/node_bloom/node_bloom.gml @@ -54,9 +54,11 @@ function Node_Bloom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region var _typ = getSingleValue(13); + var _hov = false; - if(_typ == 1) - inputs[| 14].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + if(_typ == 1) { var hv = inputs[| 14].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; } + + return _hov; } #endregion static step = function() { #region diff --git a/scripts/node_blur_directional/node_blur_directional.gml b/scripts/node_blur_directional/node_blur_directional.gml index 7971811c9..836de68f4 100644 --- a/scripts/node_blur_directional/node_blur_directional.gml +++ b/scripts/node_blur_directional/node_blur_directional.gml @@ -55,8 +55,11 @@ function Node_Blur_Directional(_x, _y, _group = noone) : Node_Processor(_x, _y, var ww = surface_get_width_safe(_surf); var hh = surface_get_height_safe(_surf); + var _hov = false; - inputs[| 2].drawOverlay(hover, active, _x + ww / 2 * _s, _y + hh / 2 * _s, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 2].drawOverlay(hover, active, _x + ww / 2 * _s, _y + hh / 2 * _s, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } #endregion static step = function() { #region diff --git a/scripts/node_blur_radial/node_blur_radial.gml b/scripts/node_blur_radial/node_blur_radial.gml index 17e63280d..1f5ebcde6 100644 --- a/scripts/node_blur_radial/node_blur_radial.gml +++ b/scripts/node_blur_radial/node_blur_radial.gml @@ -47,12 +47,15 @@ function Node_Blur_Radial(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou attribute_interpolation(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region - var pos = getInputData(2); - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var pos = getInputData(2); + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - inputs[| 1].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); - inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 1].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } #endregion static step = function() { #region diff --git a/scripts/node_blur_zoom/node_blur_zoom.gml b/scripts/node_blur_zoom/node_blur_zoom.gml index ee60cba00..96fbc3356 100644 --- a/scripts/node_blur_zoom/node_blur_zoom.gml +++ b/scripts/node_blur_zoom/node_blur_zoom.gml @@ -50,12 +50,15 @@ function Node_Blur_Zoom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attribute_oversample(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region - var pos = getInputData(2); - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var pos = getInputData(2); + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - inputs[| 1].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny, 0, 64, THEME.anchor_scale_hori); - inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 1].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny, 0, 64); _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } #endregion static step = function() { #region diff --git a/scripts/node_box_pattern/node_box_pattern.gml b/scripts/node_box_pattern/node_box_pattern.gml index 3d6bd0310..760c82ef3 100644 --- a/scripts/node_box_pattern/node_box_pattern.gml +++ b/scripts/node_box_pattern/node_box_pattern.gml @@ -53,12 +53,15 @@ function Node_Box_Pattern(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - var pos = getInputData(3); - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var pos = getInputData(3); + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_canvas/node_canvas.gml b/scripts/node_canvas/node_canvas.gml index d1dbc547f..eee73ea31 100644 --- a/scripts/node_canvas/node_canvas.gml +++ b/scripts/node_canvas/node_canvas.gml @@ -725,7 +725,7 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor tool_selection._canvas_surface = _canvas_surface; tool_selection.apply_draw_surface = apply_draw_surface; - if(tool_selection.is_selected) { + if(tool_selection.is_selected && !is_instanceof(_tool, canvas_tool_node)) { tool_selection.step(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); tool_mirror_edit.sprs = (!tool_selection.is_selected && tool_attribute.mirror[0])? THEME.canvas_mirror_diag : THEME.canvas_mirror; diff --git a/scripts/node_cellular/node_cellular.gml b/scripts/node_cellular/node_cellular.gml index d494599bf..ae4c66d8f 100644 --- a/scripts/node_cellular/node_cellular.gml +++ b/scripts/node_cellular/node_cellular.gml @@ -56,7 +56,10 @@ function Node_Cellular(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_checker/node_checker.gml b/scripts/node_checker/node_checker.gml index f88c32d44..584351d98 100644 --- a/scripts/node_checker/node_checker.gml +++ b/scripts/node_checker/node_checker.gml @@ -42,12 +42,15 @@ function Node_Checker(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - var pos = getInputData(3); - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var pos = getInputData(3); + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_chromatic_aberration/node_chromatic_aberration.gml b/scripts/node_chromatic_aberration/node_chromatic_aberration.gml index 0cf7816d4..8c8e20e34 100644 --- a/scripts/node_chromatic_aberration/node_chromatic_aberration.gml +++ b/scripts/node_chromatic_aberration/node_chromatic_aberration.gml @@ -31,11 +31,14 @@ function Node_Chromatic_Aberration(_x, _y, _group = noone) : Node_Processor(_x, attribute_interpolation(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region - var pos = getInputData(1); - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var pos = getInputData(1); + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } #endregion static step = function() { #region diff --git a/scripts/node_colorize/node_colorize.gml b/scripts/node_colorize/node_colorize.gml index 6cd77c8ee..4def6f29e 100644 --- a/scripts/node_colorize/node_colorize.gml +++ b/scripts/node_colorize/node_colorize.gml @@ -44,18 +44,21 @@ function Node_Colorize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attribute_surface_depth(); - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region - inputs[| 12].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, surface_get_dimension(getSingleValue(0))); - } #endregion + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { + var _hov = false; + var hv = inputs[| 12].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, surface_get_dimension(getSingleValue(0))); _hov |= hv; + + return _hov; + } - static step = function() { #region + static step = function() { __step_mask_modifier(); inputs[| 1].mappableStep(); inputs[| 2].mappableStep(); - } #endregion + } - static processData = function(_outSurf, _data, _output_index, _array_index) { #region + static processData = function(_outSurf, _data, _output_index, _array_index) { surface_set_shader(_outSurf, sh_colorize); shader_set_gradient(_data[1], _data[11], _data[12], inputs[| 1]); @@ -70,5 +73,5 @@ function Node_Colorize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) _outSurf = channel_apply(_data[0], _outSurf, _data[7]); return _outSurf; - } #endregion + } } \ No newline at end of file diff --git a/scripts/node_dilate/node_dilate.gml b/scripts/node_dilate/node_dilate.gml index 8d73c9f83..fb67c80a4 100644 --- a/scripts/node_dilate/node_dilate.gml +++ b/scripts/node_dilate/node_dilate.gml @@ -51,26 +51,28 @@ function Node_Dilate(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co attribute_oversample(); attribute_interpolation(); - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { PROCESSOR_OVERLAY_CHECK - var pos = current_data[1]; + var pos = current_data[1]; + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= a; + var a = inputs[| 3].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); _hov |= a; - var a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - var a = inputs[| 3].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny, 0, 1, THEME.anchor_scale_hori); - } #endregion + return _hov; + } - static step = function() { #region + static step = function() { __step_mask_modifier(); inputs[| 2].mappableStep(); inputs[| 3].mappableStep(); - } #endregion + } - static processData = function(_outSurf, _data, _output_index, _array_index) { #region + static processData = function(_outSurf, _data, _output_index, _array_index) { var sam = struct_try_get(attributes, "oversample"); surface_set_shader(_outSurf, sh_dilate); @@ -89,5 +91,5 @@ function Node_Dilate(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co _outSurf = channel_apply(_data[0], _outSurf, _data[8]); return _outSurf; - } #endregion + } } \ No newline at end of file diff --git a/scripts/node_flood_fill/node_flood_fill.gml b/scripts/node_flood_fill/node_flood_fill.gml index 9751b878d..3ada50ba8 100644 --- a/scripts/node_flood_fill/node_flood_fill.gml +++ b/scripts/node_flood_fill/node_flood_fill.gml @@ -46,7 +46,10 @@ function Node_Flood_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _group })]); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_flow_noise/node_flow_noise.gml b/scripts/node_flow_noise/node_flow_noise.gml index 869defb44..c55082e22 100644 --- a/scripts/node_flow_noise/node_flow_noise.gml +++ b/scripts/node_flow_noise/node_flow_noise.gml @@ -28,6 +28,9 @@ function Node_Flow_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x, _y, ]; static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } } \ No newline at end of file diff --git a/scripts/node_fold_noise/node_fold_noise.gml b/scripts/node_fold_noise/node_fold_noise.gml index 76af097af..75bb7ee37 100644 --- a/scripts/node_fold_noise/node_fold_noise.gml +++ b/scripts/node_fold_noise/node_fold_noise.gml @@ -37,6 +37,9 @@ function Node_Fold_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x, _y, ]; static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } } \ No newline at end of file diff --git a/scripts/node_gabor_noise/node_gabor_noise.gml b/scripts/node_gabor_noise/node_gabor_noise.gml index bb8f31b01..9b891f93e 100644 --- a/scripts/node_gabor_noise/node_gabor_noise.gml +++ b/scripts/node_gabor_noise/node_gabor_noise.gml @@ -64,7 +64,10 @@ function Node_Gabor_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x, _y } static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } } \ No newline at end of file diff --git a/scripts/node_gradient/node_gradient.gml b/scripts/node_gradient/node_gradient.gml index bcbb1ad27..c4c04b752 100644 --- a/scripts/node_gradient/node_gradient.gml +++ b/scripts/node_gradient/node_gradient.gml @@ -68,14 +68,16 @@ function Node_Gradient(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attribute_surface_depth(); - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { PROCESSOR_OVERLAY_CHECK + var _hov = false; + var a = inputs[| 6].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; _hov |= a; + var a = inputs[| 16].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, current_data[0]); active &= !a; _hov |= a; - var a = inputs[| 6].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 16].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, current_data[0]); active &= !a; - } #endregion + return _hov; + } - static step = function() { #region + static step = function() { var _typ = getInputData(2); inputs[| 3].setVisible(_typ != 1); @@ -87,7 +89,7 @@ function Node_Gradient(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 4].mappableStep(); inputs[| 5].mappableStep(); inputs[| 9].mappableStep(); - } #endregion + } static processData = function(_outSurf, _data, _output_index, _array_index) { var _dim = _data[0]; diff --git a/scripts/node_gradient_points/node_gradient_points.gml b/scripts/node_gradient_points/node_gradient_points.gml index b28ab8b86..bdc302135 100644 --- a/scripts/node_gradient_points/node_gradient_points.gml +++ b/scripts/node_gradient_points/node_gradient_points.gml @@ -54,14 +54,17 @@ function Node_Gradient_Points(_x, _y, _group = noone) : Node_Processor(_x, _y, _ attribute_surface_depth(); - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region - if(inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny)) active = false; - if(inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny)) active = false; - if(inputs[| 5].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny)) active = false; - if(inputs[| 7].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny)) active = false; - } #endregion + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) active &= !hv; _hov |= hv; + var hv = inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) active &= !hv; _hov |= hv; + var hv = inputs[| 5].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) active &= !hv; _hov |= hv; + var hv = inputs[| 7].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) active &= !hv; _hov |= hv; + + return _hov; + } - static step = function() { #region + static step = function() { var _usePal = getInputData(9); inputs[| 10].setVisible(_usePal, _usePal); @@ -70,9 +73,9 @@ function Node_Gradient_Points(_x, _y, _group = noone) : Node_Processor(_x, _y, _ inputs[| 4].setVisible(!_usePal, !_usePal); inputs[| 6].setVisible(!_usePal, !_usePal); inputs[| 8].setVisible(!_usePal, !_usePal); - } #endregion + } - static processData = function(_outSurf, _data, _output_index, _array_index) { #region + static processData = function(_outSurf, _data, _output_index, _array_index) { var _dim = _data[0]; _outSurf = surface_verify(_outSurf, _dim[0], _dim[1], attrDepth()); @@ -113,5 +116,5 @@ function Node_Gradient_Points(_x, _y, _group = noone) : Node_Processor(_x, _y, _ surface_reset_shader(); return _outSurf; - } #endregion + } } \ No newline at end of file diff --git a/scripts/node_grid/node_grid.gml b/scripts/node_grid/node_grid.gml index 26e42eb7d..6f7aaab61 100644 --- a/scripts/node_grid/node_grid.gml +++ b/scripts/node_grid/node_grid.gml @@ -84,8 +84,15 @@ function Node_Grid(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - var a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 21].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !a; + var hov = false; + var pos = getSingleValue(1); + + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; hov |= bool(hv); + var hv = inputs[| 2].drawOverlay(hover, active, _x + pos[0] * _s, _y + pos[1] * _s, _s, _mx, _my, _snx, _sny, 1); active &= !hv; hov |= bool(hv); + var hv = inputs[| 4].drawOverlay(hover, active, _x + pos[0] * _s, _y + pos[1] * _s, _s, _mx, _my, _snx, _sny); active &= !hv; hov |= bool(hv); + var hv = inputs[| 21].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !hv; hov |= bool(hv); + + return hov; } static step = function() { #region diff --git a/scripts/node_grid_hex/node_grid_hex.gml b/scripts/node_grid_hex/node_grid_hex.gml index c76c520d0..e6bb41075 100644 --- a/scripts/node_grid_hex/node_grid_hex.gml +++ b/scripts/node_grid_hex/node_grid_hex.gml @@ -80,16 +80,19 @@ function Node_Grid_Hex(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - var a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 18].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !a; + var _hov = false; + var a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; _hov |= a; + var a = inputs[| 18].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !a; _hov |= a; + + return _hov; } - static step = function() { #region + static step = function() { inputs[| 2].mappableStep(); inputs[| 3].mappableStep(); inputs[| 4].mappableStep(); inputs[| 5].mappableStep(); - } #endregion + } static processData = function(_outSurf, _data, _output_index, _array_index) { var _dim = _data[0]; diff --git a/scripts/node_grid_noise/node_grid_noise.gml b/scripts/node_grid_noise/node_grid_noise.gml index d1e8758af..f7810c29f 100644 --- a/scripts/node_grid_noise/node_grid_noise.gml +++ b/scripts/node_grid_noise/node_grid_noise.gml @@ -45,7 +45,10 @@ function Node_Grid_Noise(_x, _y, _group = noone) : Node_Processor(_x, _y, _group attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_grid_pentagonal/node_grid_pentagonal.gml b/scripts/node_grid_pentagonal/node_grid_pentagonal.gml index eb74fa7a3..be3db8f4b 100644 --- a/scripts/node_grid_pentagonal/node_grid_pentagonal.gml +++ b/scripts/node_grid_pentagonal/node_grid_pentagonal.gml @@ -65,8 +65,11 @@ function Node_Grid_Pentagonal(_x, _y, _group = noone) : Node_Processor(_x, _y, _ attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - var a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 15].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !a; + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 15].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !hv; _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_grid_tri/node_grid_tri.gml b/scripts/node_grid_tri/node_grid_tri.gml index a3351105e..889364e19 100644 --- a/scripts/node_grid_tri/node_grid_tri.gml +++ b/scripts/node_grid_tri/node_grid_tri.gml @@ -80,8 +80,11 @@ function Node_Grid_Tri(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - var a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 18].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !a; + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 18].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !hv; _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_herringbone_tile/node_herringbone_tile.gml b/scripts/node_herringbone_tile/node_herringbone_tile.gml index 8ecf4418e..8f8bde6b5 100644 --- a/scripts/node_herringbone_tile/node_herringbone_tile.gml +++ b/scripts/node_herringbone_tile/node_herringbone_tile.gml @@ -80,8 +80,11 @@ function Node_Herringbone_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - var a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 19].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !a; + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 19].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !hv; _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_honey_noise/node_honey_noise.gml b/scripts/node_honey_noise/node_honey_noise.gml index a9edd659d..9cd98f174 100644 --- a/scripts/node_honey_noise/node_honey_noise.gml +++ b/scripts/node_honey_noise/node_honey_noise.gml @@ -32,6 +32,9 @@ function Node_Honeycomb_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x ]; static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } } \ No newline at end of file diff --git a/scripts/node_interpret_number/node_interpret_number.gml b/scripts/node_interpret_number/node_interpret_number.gml index 3555e0ba5..9262dd95f 100644 --- a/scripts/node_interpret_number/node_interpret_number.gml +++ b/scripts/node_interpret_number/node_interpret_number.gml @@ -32,7 +32,10 @@ function Node_Interpret_Number(_x, _y, _group = noone) : Node_Processor(_x, _y, attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - var a = inputs[| 5].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getDimension()); active &= !a; + var _hov = false; + var hv = inputs[| 5].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getDimension()); active &= !hv; _hov |= hv; + + return _hov; } static step = function() { diff --git a/scripts/node_mesh_transform/node_mesh_transform.gml b/scripts/node_mesh_transform/node_mesh_transform.gml index 566d5e437..feecbe46f 100644 --- a/scripts/node_mesh_transform/node_mesh_transform.gml +++ b/scripts/node_mesh_transform/node_mesh_transform.gml @@ -33,11 +33,15 @@ function Node_Mesh_Transform(_x, _y, _group = noone) : Node(_x, _y, _group) cons var px = ax + pos[0] * _s; var py = ay + pos[1] * _s; - active &= !inputs[| 1].drawOverlay(hover, active, ax, ay, _s, _mx, _my, _snx, _sny); - active &= !inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); + var _hov = false; + + var hv = inputs[| 1].drawOverlay(hover, active, ax, ay, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; draw_set_color(COLORS._main_accent); omesh.draw(_x, _y, _s); + + return _hov; } function pointTransform(p, _pos, _rot, _sca, _anc) { diff --git a/scripts/node_mirror/node_mirror.gml b/scripts/node_mirror/node_mirror.gml index 13aa1437c..e7cf7e250 100644 --- a/scripts/node_mirror/node_mirror.gml +++ b/scripts/node_mirror/node_mirror.gml @@ -41,8 +41,11 @@ function Node_Mirror(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co draw_set_color(COLORS._main_accent); draw_line(dx0, dy0, dx1, dy1); - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 2].drawOverlay(hover, active, _posx, _posy, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, _posx, _posy, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + + return _hov; } #endregion static processData = function(_outSurf, _data, _output_index, _array_index) { #region diff --git a/scripts/node_mk_brownian/node_mk_brownian.gml b/scripts/node_mk_brownian/node_mk_brownian.gml index e934680b6..00b655d76 100644 --- a/scripts/node_mk_brownian/node_mk_brownian.gml +++ b/scripts/node_mk_brownian/node_mk_brownian.gml @@ -50,7 +50,10 @@ function Node_MK_Brownian(_x, _y, _group = noone) : Node(_x, _y, _group) constru ]; static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static getPosition = function(ind, t, _area, _sped, _dire, _dirs, _turn, _dira) { #region diff --git a/scripts/node_mk_cable/node_mk_cable.gml b/scripts/node_mk_cable/node_mk_cable.gml index 1ad11a7f8..abc8f4b53 100644 --- a/scripts/node_mk_cable/node_mk_cable.gml +++ b/scripts/node_mk_cable/node_mk_cable.gml @@ -16,10 +16,13 @@ function Node_MK_Cable(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region - var _a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= _a; - var _a = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= _a; - } #endregion + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= hv; _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= hv; _hov |= hv; + + return _hov; + } static processData = function(_outSurf, _data, _output_index, _array_index) { var _dim = _data[0]; diff --git a/scripts/node_mk_fall/node_mk_fall.gml b/scripts/node_mk_fall/node_mk_fall.gml index 545335b02..915956910 100644 --- a/scripts/node_mk_fall/node_mk_fall.gml +++ b/scripts/node_mk_fall/node_mk_fall.gml @@ -96,7 +96,7 @@ function Node_MK_Fall(_x, _y, _group = noone) : Node(_x, _y, _group) constructor traj = []; traj_index = 0; - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { draw_set_color(COLORS._main_accent); for( var i = 0, n = array_length(traj); i < n; i++ ) { @@ -117,7 +117,8 @@ function Node_MK_Fall(_x, _y, _group = noone) : Node(_x, _y, _group) constructor } } - inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; if(getInputData(15)) { var _gr = getInputData(16); @@ -128,7 +129,9 @@ function Node_MK_Fall(_x, _y, _group = noone) : Node(_x, _y, _group) constructor draw_line(0, _y0, 999999, _y0); draw_line(0, _y1, 999999, _y1); } - } #endregion + + return _hov; + } static getPosition = function(ind, t, _area) { #region random_set_seed(ind); diff --git a/scripts/node_mk_flag/node_mk_flag.gml b/scripts/node_mk_flag/node_mk_flag.gml index 625a61244..1d571dc0d 100644 --- a/scripts/node_mk_flag/node_mk_flag.gml +++ b/scripts/node_mk_flag/node_mk_flag.gml @@ -181,8 +181,9 @@ function Node_MK_Flag(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c } } #endregion - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region - var _a = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= _a; + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { + var _hov = false; + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; //for( var i = 0, n = array_length(links); i < n; i++ ) { // var _l = links[i]; @@ -203,7 +204,9 @@ function Node_MK_Flag(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c // draw_line(_p0x, _p0y, _p1x, _p1y); // } //} - } #endregion + + return _hov; + } static processData_prebatch = function() { #region if(IS_FIRST_FRAME) setGeometry(); diff --git a/scripts/node_mk_flare/node_mk_flare.gml b/scripts/node_mk_flare/node_mk_flare.gml index 781de2f53..11911a4f2 100644 --- a/scripts/node_mk_flare/node_mk_flare.gml +++ b/scripts/node_mk_flare/node_mk_flare.gml @@ -321,21 +321,24 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) dir = 0; dis = 0; - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 6].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - } #endregion + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + var hv = inputs[| 6].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; + } - static getDimension = function(arr = 0) { #region + static getDimension = function(arr = 0) { var _sr = getSingleValue(0, arr); var _dm = getSingleValue(2, arr); if(is_surface(_sr)) return surface_get_dimension(_sr); return _dm; - } #endregion + } - static flare_circle = function(_t, _r, _a, _side = 16, _angle = 0, _s0 = 0, _s1 = 0, _b = c_white) { #region + static flare_circle = function(_t, _r, _a, _side = 16, _angle = 0, _s0 = 0, _s1 = 0, _b = c_white) { var _x = lerp(ox, cx, _t); var _y = lerp(oy, cy, _t); @@ -358,7 +361,7 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) surface_reset_shader(); BLEND_ADD draw_surface_ext(temp_surface[0], _x - _r, _y - _r, 1, 1, 0, _b, _a); - } #endregion + } static flare_crescent = function(_t, _r, _a, _side = 16, _angle = 0, _s0 = 0, _s1 = 0, _b = c_white, _ir = 0, _dist = 0) { #region var _x = lerp(ox, cx, _t); diff --git a/scripts/node_mk_gridballs/node_mk_gridballs.gml b/scripts/node_mk_gridballs/node_mk_gridballs.gml index 2ee149bc3..cfd556e44 100644 --- a/scripts/node_mk_gridballs/node_mk_gridballs.gml +++ b/scripts/node_mk_gridballs/node_mk_gridballs.gml @@ -59,7 +59,10 @@ function Node_MK_GridBalls(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro dimension_index = 1; static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 8].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 8].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_mk_saber/node_mk_saber.gml b/scripts/node_mk_saber/node_mk_saber.gml index 791bd9620..f1bb95eb1 100644 --- a/scripts/node_mk_saber/node_mk_saber.gml +++ b/scripts/node_mk_saber/node_mk_saber.gml @@ -52,13 +52,15 @@ function Node_MK_Saber(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) draw_set_color(COLORS._main_accent); draw_line(_p1x, _p1y, _p2x, _p2y); - - var _a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= _a; - var _a = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= _a; + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; draw_set_text(f_p1, fa_left, fa_bottom, COLORS._main_accent); draw_text(_p1x + ui(4), _p1y - ui(4), "1"); draw_text(_p2x + ui(4), _p2y - ui(4), "2"); + + return _hov; } #endregion static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_noise_aniso/node_noise_aniso.gml b/scripts/node_noise_aniso/node_noise_aniso.gml index 8fd2820b7..280b9fd50 100644 --- a/scripts/node_noise_aniso/node_noise_aniso.gml +++ b/scripts/node_noise_aniso/node_noise_aniso.gml @@ -45,7 +45,10 @@ function Node_Noise_Aniso(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_noise_hex/node_noise_hex.gml b/scripts/node_noise_hex/node_noise_hex.gml index 27420e400..d1661535e 100644 --- a/scripts/node_noise_hex/node_noise_hex.gml +++ b/scripts/node_noise_hex/node_noise_hex.gml @@ -40,7 +40,10 @@ function Node_Noise_Hex(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attribute_oversample(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_noise_simplex/node_noise_simplex.gml b/scripts/node_noise_simplex/node_noise_simplex.gml index 009c8739e..9165cf36d 100644 --- a/scripts/node_noise_simplex/node_noise_simplex.gml +++ b/scripts/node_noise_simplex/node_noise_simplex.gml @@ -94,6 +94,9 @@ function Node_Noise_Simplex(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr } static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } } \ No newline at end of file diff --git a/scripts/node_noise_tri/node_noise_tri.gml b/scripts/node_noise_tri/node_noise_tri.gml index efb7210d3..23ad53c45 100644 --- a/scripts/node_noise_tri/node_noise_tri.gml +++ b/scripts/node_noise_tri/node_noise_tri.gml @@ -40,7 +40,10 @@ function Node_Noise_Tri(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attribute_oversample(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_normal_light/node_normal_light.gml b/scripts/node_normal_light/node_normal_light.gml index fd6431629..6bf542844 100644 --- a/scripts/node_normal_light/node_normal_light.gml +++ b/scripts/node_normal_light/node_normal_light.gml @@ -37,12 +37,15 @@ function Node_Normal_Light(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { PROCESSOR_OVERLAY_CHECK - var pos = current_data[4]; - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var pos = current_data[4]; + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 5].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + var hv = inputs[| 5].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_path_transform/node_path_transform.gml b/scripts/node_path_transform/node_path_transform.gml index 80d67100c..d986521fb 100644 --- a/scripts/node_path_transform/node_path_transform.gml +++ b/scripts/node_path_transform/node_path_transform.gml @@ -29,7 +29,7 @@ function Node_Path_Transform(_x, _y, _group = noone) : Node(_x, _y, _group) cons active &= !inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); - active &= !inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, THEME.anchor ); + active &= !inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny ); } #endregion static getLineCount = function() { #region diff --git a/scripts/node_perlin/node_perlin.gml b/scripts/node_perlin/node_perlin.gml index 015f461d8..0aab4d98f 100644 --- a/scripts/node_perlin/node_perlin.gml +++ b/scripts/node_perlin/node_perlin.gml @@ -51,7 +51,10 @@ function Node_Perlin(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { diff --git a/scripts/node_perlin_extra/node_perlin_extra.gml b/scripts/node_perlin_extra/node_perlin_extra.gml index 5f06af241..6b7a91c02 100644 --- a/scripts/node_perlin_extra/node_perlin_extra.gml +++ b/scripts/node_perlin_extra/node_perlin_extra.gml @@ -72,7 +72,10 @@ function Node_Perlin_Extra(_x, _y, _group = noone) : Node_Shader_Generator(_x, _ ]; static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_perlin_smear/node_perlin_smear.gml b/scripts/node_perlin_smear/node_perlin_smear.gml index 84f3ae180..d83b43ac5 100644 --- a/scripts/node_perlin_smear/node_perlin_smear.gml +++ b/scripts/node_perlin_smear/node_perlin_smear.gml @@ -29,7 +29,10 @@ function Node_Perlin_Smear(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_pytagorean_tile/node_pytagorean_tile.gml b/scripts/node_pytagorean_tile/node_pytagorean_tile.gml index a46e5671a..16a6ed4b7 100644 --- a/scripts/node_pytagorean_tile/node_pytagorean_tile.gml +++ b/scripts/node_pytagorean_tile/node_pytagorean_tile.gml @@ -81,8 +81,11 @@ function Node_Pytagorean_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _ attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - var a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 19].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !a; + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 19].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !hv; _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_quasicrystal/node_quasicrystal.gml b/scripts/node_quasicrystal/node_quasicrystal.gml index 6f17cc765..368e16ab4 100644 --- a/scripts/node_quasicrystal/node_quasicrystal.gml +++ b/scripts/node_quasicrystal/node_quasicrystal.gml @@ -48,12 +48,15 @@ function Node_Quasicrystal(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region - var pos = getInputData(3); - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var pos = getInputData(3); + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - var a = inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); active &= !a; + var hv = inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + + return _hov; } #endregion static step = function() { #region diff --git a/scripts/node_random_tile/node_random_tile.gml b/scripts/node_random_tile/node_random_tile.gml index 2f148b870..ddd2bddf0 100644 --- a/scripts/node_random_tile/node_random_tile.gml +++ b/scripts/node_random_tile/node_random_tile.gml @@ -78,8 +78,11 @@ function Node_Random_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou attribute_surface_depth(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - var a = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 18].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !a; + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 18].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, getSingleValue(0)); active &= !hv; _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_repeat/node_repeat.gml b/scripts/node_repeat/node_repeat.gml index d2f92d537..ccc57274d 100644 --- a/scripts/node_repeat/node_repeat.gml +++ b/scripts/node_repeat/node_repeat.gml @@ -113,7 +113,8 @@ function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region PROCESSOR_OVERLAY_CHECK - var a = inputs[| 9].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, THEME.anchor); active &= !a; + var _hov = false; + var hv = inputs[| 9].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; var _pat = current_data[3]; var _spos = current_data[9]; @@ -121,17 +122,12 @@ function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co var px = _x + _spos[0] * _s; var py = _y + _spos[1] * _s; - if(_pat == 0 || _pat == 1) { - var a = inputs[| 4].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); - active &= !a; - - } else if(_pat == 2) { - var a = inputs[| 8].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); - active &= !a; - - } + if(_pat == 0 || _pat == 1) { var hv = inputs[| 4].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; } + else if(_pat == 2) { var hv = inputs[| 8].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; } - var a = inputs[| 31].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, current_data[1]); active &= !a; + var hv = inputs[| 31].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, current_data[1]); active &= !hv; _hov |= hv; + + return _hov; } #endregion static preGetInputs = function() { #region diff --git a/scripts/node_rigid_force_apply/node_rigid_force_apply.gml b/scripts/node_rigid_force_apply/node_rigid_force_apply.gml index cae01aae1..82eb03faa 100644 --- a/scripts/node_rigid_force_apply/node_rigid_force_apply.gml +++ b/scripts/node_rigid_force_apply/node_rigid_force_apply.gml @@ -77,7 +77,7 @@ function Node_Rigid_Force_Apply(_x, _y, _group = noone) : Node(_x, _y, _group) c draw_set_alpha(1); inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 5].drawOverlay(hover, active, px, py, _s * attributes.display_scale, _mx, _my, _snx, _sny, THEME.anchor, 10); + inputs[| 5].drawOverlay(hover, active, px, py, _s * attributes.display_scale, _mx, _my, _snx, _sny, 0, 10); } else if(_typ == 3) { var _rad = getInputData(8); @@ -87,7 +87,7 @@ function Node_Rigid_Force_Apply(_x, _y, _group = noone) : Node(_x, _y, _group) c draw_set_alpha(1); inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 8].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny, 0, 1, THEME.anchor_scale_hori); + inputs[| 8].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); } else inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); } diff --git a/scripts/node_scatter/node_scatter.gml b/scripts/node_scatter/node_scatter.gml index bfbd43bc7..48de4bc5e 100644 --- a/scripts/node_scatter/node_scatter.gml +++ b/scripts/node_scatter/node_scatter.gml @@ -156,13 +156,12 @@ function Node_Scatter(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c PROCESSOR_OVERLAY_CHECK var _distType = current_data[6]; + var _hov = false; - if(_distType < 3) { - var a = inputs[| 5].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - active &= !a; - } - - var a = inputs[| 29].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, current_data[1]); active &= !a; + if(_distType < 3) { var hv = inputs[| 5].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; } + var hv = inputs[| 29].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, current_data[1]); active &= !hv; _hov |= hv; + + return _hov; } #endregion static onValueUpdate = function(index) { #region diff --git a/scripts/node_shadow/node_shadow.gml b/scripts/node_shadow/node_shadow.gml index 0b9d4c8df..e3d23d229 100644 --- a/scripts/node_shadow/node_shadow.gml +++ b/scripts/node_shadow/node_shadow.gml @@ -39,15 +39,19 @@ function Node_Shadow(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var _surf = outputs[| 0].getValue(); + var _hov = false; + if(is_array(_surf)) { - if(array_length(_surf) == 0) return; + if(array_length(_surf) == 0) return _hov; _surf = _surf[preview_index]; } var ww = surface_get_width_safe(_surf) * _s; var hh = surface_get_height_safe(_surf) * _s; - inputs[| 3].drawOverlay(hover, active, _x + ww / 2, _y + hh / 2, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 3].drawOverlay(hover, active, _x + ww / 2, _y + hh / 2, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/node_shadow_cast/node_shadow_cast.gml b/scripts/node_shadow_cast/node_shadow_cast.gml index 923a137c0..5f8ddaba9 100644 --- a/scripts/node_shadow_cast/node_shadow_cast.gml +++ b/scripts/node_shadow_cast/node_shadow_cast.gml @@ -83,8 +83,9 @@ function Node_Shadow_Cast(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { PROCESSOR_OVERLAY_CHECK - inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - if(array_length(current_data) != ds_list_size(inputs)) return; + var _hov = false; + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + if(array_length(current_data) != ds_list_size(inputs)) return _hov; var _type = current_data[5]; if(_type == 0) { @@ -92,8 +93,10 @@ function Node_Shadow_Cast(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou var px = _x + pos[0] * _s; var py = _y + pos[1] * _s; - inputs[| 8].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny, 0, 1 / 4, THEME.anchor_scale_hori); + var hv = inputs[| 8].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny, 0, 1 / 4); _hov |= hv; } + + return _hov; } static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_shape/node_shape.gml b/scripts/node_shape/node_shape.gml index 37873ef11..8a643ed57 100644 --- a/scripts/node_shape/node_shape.gml +++ b/scripts/node_shape/node_shape.gml @@ -153,6 +153,8 @@ function Node_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region PROCESSOR_OVERLAY_CHECK + var _hov = false; + if(use_path) { draw_set_text(f_p3, fa_center, fa_top); draw_set_color(COLORS._main_accent); @@ -168,21 +170,24 @@ function Node_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con ox = nx; oy = ny; } - return; + return _hov; } var _type = current_data[15]; if(_type == 0) { - inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + } else if(_type == 1) { var _pos = current_data[16]; var _px = _x + _pos[0] * _s; var _py = _y + _pos[1] * _s; - inputs[| 16].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 17].drawOverlay(hover, active, _px, _py, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 16].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + var hv = inputs[| 17].drawOverlay(hover, active, _px, _py, _s, _mx, _my, _snx, _sny); _hov |= hv; } + + return _hov; } #endregion static processData = function(_outSurf, _data, _output_index, _array_index) { #region diff --git a/scripts/node_shard_noise/node_shard_noise.gml b/scripts/node_shard_noise/node_shard_noise.gml index 2ecf45f18..ec6a5682c 100644 --- a/scripts/node_shard_noise/node_shard_noise.gml +++ b/scripts/node_shard_noise/node_shard_noise.gml @@ -45,7 +45,10 @@ function Node_Shard_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x, _y ]; static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { diff --git a/scripts/node_skew/node_skew.gml b/scripts/node_skew/node_skew.gml index 598f4847a..7a99b946f 100644 --- a/scripts/node_skew/node_skew.gml +++ b/scripts/node_skew/node_skew.gml @@ -60,7 +60,10 @@ function Node_Skew(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region PROCESSOR_OVERLAY_CHECK - inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } #endregion static step = function() { #region diff --git a/scripts/node_smear/node_smear.gml b/scripts/node_smear/node_smear.gml index 2f9b67785..d0fe9588e 100644 --- a/scripts/node_smear/node_smear.gml +++ b/scripts/node_smear/node_smear.gml @@ -58,10 +58,12 @@ function Node_Smear(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con _surf = _surf[preview_index]; } - var ww = surface_get_width_safe(_surf); - var hh = surface_get_height_safe(_surf); + var ww = surface_get_width_safe(_surf); + var hh = surface_get_height_safe(_surf); + var _hov = false; + var hv = inputs[| 2].drawOverlay(hover, active, _x + ww / 2 * _s, _y + hh / 2 * _s, _s, _mx, _my, _snx, _sny); _hov |= hv; - inputs[| 2].drawOverlay(hover, active, _x + ww / 2 * _s, _y + hh / 2 * _s, _s, _mx, _my, _snx, _sny); + return _hov; } #endregion static step = function() { #region diff --git a/scripts/node_smoke_repulse/node_smoke_repulse.gml b/scripts/node_smoke_repulse/node_smoke_repulse.gml index dc5687201..5ac92225e 100644 --- a/scripts/node_smoke_repulse/node_smoke_repulse.gml +++ b/scripts/node_smoke_repulse/node_smoke_repulse.gml @@ -35,7 +35,7 @@ function Node_Smoke_Repulse(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) draw_circle_prec(px, py, _rad * _s, true); inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny, 0, 1, THEME.anchor_scale_hori); + inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); } static update = function(frame = CURRENT_FRAME) { diff --git a/scripts/node_smoke_vortex/node_smoke_vortex.gml b/scripts/node_smoke_vortex/node_smoke_vortex.gml index 0df7e68dc..9c78bafbd 100644 --- a/scripts/node_smoke_vortex/node_smoke_vortex.gml +++ b/scripts/node_smoke_vortex/node_smoke_vortex.gml @@ -39,7 +39,7 @@ function Node_Smoke_Vortex(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) draw_circle_prec(px, py, _rad * _s, true); inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny, 0, 1, THEME.anchor_scale_hori); + inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); } static update = function(frame = CURRENT_FRAME) { diff --git a/scripts/node_spherize/node_spherize.gml b/scripts/node_spherize/node_spherize.gml index 7edf19a05..41d358ebc 100644 --- a/scripts/node_spherize/node_spherize.gml +++ b/scripts/node_spherize/node_spherize.gml @@ -60,12 +60,14 @@ function Node_Spherize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region PROCESSOR_OVERLAY_CHECK - var pos = current_data[1]; + var pos = current_data[1]; + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + return _hov; } #endregion static step = function() { #region diff --git a/scripts/node_sprite_stack/node_sprite_stack.gml b/scripts/node_sprite_stack/node_sprite_stack.gml index 006a69d77..1eb2ea5ae 100644 --- a/scripts/node_sprite_stack/node_sprite_stack.gml +++ b/scripts/node_sprite_stack/node_sprite_stack.gml @@ -68,10 +68,12 @@ function Node_Sprite_Stack(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro draw_set_color(COLORS._main_accent); draw_line(px, py, sx, sy); + var _hov = false; + var hv = inputs[| 3].drawOverlay(hover, active, px, py, _s * 4, _mx, _my, _snx, _sny, 1); active &= hv; _hov |= hv; + var hv = inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= hv; _hov |= hv; + var hv = inputs[| 5].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); active &= hv; _hov |= hv; - var a = inputs[| 3].drawOverlay(hover, active, px, py, _s * 4, _mx, _my, _snx, _sny, 1); active &= a; - var a = inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= a; - var a = inputs[| 5].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); active &= a; + return _hov; } #endregion static drawPreviewToolOverlay = function(hover, active, _mx, _my, _panel) { #region diff --git a/scripts/node_stripe/node_stripe.gml b/scripts/node_stripe/node_stripe.gml index e8084fe69..80a107fb3 100644 --- a/scripts/node_stripe/node_stripe.gml +++ b/scripts/node_stripe/node_stripe.gml @@ -69,19 +69,22 @@ function Node_Stripe(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co attribute_surface_depth(); - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { PROCESSOR_OVERLAY_CHECK - var pos = current_data[4]; - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var pos = current_data[4]; + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - var a = inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); active &= !a; - var a = inputs[| 16].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, current_data[0]); active &= !a; - } #endregion + var hv = inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); active &= !hv; _hov |= hv; + var hv = inputs[| 16].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, current_data[0]); active &= !hv; _hov |= hv; + + return _hov; + } - static step = function() { #region + static step = function() { var _clr = getSingleValue(6); inputs[| 1].mappableStep(); @@ -94,7 +97,7 @@ function Node_Stripe(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 9].setVisible(_clr == 0); inputs[| 18].setVisible(_clr == 1); inputs[| 7].setVisible(_clr == 2); - } #endregion + } static processData = function(_outSurf, _data, _output_index, _array_index) { #region var _dim = _data[0]; diff --git a/scripts/node_twirl/node_twirl.gml b/scripts/node_twirl/node_twirl.gml index b9c60fd45..ae01b82f6 100644 --- a/scripts/node_twirl/node_twirl.gml +++ b/scripts/node_twirl/node_twirl.gml @@ -51,23 +51,26 @@ function Node_Twirl(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con attribute_oversample(); attribute_interpolation(); - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { PROCESSOR_OVERLAY_CHECK - var pos = current_data[1]; - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var pos = current_data[1]; + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 3].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny, 0, 1, THEME.anchor_scale_hori); - } #endregion + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + var hv = inputs[| 3].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; + } - static step = function() { #region + static step = function() { __step_mask_modifier(); inputs[| 2].mappableStep(); inputs[| 3].mappableStep(); - } #endregion + } static processData = function(_outSurf, _data, _output_index, _array_index) { #region var sam = struct_try_get(attributes, "oversample"); diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index 7483e61f8..94eadcd18 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -1760,7 +1760,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru case VALUE_DISPLAY._default : var _angle = argument_count > arc + 0? argument[arc + 0] : 0; var _scale = argument_count > arc + 1? argument[arc + 1] : 1; - var _spr = argument_count > arc + 2? argument[arc + 2] : THEME.anchor_selector; + var _spr = argument_count > arc + 2? argument[arc + 2] : 0; return preview_overlay_scalar(value_from == noone, active, _x, _y, _s, _mx, _my, _snx, _sny, _angle, _scale, _spr); case VALUE_DISPLAY.rotation : diff --git a/scripts/node_voronoi_extra/node_voronoi_extra.gml b/scripts/node_voronoi_extra/node_voronoi_extra.gml index 1a5934ef1..e325218a2 100644 --- a/scripts/node_voronoi_extra/node_voronoi_extra.gml +++ b/scripts/node_voronoi_extra/node_voronoi_extra.gml @@ -36,6 +36,9 @@ function Node_Voronoi_Extra(_x, _y, _group = noone) : Node_Shader_Generator(_x, ]; static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } } \ No newline at end of file diff --git a/scripts/node_warp/node_warp.gml b/scripts/node_warp/node_warp.gml index d79505da2..aa46aef36 100644 --- a/scripts/node_warp/node_warp.gml +++ b/scripts/node_warp/node_warp.gml @@ -236,10 +236,13 @@ function Node_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons } } - if(inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny)) active = false; - if(inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny)) active = false; - if(inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny)) active = false; - if(inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny)) active = false; + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active = !hv; _hov |= hv; + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active = !hv; _hov |= hv; + var hv = inputs[| 3].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active = !hv; _hov |= hv; + var hv = inputs[| 4].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); active = !hv; _hov |= hv; + + return _hov; #endregion } #endregion diff --git a/scripts/node_wavelet_noise/node_wavelet_noise.gml b/scripts/node_wavelet_noise/node_wavelet_noise.gml index 7602c1443..0c42fc7b4 100644 --- a/scripts/node_wavelet_noise/node_wavelet_noise.gml +++ b/scripts/node_wavelet_noise/node_wavelet_noise.gml @@ -45,7 +45,10 @@ function Node_Wavelet_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x, ]; static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { diff --git a/scripts/node_wrap_area/node_wrap_area.gml b/scripts/node_wrap_area/node_wrap_area.gml index f857bec1e..8f18bddbf 100644 --- a/scripts/node_wrap_area/node_wrap_area.gml +++ b/scripts/node_wrap_area/node_wrap_area.gml @@ -22,7 +22,10 @@ function Node_Wrap_Area(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attribute_interpolation(); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + var _hov = false; + var hv = inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_zigzag/node_zigzag.gml b/scripts/node_zigzag/node_zigzag.gml index 606a8eb74..4dd72ad83 100644 --- a/scripts/node_zigzag/node_zigzag.gml +++ b/scripts/node_zigzag/node_zigzag.gml @@ -44,12 +44,15 @@ function Node_Zigzag(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { PROCESSOR_OVERLAY_CHECK - var pos = current_data[2]; - var px = _x + pos[0] * _s; - var py = _y + pos[1] * _s; + var pos = current_data[2]; + var px = _x + pos[0] * _s; + var py = _y + pos[1] * _s; + var _hov = false; - inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); - inputs[| 8].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); + var hv = inputs[| 2].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; + var hv = inputs[| 8].drawOverlay(hover, active, px, py, _s, _mx, _my, _snx, _sny); _hov |= hv; + + return _hov; } static step = function() { #region diff --git a/scripts/preview_overlay_scalar/preview_overlay_scalar.gml b/scripts/preview_overlay_scalar/preview_overlay_scalar.gml index a990e99d7..7cdab5dc4 100644 --- a/scripts/preview_overlay_scalar/preview_overlay_scalar.gml +++ b/scripts/preview_overlay_scalar/preview_overlay_scalar.gml @@ -1,4 +1,4 @@ -function preview_overlay_scalar(interact, active, _x, _y, _s, _mx, _my, _snx, _sny, _angle, _scale, _spr) { +function preview_overlay_scalar(interact, active, _x, _y, _s, _mx, _my, _snx, _sny, _angle, _scale, _type = 0) { var _val = getValue(); var hover = -1; if(!is_real(_val)) return hover; @@ -41,7 +41,7 @@ function preview_overlay_scalar(interact, active, _x, _y, _s, _mx, _my, _snx, _s __overlay_hover = array_verify(__overlay_hover, 1); __overlay_hover[0] = lerp_float(__overlay_hover[0], index, 4); - draw_anchor(__overlay_hover[0], _ax, _ay, _r); + draw_anchor(__overlay_hover[0], _ax, _ay, _r, _type); draw_set_text(_f_p2b, fa_center, fa_bottom, COLORS._main_accent); draw_text_add(round(_ax), round(_ay - 4), name);