From 46e52ed5d42d82e98889f87b337c3f62e194ec42 Mon Sep 17 00:00:00 2001 From: Tanasart Date: Sat, 27 Jan 2024 20:36:36 +0700 Subject: [PATCH] 1.16.4.1 --- fonts/_f_sdf/_f_sdf.old.png | Bin 82361 -> 82361 bytes fonts/_f_sdf/_f_sdf.png | Bin 82361 -> 82361 bytes fonts/_f_sdf_medium/_f_sdf_medium.old.png | Bin 59906 -> 59906 bytes fonts/_f_sdf_medium/_f_sdf_medium.png | Bin 59906 -> 59906 bytes scripts/globals/globals.gml | 8 ++--- scripts/node_wrap/node_wrap.gml | 6 ++-- scripts/node_wrap_mesh/node_wrap_mesh.gml | 40 ++++++++++++---------- 7 files changed, 28 insertions(+), 26 deletions(-) diff --git a/fonts/_f_sdf/_f_sdf.old.png b/fonts/_f_sdf/_f_sdf.old.png index f8099b008f3ca4519fc196ff77eb6bc7ae139486..2655db7ec00ff464fdd953f057b80869496a885b 100644 GIT binary patch delta 96 zcmdnl%(}CgwP6dRiKB>Fh=HM%v4xePk+y+>m4N}zlO(_C9*&H%7&5gxZ+)6x>By*{ WfUZYt&2L=>AnVh=HM%fw7gbp|*j6m4SizW>By*{ WfUZYy_4$(wK;Y@>=d#Wzp$PyJ3mR(x diff --git a/fonts/_f_sdf/_f_sdf.png b/fonts/_f_sdf/_f_sdf.png index 2655db7ec00ff464fdd953f057b80869496a885b..2c3987c0314b939d66c9de009279abe5f75d80a7 100644 GIT binary patch delta 96 zcmdnl%(}CgwP6dRiKB>lh@qjCp@Eg5rM7{Am4QK-{rzmvv4FO#sz77$5)u delta 96 zcmdnl%(}CgwP6dRiKB>Fh=HM%v4xePk+y+>m4N}zlO(_C9*&H%7&5gxZ+)6x>By*{ WfUZYt&2L=>An5wj2jLn~toD?=k~0|P4q1D+>Iev>D@lnp_bsNH$%69WT-Mu}@g vNlIc#s#Qs5ZfbE!Vr~J0k%5tku7RPh5xO3&HNSO%dKf%i{an^LB{Ts5>6#<) delta 119 zcmZp=!rXL)c|+|>5z`O@Ln{MgD`P`#0|P4q1M|mWt0qr;DI0<=;kNIc7y|=?Mu}@g vNlIc#s#Qs5ZfbE!Vr~J0k%5tku7RPh5xO41)#pzF^)Pt4`njxgN@xNA(mx}w diff --git a/fonts/_f_sdf_medium/_f_sdf_medium.png b/fonts/_f_sdf_medium/_f_sdf_medium.png index 51d5e448d074d06b7ec4bada6a5a9e0e5fbb0753..083d42c79e51154bbff549bff37722c1d5c86da4 100644 GIT binary patch delta 119 zcmZp=!rXL)c|+|>5%Um3Ln}iAD?>|d0|P4qgEIU5X_F_ulnp_bU{7Md#lXOzQQ{g= ul9E`GYE_b%n_66wm|MVLWME{XYhb8rgsvx`T#Xf|hr!d;&t;ucLK6UdRUu>m delta 119 zcmZp=!rXL)c|+|>5wj2jLn~toD?=k~0|P4q1D+>Iev>D@lnp_bsNH$%69WT-Mu}@g vNlIc#s#Qs5ZfbE!Vr~J0k%5tku7RPh5xO3&HNSO%dKf%i{an^LB{Ts5>6#<) diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index a5500214b..51d436d21 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -25,10 +25,10 @@ globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER, LATEST_VERSION; LATEST_VERSION = 11600; - VERSION = 11650; - SAVE_VERSION = 11650; - VERSION_STRING = "1.16.5.0"; - BUILD_NUMBER = 11650; + VERSION = 11641; + SAVE_VERSION = 11641; + VERSION_STRING = "1.16.4.1"; + BUILD_NUMBER = 11640; globalvar APPEND_MAP; APPEND_MAP = ds_map_create(); diff --git a/scripts/node_wrap/node_wrap.gml b/scripts/node_wrap/node_wrap.gml index 3eecd4ffc..c7a92a5ab 100644 --- a/scripts/node_wrap/node_wrap.gml +++ b/scripts/node_wrap/node_wrap.gml @@ -38,9 +38,9 @@ function Node_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons attribute_interpolation(); drag_side = -1; - drag_mx = 0; - drag_my = 0; - drag_s = [[0, 0], [0, 0]]; + drag_mx = 0; + drag_my = 0; + drag_s = [[0, 0], [0, 0]]; attributes[? "initalset"] = LOADING || APPENDING; diff --git a/scripts/node_wrap_mesh/node_wrap_mesh.gml b/scripts/node_wrap_mesh/node_wrap_mesh.gml index e178ae736..d64c1a7b6 100644 --- a/scripts/node_wrap_mesh/node_wrap_mesh.gml +++ b/scripts/node_wrap_mesh/node_wrap_mesh.gml @@ -4,14 +4,14 @@ function Node_Mesh_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attributes.mesh_bound = []; points = []; - data = { + data = { points : [], tris : [], links : [] } - is_convex = true; - hover = -1; + is_convex = true; + hover = -1; anchor_dragging = -1; anchor_drag_sx = -1; anchor_drag_sy = -1; @@ -406,18 +406,18 @@ function Node_Mesh_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) } #endregion static regularTri = function(surf) { #region + if(is_array(surf)) surf = array_safe_get(surf, 0); + + if(!is_surface(surf)) return; + if(!inputs[| 0].value_from) return; + var sample = getInputData(1); var spring = getInputData(2); var diagon = getInputData(4); - - if(!inputs[| 0].value_from) return; - var useArray = is_array(surf); - var ww = useArray? surface_get_width_safe(surf[0]) : surface_get_width_safe(surf); - var hh = useArray? surface_get_height_safe(surf[0]) : surface_get_height_safe(surf); - var fullmh = getInputData(7); - if(is_array(fullmh)) fullmh = false; - fullmh |= useArray; + + var ww = surface_get_width_safe(surf); + var hh = surface_get_height_safe(surf); var gw = ww / sample; var gh = hh / sample; @@ -676,23 +676,25 @@ function Node_Mesh_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) } #endregion static processData = function(_outSurf, _data, _output_index, _array_index) { #region - var _inSurf = _data[0]; + var _inSurf = _data[0]; if(!is_surface(_inSurf)) return _outSurf; reset(); control(); - _outSurf = surface_verify(_outSurf, surface_get_width_safe(_inSurf), surface_get_height_safe(_inSurf), attrDepth()); + var _sw = surface_get_width_safe(_inSurf); + var _sh = surface_get_height_safe(_inSurf); + _outSurf = surface_verify(_outSurf, _sw, _sh, attrDepth()); surface_set_shader(_outSurf); shader_set_interpolation(_outSurf); - if(array_length(data.tris) == 0) { - draw_surface_safe(_inSurf); - } else { - for(var i = 0; i < array_length(data.tris); i++) - data.tris[i].drawSurface(_inSurf); - } + if(array_length(data.tris) == 0) { + draw_surface_safe(_inSurf); + } else { + for(var i = 0; i < array_length(data.tris); i++) + data.tris[i].drawSurface(_inSurf); + } surface_reset_shader();