This commit is contained in:
Tanasart 2024-01-27 20:36:36 +07:00
parent d5722deaf2
commit 46e52ed5d4
7 changed files with 28 additions and 26 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

View file

@ -25,10 +25,10 @@
globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER, LATEST_VERSION; globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER, LATEST_VERSION;
LATEST_VERSION = 11600; LATEST_VERSION = 11600;
VERSION = 11650; VERSION = 11641;
SAVE_VERSION = 11650; SAVE_VERSION = 11641;
VERSION_STRING = "1.16.5.0"; VERSION_STRING = "1.16.4.1";
BUILD_NUMBER = 11650; BUILD_NUMBER = 11640;
globalvar APPEND_MAP; globalvar APPEND_MAP;
APPEND_MAP = ds_map_create(); APPEND_MAP = ds_map_create();

View file

@ -406,18 +406,18 @@ function Node_Mesh_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
} #endregion } #endregion
static regularTri = function(surf) { #region 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 sample = getInputData(1);
var spring = getInputData(2); var spring = getInputData(2);
var diagon = getInputData(4); 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); 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 gw = ww / sample;
var gh = hh / sample; var gh = hh / sample;
@ -682,7 +682,9 @@ function Node_Mesh_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
reset(); reset();
control(); 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); surface_set_shader(_outSurf);
shader_set_interpolation(_outSurf); shader_set_interpolation(_outSurf);