From 4fcbe11f4dc9fefc8ad5d8020d5613b633bbbcee Mon Sep 17 00:00:00 2001 From: Tanasart Date: Mon, 6 Jan 2025 11:10:01 +0700 Subject: [PATCH] [Feedback] Fix connection line still being drawn after deleting the node. --- datafiles/data/Theme.zip | Bin 2840424 -> 2840480 bytes objects/o_dialog_add_node/Draw_64.gml | 6 +++--- scripts/armatureBox/armatureBox.gml | 2 +- scripts/node_armature/node_armature.gml | 20 +++++++++--------- .../node_armature_pose/node_armature_pose.gml | 20 +++++++++--------- scripts/node_data/node_data.gml | 4 +++- .../node_feedback_inline.gml | 3 +++ scripts/node_tiler/node_tiler.gml | 4 ++-- .../node_tiler_tileset/node_tiler_tileset.gml | 2 +- scripts/panel_graph/panel_graph.gml | 8 +++---- 10 files changed, 37 insertions(+), 32 deletions(-) diff --git a/datafiles/data/Theme.zip b/datafiles/data/Theme.zip index 4a1591bab635da1b7185d3e2d5d47bf1e33efb0d..0c807c6c221aa30997eddf24c74974ad2c0b068f 100644 GIT binary patch delta 12728 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 MM2N6YYro(*OVf diff --git a/objects/o_dialog_add_node/Draw_64.gml b/objects/o_dialog_add_node/Draw_64.gml index 0a65c2ebc..10debb10a 100644 --- a/objects/o_dialog_add_node/Draw_64.gml +++ b/objects/o_dialog_add_node/Draw_64.gml @@ -139,13 +139,13 @@ if(DIALOG_SHOW_FOCUS) DIALOG_DRAW_FOCUS var _sx = node_icon_x - ui(16); var _sy = node_icon_y; - var _sw = sprite_get_width(node_icon) + ui(48); - var _sh = sprite_get_height(node_icon) + ui(48); + var _sw = sprite_get_width(node_icon) + ui(16); + var _sh = sprite_get_height(node_icon) + ui(16); var _bgx = _sx - _sw / 2; var _bgy = _sy - _sh / 2; - draw_sprite_stretched(s_node_junction_name_bg, 0, _bgx, _bgy, _sw, _sh); + draw_sprite_stretched(THEME.node_junction_name_bg, 0, _bgx, _bgy, _sw, _sh); draw_sprite_ext(node_icon, 0, _sx, _sy, 1, 1); node_icon = noone; } diff --git a/scripts/armatureBox/armatureBox.gml b/scripts/armatureBox/armatureBox.gml index c4e89ba34..de219a38d 100644 --- a/scripts/armatureBox/armatureBox.gml +++ b/scripts/armatureBox/armatureBox.gml @@ -30,7 +30,7 @@ function armatureBox(_junction) : widget() constructor { b_newTileset.drawParam(param); } else { - var ic = s_bone; + var ic = THEME.bone; var iw = ui(24); var _s = (iw - ui(8)) / max(sprite_get_width(ic), sprite_get_height(ic)); var bi = 0; diff --git a/scripts/node_armature/node_armature.gml b/scripts/node_armature/node_armature.gml index 0eba5dcea..303ff9e5b 100644 --- a/scripts/node_armature/node_armature.gml +++ b/scripts/node_armature/node_armature.gml @@ -297,7 +297,7 @@ function Node_Armature(_x, _y, _group = noone) : Node(_x, _y, _group) constructo var _rx = _x + _s * builder_sx; var _ry = _y + _s * builder_sy; - draw_sprite_ext(s_bone_rotate, 0, _rx, _ry, 1, 1, builder_bone.angle, COLORS._main_value_positive, 1); + draw_sprite_ext(THEME.bone_rotate, 0, _rx, _ry, 1, 1, builder_bone.angle, COLORS._main_value_positive, 1); } else if(builder_type == 3) { @@ -306,7 +306,7 @@ function Node_Armature(_x, _y, _group = noone) : Node(_x, _y, _group) constructo orig = builder_bone.getPoint(0.8); var _rx = _x + _s * orig.x; var _ry = _y + _s * orig.y; - draw_sprite_ext(s_bone_scale, 0, _rx, _ry, 1, 1, builder_bone.angle, COLORS._main_value_positive, 1); + draw_sprite_ext(THEME.bone_scale, 0, _rx, _ry, 1, 1, builder_bone.angle, COLORS._main_value_positive, 1); } else if(key_mod_press(ALT)) { if(builder_type == 0) { @@ -360,7 +360,7 @@ function Node_Armature(_x, _y, _group = noone) : Node(_x, _y, _group) constructo } } - draw_sprite_ext(s_bone_move, 0, _rx, _ry, 1, 1, 0, cc, 1); + draw_sprite_ext(THEME.bone_move, 0, _rx, _ry, 1, 1, 0, cc, 1); } else if(builder_type == 1) { builder_bone.angle = dir; @@ -369,7 +369,7 @@ function Node_Armature(_x, _y, _group = noone) : Node(_x, _y, _group) constructo orig = builder_bone.getTail(); var _rx = _x + _s * orig.x; var _ry = _y + _s * orig.y; - draw_sprite_ext(s_bone_move, 0, _rx, _ry, 1, 1, 0, COLORS._main_value_positive, 1); + draw_sprite_ext(THEME.bone_move, 0, _rx, _ry, 1, 1, 0, COLORS._main_value_positive, 1); } } @@ -768,11 +768,11 @@ function Node_Armature(_x, _y, _group = noone) : Node(_x, _y, _group) constructo if(_typ == 0) { // free move var orig = _bne.getHead(); - draw_sprite_ext(s_bone_move, 0, _x + _s * orig.x, _y + _s * orig.y, 1, 1, 0, COLORS._main_accent, 1); + draw_sprite_ext(THEME.bone_move, 0, _x + _s * orig.x, _y + _s * orig.y, 1, 1, 0, COLORS._main_accent, 1); } else if(_typ == 1) { // bone move var orig = _bne.getTail(); - draw_sprite_ext(s_bone_move, 0, _x + _s * orig.x, _y + _s * orig.y, 1, 1, 0, COLORS._main_accent, 1); + draw_sprite_ext(THEME.bone_move, 0, _x + _s * orig.x, _y + _s * orig.y, 1, 1, 0, COLORS._main_accent, 1); } else if(_typ == 2) { // bone rotate var orig = _bne.getHead(); @@ -784,13 +784,13 @@ function Node_Armature(_x, _y, _group = noone) : Node(_x, _y, _group) constructo var _sy = _y + _s * orig.y; if(point_in_circle(_mx, _my, _sx, _sy, 12)) { - draw_sprite_ext(s_bone_scale, 0, _sx, _sy, 1, 1, _bne.angle, COLORS._main_accent, 1); - draw_sprite_ext(s_bone_rotate, 0, _rx, _ry, 1, 1, _bne.angle, c_white, 1); + draw_sprite_ext(THEME.bone_scale, 0, _sx, _sy, 1, 1, _bne.angle, COLORS._main_accent, 1); + draw_sprite_ext(THEME.bone_rotate, 0, _rx, _ry, 1, 1, _bne.angle, c_white, 1); _typ = 3; } else { - draw_sprite_ext(s_bone_scale, 0, _sx, _sy, 1, 1, _bne.angle, c_white, 1); - draw_sprite_ext(s_bone_rotate, 0, _rx, _ry, 1, 1, _bne.angle, COLORS._main_accent, 1); + draw_sprite_ext(THEME.bone_scale, 0, _sx, _sy, 1, 1, _bne.angle, c_white, 1); + draw_sprite_ext(THEME.bone_rotate, 0, _rx, _ry, 1, 1, _bne.angle, COLORS._main_accent, 1); _typ = 2; } } diff --git a/scripts/node_armature_pose/node_armature_pose.gml b/scripts/node_armature_pose/node_armature_pose.gml index c2abc022a..a6f03f847 100644 --- a/scripts/node_armature_pose/node_armature_pose.gml +++ b/scripts/node_armature_pose/node_armature_pose.gml @@ -144,7 +144,7 @@ function Node_Armature_Pose(_x, _y, _group = noone) : Node(_x, _y, _group) const orig = posing_bone.getHead(); var _rx = _x + _s * orig.x; var _ry = _y + _s * orig.y; - draw_sprite_ext(s_bone_move, 0, _rx, _ry, 1, 1, 0, COLORS._main_value_positive, 1); + draw_sprite_ext(THEME.bone_move, 0, _rx, _ry, 1, 1, 0, COLORS._main_value_positive, 1); } else if(posing_type == 1) { //free move var _direction = point_direction(posing_sx, posing_sy, smx, smy); @@ -176,7 +176,7 @@ function Node_Armature_Pose(_x, _y, _group = noone) : Node(_x, _y, _group) const orig = posing_bone.getTail(); var _rx = _x + _s * orig.x; var _ry = _y + _s * orig.y; - draw_sprite_ext(s_bone_move, 0, _rx, _ry, 1, 1, 0, COLORS._main_value_positive, 1); + draw_sprite_ext(THEME.bone_move, 0, _rx, _ry, 1, 1, 0, COLORS._main_value_positive, 1); } else if(posing_type == 2) { //rotate var ori = posing_bone.getHead(); @@ -201,7 +201,7 @@ function Node_Armature_Pose(_x, _y, _group = noone) : Node(_x, _y, _group) const orig = posing_bone.getHead(); var _rx = _x + _s * orig.x; var _ry = _y + _s * orig.y; - draw_sprite_ext(s_bone_rotate, 0, _rx, _ry, 1, 1, posing_bone.pose_angle, COLORS._main_value_positive, 1); + draw_sprite_ext(THEME.bone_rotate, 0, _rx, _ry, 1, 1, posing_bone.pose_angle, COLORS._main_value_positive, 1); } else if(posing_type == 3) { //scale var ps = val[TRANSFORM.sca_x]; @@ -223,7 +223,7 @@ function Node_Armature_Pose(_x, _y, _group = noone) : Node(_x, _y, _group) const orig = posing_bone.getPoint(0.8); var _rx = _x + _s * orig.x; var _ry = _y + _s * orig.y; - draw_sprite_ext(s_bone_scale, 0, _rx, _ry, 1, 1, posing_bone.pose_angle, COLORS._main_value_positive, 1); + draw_sprite_ext(THEME.bone_scale, 0, _rx, _ry, 1, 1, posing_bone.pose_angle, COLORS._main_value_positive, 1); } gpu_set_texfilter(false); @@ -255,11 +255,11 @@ function Node_Armature_Pose(_x, _y, _group = noone) : Node(_x, _y, _group) const if(_typ == 0) { // free move var orig = _bne.getHead(); - draw_sprite_ext(s_bone_move, 0, _x + _s * orig.x, _y + _s * orig.y, 1, 1, 0, COLORS._main_accent, 1); + draw_sprite_ext(THEME.bone_move, 0, _x + _s * orig.x, _y + _s * orig.y, 1, 1, 0, COLORS._main_accent, 1); } else if(_typ == 1) { // bone move var orig = _bne.getTail(); - draw_sprite_ext(s_bone_move, 0, _x + _s * orig.x, _y + _s * orig.y, 1, 1, 0, COLORS._main_accent, 1); + draw_sprite_ext(THEME.bone_move, 0, _x + _s * orig.x, _y + _s * orig.y, 1, 1, 0, COLORS._main_accent, 1); } else if(_typ == 2) { // bone rotate var orig = _bne.getHead(); @@ -271,13 +271,13 @@ function Node_Armature_Pose(_x, _y, _group = noone) : Node(_x, _y, _group) const var _sy = _y + _s * orig.y; if(point_in_circle(_mx, _my, _sx, _sy, 12)) { - draw_sprite_ext(s_bone_scale, 0, _sx, _sy, 1, 1, _bne.pose_angle, COLORS._main_accent, 1); - draw_sprite_ext(s_bone_rotate, 0, _rx, _ry, 1, 1, _bne.pose_angle, c_white, 1); + draw_sprite_ext(THEME.bone_scale, 0, _sx, _sy, 1, 1, _bne.pose_angle, COLORS._main_accent, 1); + draw_sprite_ext(THEME.bone_rotate, 0, _rx, _ry, 1, 1, _bne.pose_angle, c_white, 1); _typ = 3; } else { - draw_sprite_ext(s_bone_scale, 0, _sx, _sy, 1, 1, _bne.pose_angle, c_white, 1); - draw_sprite_ext(s_bone_rotate, 0, _rx, _ry, 1, 1, _bne.pose_angle, COLORS._main_accent, 1); + draw_sprite_ext(THEME.bone_scale, 0, _sx, _sy, 1, 1, _bne.pose_angle, c_white, 1); + draw_sprite_ext(THEME.bone_rotate, 0, _rx, _ry, 1, 1, _bne.pose_angle, COLORS._main_accent, 1); _typ = 2; } } diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index 0c0b098bc..800987688 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -2749,9 +2749,10 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { if(!active) return; disable(); + PANEL_GRAPH.draw_refresh = true; array_remove(group == noone? PROJECT.nodes : group.getNodeList(), self); - if(PANEL_GRAPH.node_hover == self) PANEL_GRAPH.node_hover = noone; + if(PANEL_GRAPH.node_hover == self) PANEL_GRAPH.node_hover = noone; array_remove(PANEL_GRAPH.nodes_selecting, self); if(PANEL_INSPECTOR.inspecting == self) PANEL_INSPECTOR.inspecting = noone; @@ -2800,6 +2801,7 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { if(active) return; enable(); + PANEL_GRAPH.draw_refresh = true; array_push(group == noone? PROJECT.nodes : group.getNodeList(), self); onRestore(); diff --git a/scripts/node_feedback_inline/node_feedback_inline.gml b/scripts/node_feedback_inline/node_feedback_inline.gml index 484b7e1ff..bae283467 100644 --- a/scripts/node_feedback_inline/node_feedback_inline.gml +++ b/scripts/node_feedback_inline/node_feedback_inline.gml @@ -66,6 +66,9 @@ function Node_Feedback_Inline(_x, _y, _group = noone) : Node(_x, _y, _group) con } static drawConnections = function(params = {}) { + if( junc_out == noone || junc_in == noone) return noone; + if(!junc_out.node.active || !junc_in.node.active) return noone; + params.dashed = true; params.loop = true; drawJuncConnection(junc_out, junc_in, params); params.dashed = false; params.loop = false; diff --git a/scripts/node_tiler/node_tiler.gml b/scripts/node_tiler/node_tiler.gml index ce770e8e7..ff9ee420a 100644 --- a/scripts/node_tiler/node_tiler.gml +++ b/scripts/node_tiler/node_tiler.gml @@ -81,13 +81,13 @@ function Node_Tile_Drawer(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou .setCollape(false); tool_fil8 = [ "Fill", tool_fil8_edit, "fillType", tool_attribute ]; - tool_varient_rotate = [ "", new buttonGroup( [ s_canvas_rotate, s_canvas_rotate ], function(v) /*=>*/ { if(tileset != noone) tileset.brush_action_rotate(v) } ) + tool_varient_rotate = [ "", new buttonGroup( [ THEME.canvas_rotate, THEME.canvas_rotate ], function(v) /*=>*/ { if(tileset != noone) tileset.brush_action_rotate(v) } ) .setCollape(0) .setBlend(COLORS._main_icon_light) .setTooltips([ new tooltipHotkey("Rotate CW", "Node_Tile_Drawer", "Brush Rotate CW"), new tooltipHotkey("Rotate CCW", "Node_Tile_Drawer", "Brush Rotate CCW")]) ]; - tool_varient_flip = [ "", new buttonGroup( [ s_canvas_flip, s_canvas_flip ], function(v) /*=>*/ { if(tileset != noone) tileset.brush_action_flip(v) } ) + tool_varient_flip = [ "", new buttonGroup( [ THEME.canvas_flip, THEME.canvas_flip ], function(v) /*=>*/ { if(tileset != noone) tileset.brush_action_flip(v) } ) .setCollape(0) .setBlend(COLORS._main_icon_light) .setTooltips([ new tooltipHotkey("Flip H", "Node_Tile_Drawer", "Brush Flip H"), diff --git a/scripts/node_tiler_tileset/node_tiler_tileset.gml b/scripts/node_tiler_tileset/node_tiler_tileset.gml index 1dfb12087..9f515ec8d 100644 --- a/scripts/node_tiler_tileset/node_tiler_tileset.gml +++ b/scripts/node_tiler_tileset/node_tiler_tileset.gml @@ -512,7 +512,7 @@ function Node_Tile_Tileset(_x, _y, _group = noone) : Node(_x, _y, _group) constr var _shov = _hover && point_in_rectangle(_m[0], _m[1], _sx, _sy, _sx + _sw, _sy + _sh); var _aa = .75 + .25 * _shov; draw_sprite_stretched_ext(THEME.ui_panel, 1, _sx, _sy, _sw, _sh, COLORS._main_icon, _aa); - draw_sprite_ext(s_flip_h_24, 0, _sx + _sw / 2, _sy + _sh / 2, _fpx? -1 : 1, 1, 0, _fpx? COLORS._main_accent : COLORS._main_icon, _aa); + draw_sprite_ext(THEME.flip_h, 0, _sx + _sw / 2, _sy + _sh / 2, _fpx? -1 : 1, 1, 0, _fpx? COLORS._main_accent : COLORS._main_icon, _aa); _sx += _sw + ui(8); if(_shov) { diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index 437c9947d..1ba509181 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -3536,7 +3536,7 @@ function load_file_path(path, _x = undefined, _y = undefined) { var is_multi = type == "image" && (array_length(path) > 1 || directory_exists(path[0])); if(is_multi) { - with(dialogCall(o_dialog_add_multiple_images)) setPath(path); + dialogCall(o_dialog_add_multiple_images).setPath(path); } else { if(!IS_CMD) PANEL_GRAPH.onStepBegin(); @@ -3552,12 +3552,12 @@ function load_file_path(path, _x = undefined, _y = undefined) { case "ase" : case "aseprite" : node = Node_create_ASE_File_Read_path(_x, _y, p); break; - + case "png" : case "jpg" : case "jpeg" : - if(keyboard_check_direct(vk_shift)) with(dialogCall(o_dialog_add_image)) setPath(p); - else node = Node_create_Image_path(_x, _y, p); + if(keyboard_check_direct(vk_shift)) dialogCall(o_dialog_add_image).setPath(p); + else node = Node_create_Image_path(_x, _y, p); break; case "gif" : node = Node_create_Image_gif_path(_x, _y, p); break;