mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-11-14 22:43:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Tunnel] Fix creating tunnel out from inspector not inherit the name.

Browse Source
This commit is contained in:
Tanasart 2024-10-01 13:49:03 +07:00
parent 11c2b68def
commit 075a93f4e6
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/node_tunnel_in/node_tunnel_in.gml
View File

@ -13,6 +13,7 @@ function Node_Tunnel_In(_x, _y, _group = noone) : Node(_x, _y, _group) construct
preview_connecting = false; preview_connecting = false;
preview_scale = 1; preview_scale = 1;
junction_hover = false;
var tname = ""; var tname = "";
if(!LOADING && !APPENDING) tname = $"tunnel{ds_map_size(project.tunnels_in_map)}"; if(!LOADING && !APPENDING) tname = $"tunnel{ds_map_size(project.tunnels_in_map)}";
@ -29,8 +30,10 @@ function Node_Tunnel_In(_x, _y, _group = noone) : Node(_x, _y, _group) construct
insp2UpdateIcon = [ THEME.tunnel, 0, c_white ]; insp2UpdateIcon = [ THEME.tunnel, 0, c_white ];
static onInspector2Update = function() { static onInspector2Update = function() {
var _node = nodeBuild("Node_Tunnel_Out", x + 128, y); var _node = nodeBuild("Node_Tunnel_Out", x + 128, y).skipDefault();
_node.inputs[0].setValue(inputs[0].getValue()); var _key = inputs[0].getValue();
_node.inputs[0].setValue(_key);
} }
static update = function(frame = CURRENT_FRAME) { onValueUpdate(); } static update = function(frame = CURRENT_FRAME) { onValueUpdate(); }
@ -197,11 +200,11 @@ function Node_Tunnel_In(_x, _y, _group = noone) : Node(_x, _y, _group) construct
var yy = y * _s + _y; var yy = y * _s + _y;
isHovering = point_in_circle(_mx, _my, xx, yy, _s * 24); isHovering = point_in_circle(_mx, _my, xx, yy, _s * 24);
var jhov = inputs[1].drawJunction(_s, _mx, _my); junction_hover = inputs[1].drawJunction(_s, _mx, _my);
if(!isHovering) return noone; if(!isHovering) return noone;
hover_scale_to = 1; hover_scale_to = 1;
return jhov? inputs[1] : noone; return junction_hover? inputs[1] : noone;
} }
static drawNode = function(_x, _y, _mx, _my, _s) { static drawNode = function(_x, _y, _mx, _my, _s) {
@ -247,7 +250,7 @@ function Node_Tunnel_In(_x, _y, _group = noone) : Node(_x, _y, _group) construct
shader_reset(); shader_reset();
} }
hover_scale = lerp_float(hover_scale, hover_scale_to, 3); hover_scale = lerp_float(hover_scale, hover_scale_to && !junction_hover, 3);
hover_scale_to = 0; hover_scale_to = 0;
draw_set_text(f_sdf, fa_center, fa_bottom, COLORS._main_text); draw_set_text(f_sdf, fa_center, fa_bottom, COLORS._main_text);

7
scripts/node_tunnel_out/node_tunnel_out.gml
View File

@ -13,6 +13,7 @@ function Node_Tunnel_Out(_x, _y, _group = noone) : Node(_x, _y, _group) construc
preview_connecting = false; preview_connecting = false;
preview_scale = 1; preview_scale = 1;
junction_hover = false;
var tname = ""; var tname = "";
if(!LOADING && !APPENDING && !ds_map_empty(project.tunnels_in)) if(!LOADING && !APPENDING && !ds_map_empty(project.tunnels_in))
@ -124,11 +125,11 @@ function Node_Tunnel_Out(_x, _y, _group = noone) : Node(_x, _y, _group) construc
var yy = y * _s + _y; var yy = y * _s + _y;
isHovering = point_in_circle(_mx, _my, xx, yy, _s * 24); isHovering = point_in_circle(_mx, _my, xx, yy, _s * 24);
var jhov = outputs[0].drawJunction(_s, _mx, _my); junction_hover = outputs[0].drawJunction(_s, _mx, _my);
if(!isHovering) return noone; if(!isHovering) return noone;
hover_scale_to = 1; hover_scale_to = 1;
return jhov? outputs[0] : noone; return junction_hover? outputs[0] : noone;
} }
static drawNode = function(_x, _y, _mx, _my, _s) { static drawNode = function(_x, _y, _mx, _my, _s) {
@ -174,7 +175,7 @@ function Node_Tunnel_Out(_x, _y, _group = noone) : Node(_x, _y, _group) construc
shader_reset(); shader_reset();
} }
hover_scale = lerp_float(hover_scale, hover_scale_to, 3); hover_scale = lerp_float(hover_scale, hover_scale_to && !junction_hover, 3);
hover_scale_to = 0; hover_scale_to = 0;
draw_set_text(f_sdf, fa_center, fa_bottom, COLORS._main_text); draw_set_text(f_sdf, fa_center, fa_bottom, COLORS._main_text);