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

@ -38,9 +38,9 @@ function Node_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons
attribute_interpolation(); attribute_interpolation();
drag_side = -1; drag_side = -1;
drag_mx = 0; drag_mx = 0;
drag_my = 0; drag_my = 0;
drag_s = [[0, 0], [0, 0]]; drag_s = [[0, 0], [0, 0]];
attributes[? "initalset"] = LOADING || APPENDING; attributes[? "initalset"] = LOADING || APPENDING;

View file

@ -4,14 +4,14 @@ function Node_Mesh_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
attributes.mesh_bound = []; attributes.mesh_bound = [];
points = []; points = [];
data = { data = {
points : [], points : [],
tris : [], tris : [],
links : [] links : []
} }
is_convex = true; is_convex = true;
hover = -1; hover = -1;
anchor_dragging = -1; anchor_dragging = -1;
anchor_drag_sx = -1; anchor_drag_sx = -1;
anchor_drag_sy = -1; anchor_drag_sy = -1;
@ -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;
@ -676,23 +676,25 @@ function Node_Mesh_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
} #endregion } #endregion
static processData = function(_outSurf, _data, _output_index, _array_index) { #region static processData = function(_outSurf, _data, _output_index, _array_index) { #region
var _inSurf = _data[0]; var _inSurf = _data[0];
if(!is_surface(_inSurf)) return _outSurf; if(!is_surface(_inSurf)) return _outSurf;
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);
if(array_length(data.tris) == 0) { if(array_length(data.tris) == 0) {
draw_surface_safe(_inSurf); draw_surface_safe(_inSurf);
} else { } else {
for(var i = 0; i < array_length(data.tris); i++) for(var i = 0; i < array_length(data.tris); i++)
data.tris[i].drawSurface(_inSurf); data.tris[i].drawSurface(_inSurf);
} }
surface_reset_shader(); surface_reset_shader();