mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2025-03-03 22:24:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix sprite reference errors

Browse source
This commit is contained in:
Tanasart 2025-01-01 08:12:36 +07:00
parent 548e54b6ab
commit 4883228e85
83 changed files with 266 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
objects/o_dialog_add_node/Create_0.gml
View file

@ -716,7 +716,7 @@ event_inherited();
var _hv = _hover && point_in_rectangle(_m[0], _m[1], 0, _yy, ww, _yy + _lbh); var _hv = _hover && point_in_rectangle(_m[0], _m[1], 0, _yy, ww, _yy + _lbh);
var _tc = CDEF.main_ltgrey; var _tc = CDEF.main_ltgrey;
BLEND_OVERRIDE; BLEND_OVERRIDE
if(PREFERENCES.dialog_add_node_grouping == 1) if(PREFERENCES.dialog_add_node_grouping == 1)
draw_sprite_stretched_ext(THEME.s_box_r5_clr, 0, ui(16), _yy, ww - ui(32), _lbh, _hv? COLORS.panel_inspector_group_hover : COLORS.panel_inspector_group_bg, 1); draw_sprite_stretched_ext(THEME.s_box_r5_clr, 0, ui(16), _yy, ww - ui(32), _lbh, _hv? COLORS.panel_inspector_group_hover : COLORS.panel_inspector_group_bg, 1);
else { else {
@ -738,7 +738,7 @@ event_inherited();
} }
} }
BLEND_NORMAL; BLEND_NORMAL
draw_sprite_ui(THEME.arrow, _coll? 0 : 3, ui(16 + 16), _yy + _lbh / 2, 1, 1, 0, _tc, 1); draw_sprite_ui(THEME.arrow, _coll? 0 : 3, ui(16 + 16), _yy + _lbh / 2, 1, 1, 0, _tc, 1);
draw_set_text(f_p2, fa_left, fa_center, _tc); draw_set_text(f_p2, fa_left, fa_center, _tc);
@ -891,7 +891,7 @@ event_inherited();
var _hv = _hover && point_in_rectangle(_m[0], _m[1], 0, _yy, ww, _yy + _lbh); var _hv = _hover && point_in_rectangle(_m[0], _m[1], 0, _yy, ww, _yy + _lbh);
var _tc = CDEF.main_ltgrey; var _tc = CDEF.main_ltgrey;
BLEND_OVERRIDE; BLEND_OVERRIDE
if(PREFERENCES.dialog_add_node_grouping == 1) if(PREFERENCES.dialog_add_node_grouping == 1)
draw_sprite_stretched_ext(THEME.s_box_r5_clr, 0, ui(16), _yy, ww - ui(32), _lbh, _hv? COLORS.panel_inspector_group_hover : COLORS.panel_inspector_group_bg, 1); draw_sprite_stretched_ext(THEME.s_box_r5_clr, 0, ui(16), _yy, ww - ui(32), _lbh, _hv? COLORS.panel_inspector_group_hover : COLORS.panel_inspector_group_bg, 1);
else { else {
@ -914,7 +914,7 @@ event_inherited();
} }
} }
BLEND_NORMAL; BLEND_NORMAL
draw_sprite_ui(THEME.arrow, _coll? 0 : 3, ui(16 + 16), _yy + _lbh / 2, 1, 1, 0, _tc, 1); draw_sprite_ui(THEME.arrow, _coll? 0 : 3, ui(16 + 16), _yy + _lbh / 2, 1, 1, 0, _tc, 1);

4
objects/o_dialog_assetbox/Create_0.gml
View file

@ -110,9 +110,9 @@ event_inherited();
var content = contents[| index]; var content = contents[| index];
var xx = grid_space + (grid_size + grid_space) * j; var xx = grid_space + (grid_size + grid_space) * j;
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_sprite_stretched(THEME.node_bg, 0, xx, yy, grid_size, grid_size); draw_sprite_stretched(THEME.node_bg, 0, xx, yy, grid_size, grid_size);
BLEND_NORMAL; BLEND_NORMAL
var spr = content.getSpr(); var spr = content.getSpr();
if(sprite_exists(spr)) { if(sprite_exists(spr)) {

4
objects/o_dialog_lua_reference/Create_0.gml
View file

@ -51,7 +51,7 @@ event_inherited();
} }
hh += pad * 2; hh += pad * 2;
BLEND_OVERRIDE; BLEND_OVERRIDE
if(sp_note.hover && point_in_rectangle(_m[0], _m[1], 0, yy, sp_note.surface_w, yy + hh)) { if(sp_note.hover && point_in_rectangle(_m[0], _m[1], 0, yy, sp_note.surface_w, yy + hh)) {
sp_note.hover_content = true; sp_note.hover_content = true;
@ -61,7 +61,7 @@ event_inherited();
is_open[i] = !array_get(is_open, i); is_open[i] = !array_get(is_open, i);
} else } else
draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, yy, sp_note.surface_w, hh, COLORS.dialog_lua_ref_bg, 1); draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, yy, sp_note.surface_w, hh, COLORS.dialog_lua_ref_bg, 1);
BLEND_NORMAL; BLEND_NORMAL
draw_sprite_ui(THEME.arrow, is_open[i]? 3 : 0, ui(16), yy + pad + line_get_height() / 2,,,, COLORS._main_icon); draw_sprite_ui(THEME.arrow, is_open[i]? 3 : 0, ui(16), yy + pad + line_get_height() / 2,,,, COLORS._main_icon);
draw_set_text(f_code, fa_left, fa_top, COLORS._main_text); draw_set_text(f_code, fa_left, fa_top, COLORS._main_text);

2
objects/o_dialog_lua_reference/o_dialog_lua_reference.yy
View file

@ -2,8 +2,8 @@
"$GMObject":"", "$GMObject":"",
"%Name":"o_dialog_lua_reference", "%Name":"o_dialog_lua_reference",
"eventList":[ "eventList":[
{"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
{"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
], ],
"managed":true, "managed":true,
"name":"o_dialog_lua_reference", "name":"o_dialog_lua_reference",

4
objects/o_dialog_output_visibility/Create_0.gml
View file

@ -26,9 +26,9 @@ event_inherited();
if(sHOVER && sc_outputs.hover && point_in_rectangle(_m[0], _m[1], 0, _yy, sc_outputs.w, _yy + hh - 1)) { if(sHOVER && sc_outputs.hover && point_in_rectangle(_m[0], _m[1], 0, _yy, sc_outputs.w, _yy + hh - 1)) {
sc_outputs.hover_content = true; sc_outputs.hover_content = true;
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_sprite_stretched(THEME.node_bg, 0, ui(2), _yy + ui(2), ui(32 - 4), hh - ui(4)); draw_sprite_stretched(THEME.node_bg, 0, ui(2), _yy + ui(2), ui(32 - 4), hh - ui(4));
BLEND_NORMAL; BLEND_NORMAL
if(mouse_press(mb_left, sFOCUS)) { if(mouse_press(mb_left, sFOCUS)) {
hold = !output.visible hold = !output.visible

3
objects/slider_Slider/Create_0.gml
View file

@ -1,4 +1,7 @@
/// @description slider /// @description slider
w = 1;
h = 1;
anim = 0; anim = 0;
anim_prog = 0; anim_prog = 0;

3
objects/slider_Slider/Draw_64.gml
View file

@ -13,8 +13,7 @@ var _h = h + _h_top + _h_bot;
draw_sprite_stretched_ext(THEME.textbox, 3, x, _y, w, _h_top, COLORS._main_icon, 0.9); draw_sprite_stretched_ext(THEME.textbox, 3, x, _y, w, _h_top, COLORS._main_icon, 0.9);
draw_sprite_stretched_ext(THEME.textbox, 3, x, y + h, w, _h_bot, COLORS._main_icon, 0.9); draw_sprite_stretched_ext(THEME.textbox, 3, x, y + h, w, _h_bot, COLORS._main_icon, 0.9);
//draw_sprite_stretched_ext(THEME.textbox, 3, x, y, w, h, c_white, 0.9); draw_sprite_stretched_ext(THEME.textbox, 1, x, _y, w, _h, c_white, 1.0);
draw_sprite_stretched_ext(THEME.textbox, 1, x, _y, w, _h, c_white, 1.0);
var _mulp = text.slide_int? 10 : 1; var _mulp = text.slide_int? 10 : 1;
if(key_mod_press(CTRL) && !text.slide_snap) _mulp *= 10; if(key_mod_press(CTRL) && !text.slide_snap) _mulp *= 10;

4
scripts/__node_3d_plane/__node_3d_plane.gml
View file

@ -189,7 +189,7 @@ function __Node_3D_Plane(_x, _y, _group = noone) : Node_Processor(_x, _y, _group
surface_set_target(_outSurf); surface_set_target(_outSurf);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
shader = sh_vertex_pt; shader = sh_vertex_pt;
shader_set(shader); shader_set(shader);
@ -232,7 +232,7 @@ function __Node_3D_Plane(_x, _y, _group = noone) : Node_Processor(_x, _y, _group
matrix_stack_clear(); matrix_stack_clear();
matrix_set(matrix_world, MATRIX_IDENTITY); matrix_set(matrix_world, MATRIX_IDENTITY);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
return _outSurf; return _outSurf;

2
scripts/__node_PCX/__node_PCX.gml
View file

@ -1,6 +1,6 @@
function Node_PCX(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_PCX(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Compute Node"; name = "Compute Node";
setDimension(96, 48);; setDimension(96, 48);
destroy_when_upgroup = true; destroy_when_upgroup = true;
} }

2
scripts/_node_strand_affector/_node_strand_affector.gml
View file

@ -147,6 +147,6 @@ function _Node_Strand_Affector(_x, _y, _group = noone) : Node(_x, _y, _group) co
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_strand_force, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_strand_force_apply, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

2
scripts/blurSurface/blurSurface.gml
View file

@ -74,7 +74,7 @@ function surface_apply_gaussian(surface, size, bg = false, bg_c = c_white, sampl
shader_reset(); shader_reset();
surface_reset_target(); surface_reset_target();
gpu_set_tex_filter(false); gpu_set_tex_filter(false);
BLEND_NORMAL; BLEND_NORMAL
return __blur_vert; return __blur_vert;
} }

2
scripts/canvas_tool_brush/canvas_tool_brush.gml
View file

@ -174,7 +174,7 @@ function canvas_tool_brush(brush, eraser = false) : canvas_tool() constructor {
} }
BLEND_NORMAL; BLEND_NORMAL
mouse_pre_x = mouse_cur_x; mouse_pre_x = mouse_cur_x;
mouse_pre_y = mouse_cur_y; mouse_pre_y = mouse_cur_y;

5
scripts/canvas_tool_selection/canvas_tool_selection.gml
View file

@ -1,6 +1,5 @@
function canvas_tool_selection(selector = noone) : canvas_tool() constructor { function canvas_tool_selection(_selector) : canvas_tool() constructor {
selector = _selector ?? noone;
self.selector = selector;
selection_surface = surface_create_empty(1, 1); selection_surface = surface_create_empty(1, 1);
selection_mask = surface_create_empty(1, 1); selection_mask = surface_create_empty(1, 1);

3
scripts/canvas_tool_selection_brush/canvas_tool_selection_brush.gml
View file

@ -1,5 +1,4 @@
function canvas_tool_selection_brush(selector, brush) : canvas_tool_selection(selector) constructor { function canvas_tool_selection_brush(selector, brush) : canvas_tool_selection(selector) constructor {
self.brush = brush; self.brush = brush;
brush_resizable = true; brush_resizable = true;
@ -78,7 +77,7 @@ function canvas_tool_selection_brush(selector, brush) : canvas_tool_selection(se
} }
} }
BLEND_NORMAL; BLEND_NORMAL
mouse_pre_x = mouse_cur_x; mouse_pre_x = mouse_cur_x;
mouse_pre_y = mouse_cur_y; mouse_pre_y = mouse_cur_y;

1
scripts/canvas_tool_selection_freeform/canvas_tool_selection_freeform.gml
View file

@ -1,5 +1,4 @@
function canvas_tool_selection_freeform(selector, brush) : canvas_tool_selection(selector) constructor { function canvas_tool_selection_freeform(selector, brush) : canvas_tool_selection(selector) constructor {
self.brush = brush; self.brush = brush;
mouse_pre_x = 0; mouse_pre_x = 0;

42
scripts/draw_text_function/draw_text_function.gml
View file

@ -5,33 +5,33 @@ function draw_text_line(_x, _y, _text, _sep, _w, forceCut = false) {
function draw_text_add(_x, _y, _text, scale = 1) { function draw_text_add(_x, _y, _text, scale = 1) {
INLINE INLINE
BLEND_ALPHA_MULP; BLEND_ALPHA_MULP
if(scale == 1) draw_text(round(_x), round(_y), _text); if(scale == 1) draw_text(round(_x), round(_y), _text);
else draw_text_transformed(round(_x), round(_y), _text, scale, scale, 0); else draw_text_transformed(round(_x), round(_y), _text, scale, scale, 0);
BLEND_NORMAL; BLEND_NORMAL
} }
function draw_text_alpha(_x, _y, _text, scale = 1) { function draw_text_alpha(_x, _y, _text, scale = 1) {
INLINE INLINE
BLEND_ALPHA; BLEND_ALPHA
if(scale == 1) draw_text(round(_x), round(_y), _text); if(scale == 1) draw_text(round(_x), round(_y), _text);
else draw_text_transformed(round(_x), round(_y), _text, scale, scale, 0); else draw_text_transformed(round(_x), round(_y), _text, scale, scale, 0);
BLEND_NORMAL; BLEND_NORMAL
} }
function draw_text_over(_x, _y, _text, scale = 1) { function draw_text_over(_x, _y, _text, scale = 1) {
INLINE INLINE
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_text_transformed(round(_x), round(_y), _text, scale, scale, 0); draw_text_transformed(round(_x), round(_y), _text, scale, scale, 0);
BLEND_NORMAL; BLEND_NORMAL
} }
function draw_text_add_float(_x, _y, _text, scale = 1) { function draw_text_add_float(_x, _y, _text, scale = 1) {
INLINE INLINE
BLEND_ADD; BLEND_ADD
if(scale == 1) draw_text(_x, _y, _text); else draw_text_transformed(_x, _y, _text, scale, scale, 0); if(scale == 1) draw_text(_x, _y, _text); else draw_text_transformed(_x, _y, _text, scale, scale, 0);
BLEND_NORMAL; BLEND_NORMAL
if(scale == 1) draw_text(_x, _y, _text); else draw_text_transformed(_x, _y, _text, scale, scale, 0); if(scale == 1) draw_text(_x, _y, _text); else draw_text_transformed(_x, _y, _text, scale, scale, 0);
} }
@ -61,16 +61,16 @@ function draw_text_bm_add(_x, _y, _text, scale = 1) {
function draw_text_lang_add(_x, _y, _text, scale = 1) { function draw_text_lang_add(_x, _y, _text, scale = 1) {
INLINE INLINE
BLEND_ALPHA_MULP; BLEND_ALPHA_MULP
draw_text_lang(_x, _y, _text, scale); draw_text_lang(_x, _y, _text, scale);
BLEND_NORMAL; BLEND_NORMAL
} }
function draw_text_lang_over(_x, _y, _text, scale = 1) { function draw_text_lang_over(_x, _y, _text, scale = 1) {
INLINE INLINE
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_text_lang(_x, _y, _text, scale); draw_text_lang(_x, _y, _text, scale);
BLEND_NORMAL; BLEND_NORMAL
} }
function draw_text_lang(_x, _y, _text, scale = 1) { function draw_text_lang(_x, _y, _text, scale = 1) {
@ -114,17 +114,17 @@ function draw_text_lang(_x, _y, _text, scale = 1) {
function draw_text_ext_add(_x, _y, _text, _sep, _w, scale = 1, forceCut = false) { function draw_text_ext_add(_x, _y, _text, _sep, _w, scale = 1, forceCut = false) {
INLINE INLINE
BLEND_ALPHA_MULP; BLEND_ALPHA_MULP
var h = __draw_text_ext_transformed(_x, _y, _text, _sep, _w, scale, scale, 0, forceCut); var h = __draw_text_ext_transformed(_x, _y, _text, _sep, _w, scale, scale, 0, forceCut);
BLEND_NORMAL; BLEND_NORMAL
return h; return h;
} }
function draw_text_ext_alpha(_x, _y, _text, _sep, _w, scale = 1, forceCut = false) { function draw_text_ext_alpha(_x, _y, _text, _sep, _w, scale = 1, forceCut = false) {
INLINE INLINE
BLEND_ALPHA; BLEND_ALPHA
var h = __draw_text_ext_transformed(_x, _y, _text, _sep, _w, scale, scale, 0, forceCut); var h = __draw_text_ext_transformed(_x, _y, _text, _sep, _w, scale, scale, 0, forceCut);
BLEND_NORMAL; BLEND_NORMAL
return h; return h;
} }
@ -157,7 +157,7 @@ function draw_text_cut(x, y, str, w, scale = 1, _add = false) {
if(_add) { BLEND_ADD } if(_add) { BLEND_ADD }
else { BLEND_ALPHA_MULP } else { BLEND_ALPHA_MULP }
draw_text_transformed(round(x), round(y), string_cut(str, w,, scale), scale, scale, 0); draw_text_transformed(round(x), round(y), string_cut(str, w,, scale), scale, scale, 0);
BLEND_NORMAL; BLEND_NORMAL
} }
function draw_text_int(x, y, str) { function draw_text_int(x, y, str) {
@ -171,9 +171,9 @@ function __draw_text_ext_transformed(_x, _y, _text, _sep, _w, sx = 1, sy = 1, ro
_y = round(_y); _y = round(_y);
if(!_break) { if(!_break) {
BLEND_ALPHA_MULP; BLEND_ALPHA_MULP
draw_text_ext_transformed(_x, _y, _text, _sep, _w, sx, sy, rotation); draw_text_ext_transformed(_x, _y, _text, _sep, _w, sx, sy, rotation);
BLEND_NORMAL; BLEND_NORMAL
return string_height_ext(_text, _sep, _w) * sy; return string_height_ext(_text, _sep, _w) * sy;
} }
@ -219,7 +219,7 @@ function __draw_text_ext_transformed(_x, _y, _text, _sep, _w, sx = 1, sy = 1, ro
case fa_bottom : yy = _y - hh; break; case fa_bottom : yy = _y - hh; break;
} }
BLEND_ALPHA_MULP; BLEND_ALPHA_MULP
for( var i = 0, n = array_length(lines); i < n; i++ ) { for( var i = 0, n = array_length(lines); i < n; i++ ) {
var lw = string_width(lines[i]) * sx; var lw = string_width(lines[i]) * sx;
@ -232,7 +232,7 @@ function __draw_text_ext_transformed(_x, _y, _text, _sep, _w, sx = 1, sy = 1, ro
draw_text_transformed(xx, yy, lines[i], sx, sy, rotation); draw_text_transformed(xx, yy, lines[i], sx, sy, rotation);
yy += lh * sy; yy += lh * sy;
} }
BLEND_NORMAL; BLEND_NORMAL
draw_set_halign(ha); draw_set_halign(ha);
draw_set_valign(va); draw_set_valign(va);

7
scripts/globals/globals.gml
View file

@ -44,7 +44,7 @@
LATEST_VERSION = 1_18_00_0; LATEST_VERSION = 1_18_00_0;
VERSION = 1_18_06_2; VERSION = 1_18_06_2;
SAVE_VERSION = 1_18_05_0; SAVE_VERSION = 1_18_05_0;
VERSION_STRING = MAC? "1.18.003m" : "1.18.6.2.003"; VERSION_STRING = MAC? "1.18.003m" : "1.18.6.2";
BUILD_NUMBER = 1_18_06_2; BUILD_NUMBER = 1_18_06_2;
PREF_VERSION = 1_17_1; PREF_VERSION = 1_17_1;
@ -169,11 +169,6 @@
#macro returnNull_mf2 ; if(is_undefined( #macro returnNull_mf2 ; if(is_undefined(
#macro returnNull_mf3 ) || #macro returnNull_mf3 ) ||
#macro returnNull_mf4 == noone) return; #macro returnNull_mf4 == noone) return;
//!#mfunc case2 {"args":["a"," b"],"order":[0,1],"token":"keyword"}
#macro case2_mf0 case
#macro case2_mf1 : case
#macro case2_mf2 //
#endregion #endregion
#region presets #region presets

10
scripts/logger/logger.gml
View file

@ -1,7 +1,7 @@
#region globals #region globals
global.LOG_LEVEL = 0; global.LOG_LEVEL = 0;
function LOG_BLOCK_START() { INLINE; global.LOG_LEVEL++; } function LOG_BLOCK_START() { INLINE global.LOG_LEVEL++; }
function LOG(text) { function LOG(text) {
INLINE INLINE
@ -20,9 +20,9 @@
LOG_BLOCK_END(); LOG_BLOCK_END();
} }
function LOG_IF(cond, text) { INLINE; if(cond) LOG(text); } function LOG_IF(cond, text) { INLINE if(cond) LOG(text); }
function LOG_LINE_IF(cond, text) { INLINE; if(cond) LOG_LINE(text); } function LOG_LINE_IF(cond, text) { INLINE if(cond) LOG_LINE(text); }
function LOG_BLOCK_END() { INLINE; global.LOG_LEVEL--; } function LOG_BLOCK_END() { INLINE global.LOG_LEVEL--; }
function LOG_END() { INLINE; global.LOG_LEVEL = 0; } function LOG_END() { INLINE global.LOG_LEVEL = 0; }
#endregion #endregion

2
scripts/node_FFT/node_FFT.gml
View file

@ -37,6 +37,6 @@ function Node_FFT(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) const
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_FFT, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_fft, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

8
scripts/node_VFX_renderer/node_VFX_renderer.gml
View file

@ -88,9 +88,9 @@ function Node_VFX_Renderer(_x, _y, _group = noone) : Node(_x, _y, _group) constr
var parts = inputs[i + 1].getValue(_time); var parts = inputs[i + 1].getValue(_time);
switch(blend) { switch(blend) {
case PARTICLE_BLEND_MODE.normal: BLEND_NORMAL; break; case PARTICLE_BLEND_MODE.normal: BLEND_NORMAL break;
case PARTICLE_BLEND_MODE.alpha: BLEND_ALPHA; break; case PARTICLE_BLEND_MODE.alpha: BLEND_ALPHA break;
case PARTICLE_BLEND_MODE.additive: BLEND_ADD; break; case PARTICLE_BLEND_MODE.additive: BLEND_ADD break;
} }
if(!is_array(parts) || array_length(parts) == 0) continue; if(!is_array(parts) || array_length(parts) == 0) continue;
@ -110,7 +110,7 @@ function Node_VFX_Renderer(_x, _y, _group = noone) : Node(_x, _y, _group) constr
} }
} }
BLEND_NORMAL; BLEND_NORMAL
surface_reset_shader(); surface_reset_shader();
cacheCurrentFrame(_outSurf); cacheCurrentFrame(_outSurf);

8
scripts/node_VFX_renderer_output/node_VFX_renderer_output.gml
View file

@ -109,9 +109,9 @@ function Node_VFX_Renderer_Output(_x, _y, _group = noone) : Node_Group_Output(_x
var parts = inputs[i + 1].getValue(_time); var parts = inputs[i + 1].getValue(_time);
switch(blend) { switch(blend) {
case PARTICLE_BLEND_MODE.normal: BLEND_NORMAL; break; case PARTICLE_BLEND_MODE.normal: BLEND_NORMAL break;
case PARTICLE_BLEND_MODE.alpha: BLEND_ALPHA; break; case PARTICLE_BLEND_MODE.alpha: BLEND_ALPHA break;
case PARTICLE_BLEND_MODE.additive: BLEND_ADD; break; case PARTICLE_BLEND_MODE.additive: BLEND_ADD break;
} }
if(!is_array(parts) || array_length(parts) == 0) continue; if(!is_array(parts) || array_length(parts) == 0) continue;
@ -127,7 +127,7 @@ function Node_VFX_Renderer_Output(_x, _y, _group = noone) : Node_Group_Output(_x
} }
} }
BLEND_NORMAL; BLEND_NORMAL
surface_reset_shader(); surface_reset_shader();
cacheCurrentFrame(_outSurf); cacheCurrentFrame(_outSurf);

4
scripts/node_alpha_cutoff/node_alpha_cutoff.gml
View file

@ -32,14 +32,14 @@ function Node_Alpha_Cutoff(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro
static processData = function(_outSurf, _data, _output_index, _array_index) { #region static processData = function(_outSurf, _data, _output_index, _array_index) { #region
surface_set_target(_outSurf); surface_set_target(_outSurf);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
shader_set(sh_alpha_cutoff); shader_set(sh_alpha_cutoff);
shader_set_uniform_f(shader_get_uniform(sh_alpha_cutoff, "cutoff"), _data[1]); shader_set_uniform_f(shader_get_uniform(sh_alpha_cutoff, "cutoff"), _data[1]);
draw_surface_safe(_data[0]); draw_surface_safe(_data[0]);
shader_reset(); shader_reset();
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
__process_mask_modifier(_data); __process_mask_modifier(_data);

4
scripts/node_alpha_hash/node_alpha_hash.gml
View file

@ -23,7 +23,7 @@ function Node_Alpha_Hash(_x, _y, _group = noone) : Node_Processor(_x, _y, _group
static processData = function(_outSurf, _data, _output_index, _array_index) { #region static processData = function(_outSurf, _data, _output_index, _array_index) { #region
surface_set_target(_outSurf); surface_set_target(_outSurf);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
shader_set(shader); shader_set(shader);
shader_set_uniform_f(uniform_dim, surface_get_width_safe(_data[0]), surface_get_height_safe(_data[0])); shader_set_uniform_f(uniform_dim, surface_get_width_safe(_data[0]), surface_get_height_safe(_data[0]));
@ -31,7 +31,7 @@ function Node_Alpha_Hash(_x, _y, _group = noone) : Node_Processor(_x, _y, _group
draw_surface_safe(_data[0]); draw_surface_safe(_data[0]);
shader_reset(); shader_reset();
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
return _outSurf; return _outSurf;

2
scripts/node_anim_curve/node_anim_curve.gml
View file

@ -37,6 +37,6 @@ function Node_Anim_Curve(_x, _y, _group = noone) : Node_Processor(_x, _y, _group
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_curve_eval, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_anim_curve, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

2
scripts/node_armature/node_armature.gml
View file

@ -890,7 +890,7 @@ function Node_Armature(_x, _y, _group = noone) : Node(_x, _y, _group) constructo
var _ss = _s * .5; var _ss = _s * .5;
gpu_set_tex_filter(1); gpu_set_tex_filter(1);
draw_sprite_ext(s_node_armature_create, 0, bbox.x0 + 24 * _ss, bbox.y1 - 24 * _ss, _ss, _ss, 0, c_white, 0.5); draw_sprite_ext(s_node_armature, 0, bbox.x0 + 24 * _ss, bbox.y1 - 24 * _ss, _ss, _ss, 0, c_white, 0.5);
gpu_set_tex_filter(0); gpu_set_tex_filter(0);
bones.drawThumbnail(_s, bbox, bone_bbox); bones.drawThumbnail(_s, bbox, bone_bbox);

2
scripts/node_audio_loudness/node_audio_loudness.gml
View file

@ -25,6 +25,6 @@ function Node_Audio_Loudness(_x, _y, _group = noone) : Node_Processor(_x, _y, _g
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_audio_volume, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_audio_loudness, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

2
scripts/node_blur/node_blur.gml
View file

@ -116,7 +116,7 @@ function Node_Blur(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons
draw_clear_alpha(_isovr? _overc : 0, 0); draw_clear_alpha(_isovr? _overc : 0, 0);
draw_surface_safe(temp_surface[1]); draw_surface_safe(temp_surface[1]);
surface_reset_target(); surface_reset_target();
BLEND_NORMAL; BLEND_NORMAL
__process_mask_modifier(_data); __process_mask_modifier(_data);
_outSurf = mask_apply(_data[0], _outSurf, _mask, _mix); _outSurf = mask_apply(_data[0], _outSurf, _mask, _mix);

2
scripts/node_color_mix/node_color_mix.gml
View file

@ -1,6 +1,6 @@
function Node_Color_Mix(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { function Node_Color_Mix(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor {
name = "Mix Color"; name = "Mix Color";
setDimension(96, 48);; setDimension(96, 48);
newInput(0, nodeValue_Color("Color from", self, cola(c_white))); newInput(0, nodeValue_Color("Color from", self, cola(c_white)));

92
scripts/node_dither_diffuse/node_dither_diffuse.gml
View file

@ -135,12 +135,12 @@ function Node_Dither_Diffuse(_x, _y, _group = noone) : Node_Processor(_x, _y, _g
repeat(_a) { repeat(_a) {
__err_diffuse_write_grey __err_diffuse_write_grey
if(_x < _sw - 1) { _pl = _p + 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1; } if(_x < _sw - 1) { _pl = _p + 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1 }
if(_y < _sh - 1) { if(_y < _sh - 1) {
if(_x > 0) { _pl = _p + _s - 2; __error_diffuse_grey_mf0 _k2 __error_diffuse_grey_mf1; } if(_x > 0) { _pl = _p + _s - 2; __error_diffuse_grey_mf0 _k2 __error_diffuse_grey_mf1 }
_pl = _p + _s; __error_diffuse_grey_mf0 _k3 __error_diffuse_grey_mf1; _pl = _p + _s; __error_diffuse_grey_mf0 _k3 __error_diffuse_grey_mf1
if(_x < _sw - 1) { _pl = _p + _s + 2; __error_diffuse_grey_mf0 _k4 __error_diffuse_grey_mf1; } if(_x < _sw - 1) { _pl = _p + _s + 2; __error_diffuse_grey_mf0 _k4 __error_diffuse_grey_mf1 }
} }
_p += 2; _x++; if(_x >= _sw) { _x = 0; _y++; } _p += 2; _x++; if(_x >= _sw) { _x = 0; _y++; }
@ -156,24 +156,24 @@ function Node_Dither_Diffuse(_x, _y, _group = noone) : Node_Processor(_x, _y, _g
__err_diffuse_write_grey __err_diffuse_write_grey
if(_x < _sw - 1) { if(_x < _sw - 1) {
_pl = _p + 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1; _pl = _p + 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1
if(_x < _sw - 2) { _pl = _p + 4; __error_diffuse_grey_mf0 _k2 __error_diffuse_grey_mf1; } if(_x < _sw - 2) { _pl = _p + 4; __error_diffuse_grey_mf0 _k2 __error_diffuse_grey_mf1 }
} }
if(_y < _sh - 1) { if(_y < _sh - 1) {
if(_x > 1) { _pl = _p + _s - 4; __error_diffuse_grey_mf0 _k3 __error_diffuse_grey_mf1; } if(_x > 1) { _pl = _p + _s - 4; __error_diffuse_grey_mf0 _k3 __error_diffuse_grey_mf1 }
if(_x > 0) { _pl = _p + _s - 2; __error_diffuse_grey_mf0 _k4 __error_diffuse_grey_mf1; } if(_x > 0) { _pl = _p + _s - 2; __error_diffuse_grey_mf0 _k4 __error_diffuse_grey_mf1 }
_pl = _p + _s; __error_diffuse_grey_mf0 _k5 __error_diffuse_grey_mf1; _pl = _p + _s; __error_diffuse_grey_mf0 _k5 __error_diffuse_grey_mf1
if(_x < _sw - 1) { _pl = _p + _s + 2; __error_diffuse_grey_mf0 _k6 __error_diffuse_grey_mf1; } if(_x < _sw - 1) { _pl = _p + _s + 2; __error_diffuse_grey_mf0 _k6 __error_diffuse_grey_mf1 }
if(_x < _sw - 2) { _pl = _p + _s + 4; __error_diffuse_grey_mf0 _k7 __error_diffuse_grey_mf1; } if(_x < _sw - 2) { _pl = _p + _s + 4; __error_diffuse_grey_mf0 _k7 __error_diffuse_grey_mf1 }
} }
if(_y < _sh - 2) { if(_y < _sh - 2) {
if(_x > 1) { _pl = _p + _s * 2 - 4; __error_diffuse_grey_mf0 _k8 __error_diffuse_grey_mf1; } if(_x > 1) { _pl = _p + _s * 2 - 4; __error_diffuse_grey_mf0 _k8 __error_diffuse_grey_mf1 }
if(_x > 0) { _pl = _p + _s * 2 - 2; __error_diffuse_grey_mf0 _k9 __error_diffuse_grey_mf1; } if(_x > 0) { _pl = _p + _s * 2 - 2; __error_diffuse_grey_mf0 _k9 __error_diffuse_grey_mf1 }
_pl = _p + _s * 2; __error_diffuse_grey_mf0 _k10 __error_diffuse_grey_mf1; _pl = _p + _s * 2; __error_diffuse_grey_mf0 _k10 __error_diffuse_grey_mf1
if(_x < _sw - 1) { _pl = _p + _s * 2 + 2; __error_diffuse_grey_mf0 _k11 __error_diffuse_grey_mf1; } if(_x < _sw - 1) { _pl = _p + _s * 2 + 2; __error_diffuse_grey_mf0 _k11 __error_diffuse_grey_mf1 }
if(_x < _sw - 2) { _pl = _p + _s * 2 + 4; __error_diffuse_grey_mf0 _k12 __error_diffuse_grey_mf1; } if(_x < _sw - 2) { _pl = _p + _s * 2 + 4; __error_diffuse_grey_mf0 _k12 __error_diffuse_grey_mf1 }
} }
_p += 2; _x++; if(_x >= _sw) { _x = 0; _y++; } _p += 2; _x++; if(_x >= _sw) { _x = 0; _y++; }
@ -187,17 +187,17 @@ function Node_Dither_Diffuse(_x, _y, _group = noone) : Node_Processor(_x, _y, _g
__err_diffuse_write_grey __err_diffuse_write_grey
if(_x < _sw - 1) { if(_x < _sw - 1) {
_pl = _p + 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1; _pl = _p + 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1
if(_x < _sw - 2) { _pl = _p + 4; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1; } if(_x < _sw - 2) { _pl = _p + 4; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1 }
} }
if(_y < _sh - 1) { if(_y < _sh - 1) {
if(_x > 0) { _pl = _p + _s - 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1; } if(_x > 0) { _pl = _p + _s - 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1 }
_pl = _p + _s; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1; _pl = _p + _s; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1
if(_x < _sw - 1) { _pl = _p + _s + 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1; } if(_x < _sw - 1) { _pl = _p + _s + 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1 }
} }
if(_y < _sh - 2) { _pl = _p + _s * 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1; } if(_y < _sh - 2) { _pl = _p + _s * 2; __error_diffuse_grey_mf0 _k1 __error_diffuse_grey_mf1 }
_p += 2; _x++; if(_x >= _sw) { _x = 0; _y++; } _p += 2; _x++; if(_x >= _sw) { _x = 0; _y++; }
} }
@ -207,7 +207,7 @@ function Node_Dither_Diffuse(_x, _y, _group = noone) : Node_Processor(_x, _y, _g
repeat(_a) { repeat(_a) {
__err_diffuse_write_grey __err_diffuse_write_grey
if(_x < _sw - 1) { _pl = _p + 2; __error_diffuse_grey_mf0 1 __error_diffuse_grey_mf1; } if(_x < _sw - 1) { _pl = _p + 2; __error_diffuse_grey_mf0 1 __error_diffuse_grey_mf1 }
_p += 2; _x++; if(_x >= _sw) { _x = 0; _y++; } _p += 2; _x++; if(_x >= _sw) { _x = 0; _y++; }
} }
@ -224,12 +224,12 @@ function Node_Dither_Diffuse(_x, _y, _group = noone) : Node_Processor(_x, _y, _g
repeat(_a) { repeat(_a) {
__err_diffuse_write __err_diffuse_write
if(_x < _sw - 1) { _pl = _p + 8; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4; } if(_x < _sw - 1) { _pl = _p + 8; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4 }
if(_y < _sh - 1) { if(_y < _sh - 1) {
if(_x > 0) { _pl = _p + _s - 8; __error_diffuse_mf0 _k2 __error_diffuse_mf1 _k2 __error_diffuse_mf2 _k2 __error_diffuse_mf3 _k2 __error_diffuse_mf4; } if(_x > 0) { _pl = _p + _s - 8; __error_diffuse_mf0 _k2 __error_diffuse_mf1 _k2 __error_diffuse_mf2 _k2 __error_diffuse_mf3 _k2 __error_diffuse_mf4 }
_pl = _p + _s; __error_diffuse_mf0 _k3 __error_diffuse_mf1 _k3 __error_diffuse_mf2 _k3 __error_diffuse_mf3 _k3 __error_diffuse_mf4; _pl = _p + _s; __error_diffuse_mf0 _k3 __error_diffuse_mf1 _k3 __error_diffuse_mf2 _k3 __error_diffuse_mf3 _k3 __error_diffuse_mf4
if(_x < _sw - 1) { _pl = _p + _s + 8; __error_diffuse_mf0 _k4 __error_diffuse_mf1 _k4 __error_diffuse_mf2 _k4 __error_diffuse_mf3 _k4 __error_diffuse_mf4; } if(_x < _sw - 1) { _pl = _p + _s + 8; __error_diffuse_mf0 _k4 __error_diffuse_mf1 _k4 __error_diffuse_mf2 _k4 __error_diffuse_mf3 _k4 __error_diffuse_mf4 }
} }
_p += 8; _x++; if(_x >= _sw) { _x = 0; _y++; } _p += 8; _x++; if(_x >= _sw) { _x = 0; _y++; }
@ -245,24 +245,24 @@ function Node_Dither_Diffuse(_x, _y, _group = noone) : Node_Processor(_x, _y, _g
__err_diffuse_write __err_diffuse_write
if(_x < _sw - 1) { if(_x < _sw - 1) {
_pl = _p + 8; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4; _pl = _p + 8; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4
if(_x < _sw - 2) { _pl = _p + 16; __error_diffuse_mf0 _k2 __error_diffuse_mf1 _k2 __error_diffuse_mf2 _k2 __error_diffuse_mf3 _k2 __error_diffuse_mf4; } if(_x < _sw - 2) { _pl = _p + 16; __error_diffuse_mf0 _k2 __error_diffuse_mf1 _k2 __error_diffuse_mf2 _k2 __error_diffuse_mf3 _k2 __error_diffuse_mf4 }
} }
if(_y < _sh - 1) { if(_y < _sh - 1) {
if(_x > 1) { _pl = _p + _s - 16; __error_diffuse_mf0 _k3 __error_diffuse_mf1 _k3 __error_diffuse_mf2 _k3 __error_diffuse_mf3 _k3 __error_diffuse_mf4; } if(_x > 1) { _pl = _p + _s - 16; __error_diffuse_mf0 _k3 __error_diffuse_mf1 _k3 __error_diffuse_mf2 _k3 __error_diffuse_mf3 _k3 __error_diffuse_mf4 }
if(_x > 0) { _pl = _p + _s - 8; __error_diffuse_mf0 _k4 __error_diffuse_mf1 _k4 __error_diffuse_mf2 _k4 __error_diffuse_mf3 _k4 __error_diffuse_mf4; } if(_x > 0) { _pl = _p + _s - 8; __error_diffuse_mf0 _k4 __error_diffuse_mf1 _k4 __error_diffuse_mf2 _k4 __error_diffuse_mf3 _k4 __error_diffuse_mf4 }
_pl = _p + _s; __error_diffuse_mf0 _k5 __error_diffuse_mf1 _k5 __error_diffuse_mf2 _k5 __error_diffuse_mf3 _k5 __error_diffuse_mf4; _pl = _p + _s; __error_diffuse_mf0 _k5 __error_diffuse_mf1 _k5 __error_diffuse_mf2 _k5 __error_diffuse_mf3 _k5 __error_diffuse_mf4
if(_x < _sw - 1) { _pl = _p + _s + 8; __error_diffuse_mf0 _k6 __error_diffuse_mf1 _k6 __error_diffuse_mf2 _k6 __error_diffuse_mf3 _k6 __error_diffuse_mf4; } if(_x < _sw - 1) { _pl = _p + _s + 8; __error_diffuse_mf0 _k6 __error_diffuse_mf1 _k6 __error_diffuse_mf2 _k6 __error_diffuse_mf3 _k6 __error_diffuse_mf4 }
if(_x < _sw - 2) { _pl = _p + _s + 16; __error_diffuse_mf0 _k7 __error_diffuse_mf1 _k7 __error_diffuse_mf2 _k7 __error_diffuse_mf3 _k7 __error_diffuse_mf4; } if(_x < _sw - 2) { _pl = _p + _s + 16; __error_diffuse_mf0 _k7 __error_diffuse_mf1 _k7 __error_diffuse_mf2 _k7 __error_diffuse_mf3 _k7 __error_diffuse_mf4 }
} }
if(_y < _sh - 2) { if(_y < _sh - 2) {
if(_x > 1) { _pl = _p + _s * 2 - 16; __error_diffuse_mf0 _k8 __error_diffuse_mf1 _k8 __error_diffuse_mf2 _k8 __error_diffuse_mf3 _k8 __error_diffuse_mf4; } if(_x > 1) { _pl = _p + _s * 2 - 16; __error_diffuse_mf0 _k8 __error_diffuse_mf1 _k8 __error_diffuse_mf2 _k8 __error_diffuse_mf3 _k8 __error_diffuse_mf4 }
if(_x > 0) { _pl = _p + _s * 2 - 8; __error_diffuse_mf0 _k9 __error_diffuse_mf1 _k9 __error_diffuse_mf2 _k9 __error_diffuse_mf3 _k9 __error_diffuse_mf4; } if(_x > 0) { _pl = _p + _s * 2 - 8; __error_diffuse_mf0 _k9 __error_diffuse_mf1 _k9 __error_diffuse_mf2 _k9 __error_diffuse_mf3 _k9 __error_diffuse_mf4 }
_pl = _p + _s * 2; __error_diffuse_mf0 _k10 __error_diffuse_mf1 _k10 __error_diffuse_mf2 _k10 __error_diffuse_mf3 _k10 __error_diffuse_mf4; _pl = _p + _s * 2; __error_diffuse_mf0 _k10 __error_diffuse_mf1 _k10 __error_diffuse_mf2 _k10 __error_diffuse_mf3 _k10 __error_diffuse_mf4
if(_x < _sw - 1) { _pl = _p + _s * 2 + 8; __error_diffuse_mf0 _k11 __error_diffuse_mf1 _k11 __error_diffuse_mf2 _k11 __error_diffuse_mf3 _k11 __error_diffuse_mf4; } if(_x < _sw - 1) { _pl = _p + _s * 2 + 8; __error_diffuse_mf0 _k11 __error_diffuse_mf1 _k11 __error_diffuse_mf2 _k11 __error_diffuse_mf3 _k11 __error_diffuse_mf4 }
if(_x < _sw - 2) { _pl = _p + _s * 2 + 16; __error_diffuse_mf0 _k12 __error_diffuse_mf1 _k12 __error_diffuse_mf2 _k12 __error_diffuse_mf3 _k12 __error_diffuse_mf4; } if(_x < _sw - 2) { _pl = _p + _s * 2 + 16; __error_diffuse_mf0 _k12 __error_diffuse_mf1 _k12 __error_diffuse_mf2 _k12 __error_diffuse_mf3 _k12 __error_diffuse_mf4 }
} }
_p += 8; _x++; if(_x >= _sw) { _x = 0; _y++; } _p += 8; _x++; if(_x >= _sw) { _x = 0; _y++; }
@ -276,17 +276,17 @@ function Node_Dither_Diffuse(_x, _y, _group = noone) : Node_Processor(_x, _y, _g
__err_diffuse_write __err_diffuse_write
if(_x < _sw - 1) { if(_x < _sw - 1) {
_pl = _p + 8; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4; _pl = _p + 8; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4
if(_x < _sw - 2) { _pl = _p + 16; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4; } if(_x < _sw - 2) { _pl = _p + 16; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4 }
} }
if(_y < _sh - 1) { if(_y < _sh - 1) {
if(_x > 0) { _pl = _p + _s - 8; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4; } if(_x > 0) { _pl = _p + _s - 8; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4 }
_pl = _p + _s; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4; _pl = _p + _s; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4
if(_x < _sw - 1) { _pl = _p + _s + 8; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4; } if(_x < _sw - 1) { _pl = _p + _s + 8; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4 }
} }
if(_y < _sh - 2) { _pl = _p + _s * 2; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4; } if(_y < _sh - 2) { _pl = _p + _s * 2; __error_diffuse_mf0 _k1 __error_diffuse_mf1 _k1 __error_diffuse_mf2 _k1 __error_diffuse_mf3 _k1 __error_diffuse_mf4 }
_p += 8; _x++; if(_x >= _sw) { _x = 0; _y++; } _p += 8; _x++; if(_x >= _sw) { _x = 0; _y++; }
} }
@ -296,7 +296,7 @@ function Node_Dither_Diffuse(_x, _y, _group = noone) : Node_Processor(_x, _y, _g
repeat(_a) { repeat(_a) {
__err_diffuse_write __err_diffuse_write
if(_x < _sw - 1) { _pl = _p + 8; __error_diffuse_mf0 1 __error_diffuse_mf1 1 __error_diffuse_mf2 1 __error_diffuse_mf3 1 __error_diffuse_mf4; } if(_x < _sw - 1) { _pl = _p + 8; __error_diffuse_mf0 1 __error_diffuse_mf1 1 __error_diffuse_mf2 1 __error_diffuse_mf3 1 __error_diffuse_mf4 }
_p += 8; _x++; if(_x >= _sw) { _x = 0; _y++; } _p += 8; _x++; if(_x >= _sw) { _x = 0; _y++; }
} }

2
scripts/node_dynasurf_in/node_dynasurf_in.gml
View file

@ -1,7 +1,7 @@
function Node_DynaSurf_In(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_DynaSurf_In(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Input"; name = "Input";
color = COLORS.node_blend_dynaSurf; color = COLORS.node_blend_dynaSurf;
setDimension(96, 48);; setDimension(96, 48);
manual_deletable = false; manual_deletable = false;
destroy_when_upgroup = true; destroy_when_upgroup = true;

4
scripts/node_edge_detect/node_edge_detect.gml
View file

@ -45,7 +45,7 @@ function Node_Edge_Detect(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
surface_set_target(_outSurf); surface_set_target(_outSurf);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
shader_set(shader); shader_set(shader);
shader_set_uniform_f_array_safe(uniform_dim, [surface_get_width_safe(_data[0]), surface_get_height_safe(_data[0])]); shader_set_uniform_f_array_safe(uniform_dim, [surface_get_width_safe(_data[0]), surface_get_height_safe(_data[0])]);
@ -54,7 +54,7 @@ function Node_Edge_Detect(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
draw_surface_safe(_data[0]); draw_surface_safe(_data[0]);
shader_reset(); shader_reset();
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
__process_mask_modifier(_data); __process_mask_modifier(_data);

8
scripts/node_functions/node_functions.gml
View file

@ -234,8 +234,8 @@
var node = PROJECT.nodeNameMap[? key]; var node = PROJECT.nodeNameMap[? key];
var map = noone; var map = noone;
switch(string_lower(strs[1])) { switch(string_lower(strs[1])) {
case2_mf0/* */"inputs" case2_mf1 "input" case2_mf2 : map = node.inputMap; break; case "inputs" : case "input" : map = node.inputMap; break;
case2_mf0/* */"outputs" case2_mf1 "output" case2_mf2 : map = node.outputMap; break; case "outputs" : case "output" : map = node.outputMap; break;
default : return 0; default : return 0;
} }
@ -271,8 +271,8 @@
var node = PROJECT.nodeNameMap[? key]; var node = PROJECT.nodeNameMap[? key];
var map = noone; var map = noone;
switch(string_lower(strs[1])) { switch(string_lower(strs[1])) {
case2_mf0/* */"inputs" case2_mf1 "input" case2_mf2 : map = node.inputMap; break; case "inputs" : case "input" : map = node.inputMap; break;
case2_mf0/* */"outputs" case2_mf1 "output" case2_mf2 : map = node.outputMap; break; case "outputs" : case "output" : map = node.outputMap; break;
default : return EXPRESS_TREE_ANIM.none; default : return EXPRESS_TREE_ANIM.none;
} }

2
scripts/node_gm_room/node_gm_room.gml
View file

@ -187,7 +187,7 @@ function Node_GMRoom(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
draw_text_add(_wdx + ui(8 + 32), _wdy + _wdh / 2, _tname); draw_text_add(_wdx + ui(8 + 32), _wdy + _wdh / 2, _tname);
draw_sprite_stretched_ext(THEME.textbox, 3, _wdx, _wdy, ui(32), _wdh, c_white); draw_sprite_stretched_ext(THEME.textbox, 3, _wdx, _wdy, ui(32), _wdh, c_white);
draw_sprite_ext(s_node_tileset, 0, _wdx + ui(32) / 2, _wdy + _wdh / 2, .25, .25); draw_sprite_ext(s_node_tile_tileset, 0, _wdx + ui(32) / 2, _wdy + _wdh / 2, .25, .25);
_yy += _wdh + ui(8); _yy += _wdh + ui(8);
_h += _wdh + ui(8); _h += _wdh + ui(8);

12
scripts/node_image_sequence/node_image_sequence.gml
View file

@ -200,9 +200,9 @@ function Node_Image_Sequence(_x, _y, _group = noone) : Node(_x, _y, _group) cons
surfs[i] = surface_verify(surfs[i], ww, hh, attrDepth()); surfs[i] = surface_verify(surfs[i], ww, hh, attrDepth());
surface_set_target(surfs[i]); surface_set_target(surfs[i]);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_sprite(_spr, 0, pad[2], pad[1]); draw_sprite(_spr, 0, pad[2], pad[1]);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
break; break;
@ -219,9 +219,9 @@ function Node_Image_Sequence(_x, _y, _group = noone) : Node(_x, _y, _group) cons
surface_set_target(surfs[i]); surface_set_target(surfs[i]);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_sprite_ext(_spr, 0, sw, sh, ss, ss, 0, c_white, 1); draw_sprite_ext(_spr, 0, sw, sh, ss, ss, 0, c_white, 1);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
} else { } else {
@ -230,9 +230,9 @@ function Node_Image_Sequence(_x, _y, _group = noone) : Node(_x, _y, _group) cons
surface_set_target(surfs[i]); surface_set_target(surfs[i]);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_sprite(_spr, 0, xx, yy); draw_sprite(_spr, 0, xx, yy);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
} }
break; break;

2
scripts/node_iterate_each_inline/node_iterate_each_inline.gml
View file

@ -102,7 +102,7 @@ function Node_Iterate_Each_Inline(_x, _y, _group = noone) : Node_Collection_Inli
} }
var _itc = getIterationCount(); var _itc = getIterationCount();
if(_itc != iteration_count) RENDER_ALL_REORDER; if(_itc != iteration_count) RENDER_ALL_REORDER
iteration_count = _itc; iteration_count = _itc;
iterated = 0; iterated = 0;

2
scripts/node_iterate_filter_inline/node_iterate_filter_inline.gml
View file

@ -99,7 +99,7 @@ function Node_Iterate_Filter_Inline(_x, _y, _group = noone) : Node_Collection_In
} }
var _itc = getIterationCount(); var _itc = getIterationCount();
if(_itc != iteration_count) RENDER_ALL_REORDER; if(_itc != iteration_count) RENDER_ALL_REORDER
iteration_count = _itc; iteration_count = _itc;
iterated = 0; iterated = 0;

2
scripts/node_iterate_inline/node_iterate_inline.gml
View file

@ -87,7 +87,7 @@ function Node_Iterate_Inline(_x, _y, _group = noone) : Node_Collection_Inline(_x
static update = function() { static update = function() {
var _itc = inputs[0].getValue(); var _itc = inputs[0].getValue();
if(_itc != iteration_count) RENDER_ALL_REORDER; if(_itc != iteration_count) RENDER_ALL_REORDER
iteration_count = _itc; iteration_count = _itc;
iterated = 0; iterated = 0;

2
scripts/node_mesh_create_path/node_mesh_create_path.gml
View file

@ -61,6 +61,6 @@ function Node_Mesh_Create_Path(_x, _y, _group = noone) : Node(_x, _y, _group) co
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_mesh_path, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_mesh_create_path, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

2
scripts/node_mesh_to_path/node_mesh_to_path.gml
View file

@ -69,6 +69,6 @@ function Node_Mesh_To_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constr
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_mesh_path, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_mesh_create_path, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

4
scripts/node_mesh_transform/node_mesh_transform.gml
View file

@ -1,6 +1,6 @@
function Node_Mesh_Transform(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Mesh_Transform(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Mesh Transform"; name = "Mesh Transform";
setDimension(96, 48);; setDimension(96, 48);
newInput(0, nodeValue("Mesh", self, CONNECT_TYPE.input, VALUE_TYPE.mesh, noone)) newInput(0, nodeValue("Mesh", self, CONNECT_TYPE.input, VALUE_TYPE.mesh, noone))
.setVisible(true, true); .setVisible(true, true);
@ -78,6 +78,6 @@ function Node_Mesh_Transform(_x, _y, _group = noone) : Node(_x, _y, _group) cons
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_mesh_path, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_mesh_create_path, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

6
scripts/node_mk_delay_machine/node_mk_delay_machine.gml
View file

@ -66,9 +66,9 @@ function Node_MK_Delay_Machine(_x, _y, _group = noone) : Node(_x, _y, _group) co
DRAW_CLEAR DRAW_CLEAR
switch(_blnd) { switch(_blnd) {
case 0 : BLEND_NORMAL; break; case 0 : BLEND_NORMAL break;
case 1 : BLEND_ALPHA; break; case 1 : BLEND_ALPHA break;
case 2 : BLEND_ADD; break; case 2 : BLEND_ADD break;
} }
for( var i = _amo - 1; i >= 0; i-- ) { for( var i = _amo - 1; i >= 0; i-- ) {

8
scripts/node_padding/node_padding.gml
View file

@ -71,12 +71,12 @@ function Node_Padding(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c
surface_set_target(_outSurf); surface_set_target(_outSurf);
if(fill == 0) { if(fill == 0) {
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
} else if(fill == 1) } else if(fill == 1)
draw_clear_alpha(fillClr, 1); draw_clear_alpha(fillClr, 1);
draw_surface_safe(surf, padding[2], padding[1]); draw_surface_safe(surf, padding[2], padding[1]);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
} }
} else if(mode == 1) { } else if(mode == 1) {
@ -85,7 +85,7 @@ function Node_Padding(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c
surface_set_target(_outSurf); surface_set_target(_outSurf);
if(fill == 0) { if(fill == 0) {
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
} else if(fill == 1) } else if(fill == 1)
draw_clear(fillClr); draw_clear(fillClr);
@ -105,7 +105,7 @@ function Node_Padding(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c
} }
draw_surface_safe(surf, sx, sy); draw_surface_safe(surf, sx, sy);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
} }

6
scripts/node_particle/node_particle.gml
View file

@ -116,9 +116,9 @@ function Node_Particle(_x, _y, _group = noone) : Node_VFX_Spawner_Base(_x, _y, _
if(is_surface(_bg)) draw_surface_safe(_bg); if(is_surface(_bg)) draw_surface_safe(_bg);
switch(_blend) { switch(_blend) {
case PARTICLE_BLEND_MODE.normal: BLEND_NORMAL; break; case PARTICLE_BLEND_MODE.normal: BLEND_NORMAL break;
case PARTICLE_BLEND_MODE.alpha: BLEND_ALPHA; break; case PARTICLE_BLEND_MODE.alpha: BLEND_ALPHA break;
case PARTICLE_BLEND_MODE.additive: BLEND_ADD; break; case PARTICLE_BLEND_MODE.additive: BLEND_ADD break;
} }
if(_type == PARTICLE_RENDER_TYPE.surface) if(_type == PARTICLE_RENDER_TYPE.surface)

2
scripts/node_path_blend/node_path_blend.gml
View file

@ -1,6 +1,6 @@
function Node_Path_Blend(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Path_Blend(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Blend Path"; name = "Blend Path";
setDimension(96, 48);; setDimension(96, 48);
length = 0; length = 0;
newInput(0, nodeValue_PathNode("Path 1", self, noone)) newInput(0, nodeValue_PathNode("Path 1", self, noone))

2
scripts/node_path_bridge/node_path_bridge.gml
View file

@ -1,6 +1,6 @@
function Node_Path_Bridge(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Path_Bridge(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Bridge Path"; name = "Bridge Path";
setDimension(96, 48);; setDimension(96, 48);
newInput(0, nodeValue_PathNode("Path", self, noone)) newInput(0, nodeValue_PathNode("Path", self, noone))
.setVisible(true, true) .setVisible(true, true)

2
scripts/node_path_map_area/node_path_map_area.gml
View file

@ -1,6 +1,6 @@
function Node_Path_Map_Area(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Path_Map_Area(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Remap Path"; name = "Remap Path";
setDimension(96, 48);; setDimension(96, 48);
newInput(0, nodeValue_PathNode("Path", self, noone)) newInput(0, nodeValue_PathNode("Path", self, noone))
.setVisible(true, true); .setVisible(true, true);

2
scripts/node_path_repeat/node_path_repeat.gml
View file

@ -56,7 +56,7 @@ function Node_Path_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
static getAccuLength = function(i=0) /*=>*/ {return array_safe_get_fast(accu_lengths, i)}; static getAccuLength = function(i=0) /*=>*/ {return array_safe_get_fast(accu_lengths, i)};
static getPointRatio = function(_rat, ind = 0, out = undefined) { static getPointRatio = function(_rat, ind = 0, out = undefined) {
if(out == undefined) out = new __vec2(); out ??= new __vec2();
var _path = array_safe_get_fast(paths, ind, 0); var _path = array_safe_get_fast(paths, ind, 0);
if(_path == 0) return out; if(_path == 0) return out;

1
scripts/node_path_repeat/node_path_repeat.yy
View file

@ -10,5 +10,4 @@
}, },
"resourceType":"GMScript", "resourceType":"GMScript",
"resourceVersion":"2.0", "resourceVersion":"2.0",
"tags":[],
} }

2
scripts/node_path_reverse/node_path_reverse.gml
View file

@ -1,6 +1,6 @@
function Node_Path_Reverse(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Path_Reverse(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Reverse Path"; name = "Reverse Path";
setDimension(96, 48);; setDimension(96, 48);
newInput(0, nodeValue_PathNode("Path", self, noone)) newInput(0, nodeValue_PathNode("Path", self, noone))
.setVisible(true, true); .setVisible(true, true);

4
scripts/node_path_shape/node_path_shape.gml
View file

@ -75,7 +75,7 @@ function Node_Path_Shape(_x, _y, _group = noone) : Node(_x, _y, _group) construc
static getAccuLength = function() /*=>*/ {return lengthAccs}; static getAccuLength = function() /*=>*/ {return lengthAccs};
static getPointRatio = function(_rat, _ind = 0, out = undefined) { static getPointRatio = function(_rat, _ind = 0, out = undefined) {
if(out == undefined) out = new __vec2(); out ??= new __vec2();
_rat = frac(_rat); _rat = frac(_rat);
switch(shapeScroll[shape].name) { switch(shapeScroll[shape].name) {
@ -115,7 +115,7 @@ function Node_Path_Shape(_x, _y, _group = noone) : Node(_x, _y, _group) construc
} }
static getPointDistance = function(_dist, _ind = 0, out = undefined) { static getPointDistance = function(_dist, _ind = 0, out = undefined) {
if(out == undefined) out = new __vec2(); out ??= new __vec2();
_dist = safe_mod(_dist, lengthTotal); _dist = safe_mod(_dist, lengthTotal);
var _d = _dist, l; var _d = _dist, l;

1
scripts/node_path_shape/node_path_shape.yy
View file

@ -10,5 +10,4 @@
}, },
"resourceType":"GMScript", "resourceType":"GMScript",
"resourceVersion":"2.0", "resourceVersion":"2.0",
"tags":[],
} }

2
scripts/node_path_shift/node_path_shift.gml
View file

@ -1,6 +1,6 @@
function Node_Path_Shift(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Path_Shift(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Shift Path"; name = "Shift Path";
setDimension(96, 48);; setDimension(96, 48);
newInput(0, nodeValue_PathNode("Path", self, noone)) newInput(0, nodeValue_PathNode("Path", self, noone))
.setVisible(true, true); .setVisible(true, true);

2
scripts/node_path_smooth/node_path_smooth.gml
View file

@ -1,6 +1,6 @@
function Node_Path_Smooth(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Path_Smooth(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Smooth Path"; name = "Smooth Path";
setDimension(96, 48);; setDimension(96, 48);
newInput(0, nodeValue_Bool("Loop", self, false)) newInput(0, nodeValue_Bool("Loop", self, false))
.rejectArray(); .rejectArray();

2
scripts/node_path_transform/node_path_transform.gml
View file

@ -91,7 +91,7 @@ function Node_Path_Transform(_x, _y, _group = noone) : Node(_x, _y, _group) cons
} }
static getPointRatio = function(_rat, ind = 0, out = undefined) { static getPointRatio = function(_rat, ind = 0, out = undefined) {
if(out == undefined) out = new __vec2(); out ??= new __vec2();
var _cKey = $"{string_format(_rat, 0, 6)},{ind}"; var _cKey = $"{string_format(_rat, 0, 6)},{ind}";
if(ds_map_exists(cached_pos, _cKey)) { if(ds_map_exists(cached_pos, _cKey)) {

2
scripts/node_path_trim/node_path_trim.gml
View file

@ -1,6 +1,6 @@
function Node_Path_Trim(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Path_Trim(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Trim Path"; name = "Trim Path";
setDimension(96, 48);; setDimension(96, 48);
newInput(0, nodeValue_PathNode("Path", self, noone)) newInput(0, nodeValue_PathNode("Path", self, noone))
.setVisible(true, true); .setVisible(true, true);

2
scripts/node_path_wave/node_path_wave.gml
View file

@ -1,6 +1,6 @@
function Node_Path_Wave(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Path_Wave(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Wave Path"; name = "Wave Path";
setDimension(96, 48);; setDimension(96, 48);
newInput(0, nodeValue_PathNode("Path", self, noone)) newInput(0, nodeValue_PathNode("Path", self, noone))
.setVisible(true, true); .setVisible(true, true);

16
scripts/node_pixel_sort/node_pixel_sort.gml
View file

@ -51,9 +51,9 @@ function Node_Pixel_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _group
if(_dr < 0) _dr = 4 + _dr; if(_dr < 0) _dr = 4 + _dr;
if(_it <= 0) { if(_it <= 0) {
surface_set_target(_outSurf); surface_set_target(_outSurf);
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_surface_safe(_in); draw_surface_safe(_in);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
return _outSurf; return _outSurf;
@ -67,9 +67,9 @@ function Node_Pixel_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _group
surface_set_target(pp[1]); surface_set_target(pp[1]);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_surface_safe(_in); draw_surface_safe(_in);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
shader_set(shader); shader_set(shader);
@ -84,19 +84,19 @@ function Node_Pixel_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _group
surface_set_target(sBase); surface_set_target(sBase);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
shader_set_uniform_f(uniform_itr, i); shader_set_uniform_f(uniform_itr, i);
draw_surface_safe(sDraw); draw_surface_safe(sDraw);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
} }
shader_reset(); shader_reset();
surface_set_target(_outSurf); surface_set_target(_outSurf);
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_surface_safe(sBase); draw_surface_safe(sBase);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
surface_free(pp[0]); surface_free(pp[0]);

2
scripts/node_project_data/node_project_data.gml
View file

@ -1,6 +1,6 @@
function Node_Project_Data(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { function Node_Project_Data(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
name = "Project Data"; name = "Project Data";
setDimension(96, 48);; setDimension(96, 48);
newOutput(0, nodeValue_Output("Name", self, VALUE_TYPE.text, "")) newOutput(0, nodeValue_Output("Name", self, VALUE_TYPE.text, ""))
.setVisible(false); .setVisible(false);

2
scripts/node_rigid_force_apply/node_rigid_force_apply.gml
View file

@ -161,6 +161,6 @@ function Node_Rigid_Force_Apply(_x, _y, _group = noone) : Node(_x, _y, _group) c
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_rigid_force, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_rigid_force_apply, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

2
scripts/node_scatter/node_scatter.gml
View file

@ -388,7 +388,7 @@ function Node_Scatter(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c
break; break;
case 1 : case 1 :
BLEND_ADD; BLEND_ADD
break; break;
case 2 : case 2 :

2
scripts/node_scatter_points/node_scatter_points.gml
View file

@ -129,6 +129,6 @@ function Node_Scatter_Points(_x, _y, _group = noone) : Node(_x, _y, _group) cons
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_scatter_point, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_scatter_points, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

2
scripts/node_shadow/node_shadow.gml
View file

@ -83,7 +83,7 @@ function Node_Shadow(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co
var _dim = surface_get_dimension(_surf); var _dim = surface_get_dimension(_surf);
var pass1 = surface_create_valid(_dim[0], _dim[1], attrDepth()); var pass1 = surface_create_valid(_dim[0], _dim[1], attrDepth());
var _shax = _shf[0], var _shax = _shf[0];
var _shay = _shf[1]; var _shay = _shf[1];
if(_posi == 1) { if(_posi == 1) {

4
scripts/node_smoke_turbulence/node_smoke_turbulence.gml
View file

@ -44,13 +44,13 @@ function Node_Smoke_Turbulence(_x, _y, _group = noone) : Node_Smoke(_x, _y, _gro
surface_set_target(temp_surface[0]) surface_set_target(temp_surface[0])
draw_clear_alpha(0., 0.); draw_clear_alpha(0., 0.);
shader_set(sh_fd_turbulence); shader_set(sh_fd_turbulence);
BLEND_OVERRIDE; BLEND_OVERRIDE
shader_set_f("scale", _sca); shader_set_f("scale", _sca);
shader_set_f("seed", _sed); shader_set_f("seed", _sed);
shader_set_f("strength", _str); shader_set_f("strength", _str);
draw_sprite_stretched(s_fx_pixel, 0, _are[0] - _are[2], _are[1] - _are[3], _are[2] * 2, _are[3] * 2); draw_sprite_stretched(s_fx_pixel, 0, _are[0] - _are[2], _are[1] - _are[3], _are[2] * 2, _are[3] * 2);
BLEND_NORMAL; BLEND_NORMAL
shader_reset(); shader_reset();
surface_reset_target(); surface_reset_target();

4
scripts/node_smoke_vortex/node_smoke_vortex.gml
View file

@ -56,12 +56,12 @@ function Node_Smoke_Vortex(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group)
surface_set_target(temp_surface[0]) surface_set_target(temp_surface[0])
draw_clear_alpha(0., 0.); draw_clear_alpha(0., 0.);
shader_set(sh_fd_vortex); shader_set(sh_fd_vortex);
BLEND_OVERRIDE; BLEND_OVERRIDE
shader_set_f("vortex", _str); shader_set_f("vortex", _str);
shader_set_f("angleIO", _aio); shader_set_f("angleIO", _aio);
draw_sprite_stretched(s_fx_pixel, 0, _pos[0] - _rad, _pos[1] - _rad, _rad * 2, _rad * 2); draw_sprite_stretched(s_fx_pixel, 0, _pos[0] - _rad, _pos[1] - _rad, _rad * 2, _rad * 2);
BLEND_NORMAL; BLEND_NORMAL
shader_reset(); shader_reset();
surface_reset_target(); surface_reset_target();

2
scripts/node_strand_break/node_strand_break.gml
View file

@ -2,7 +2,7 @@ function Node_Strand_Break(_x, _y, _group = noone) : _Node_Strand_Affector(_x, _
name = "Strand Break"; name = "Strand Break";
color = COLORS.node_blend_strand; color = COLORS.node_blend_strand;
icon = THEME.strandSim; icon = THEME.strandSim;
setDimension(96, 48);; setDimension(96, 48);
manual_ungroupable = false; manual_ungroupable = false;

4
scripts/node_strand_collision/node_strand_collision.gml
View file

@ -2,7 +2,7 @@ function Node_Strand_Collision(_x, _y, _group = noone) : Node(_x, _y, _group) co
name = "Strand Collision"; name = "Strand Collision";
color = COLORS.node_blend_strand; color = COLORS.node_blend_strand;
icon = THEME.strandSim; icon = THEME.strandSim;
setDimension(96, 48);; setDimension(96, 48);
manual_ungroupable = false; manual_ungroupable = false;
@ -51,6 +51,6 @@ function Node_Strand_Collision(_x, _y, _group = noone) : Node(_x, _y, _group) co
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_strand_collide, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_strand_collision, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

2
scripts/node_strand_create/node_strand_create.gml
View file

@ -2,7 +2,7 @@ function Node_Strand_Create(_x, _y, _group = noone) : Node(_x, _y, _group) const
name = "Strand Create"; name = "Strand Create";
color = COLORS.node_blend_strand; color = COLORS.node_blend_strand;
icon = THEME.strandSim; icon = THEME.strandSim;
setDimension(96, 48);; setDimension(96, 48);
update_on_frame = true; update_on_frame = true;
manual_ungroupable = false; manual_ungroupable = false;

4
scripts/node_strand_force_apply/node_strand_force_apply.gml
View file

@ -2,7 +2,7 @@ function Node_Strand_Force_Apply(_x, _y, _group = noone) : _Node_Strand_Affector
name = "Strand Force"; name = "Strand Force";
color = COLORS.node_blend_strand; color = COLORS.node_blend_strand;
icon = THEME.strandSim; icon = THEME.strandSim;
setDimension(96, 48);; setDimension(96, 48);
manual_ungroupable = false; manual_ungroupable = false;
@ -50,6 +50,6 @@ function Node_Strand_Force_Apply(_x, _y, _group = noone) : _Node_Strand_Affector
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_strand_force, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_strand_force_apply, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

2
scripts/node_strand_gravity/node_strand_gravity.gml
View file

@ -2,7 +2,7 @@ function Node_Strand_Gravity(_x, _y, _group = noone) : Node(_x, _y, _group) cons
name = "Strand Gravity"; name = "Strand Gravity";
color = COLORS.node_blend_strand; color = COLORS.node_blend_strand;
icon = THEME.strandSim; icon = THEME.strandSim;
setDimension(96, 48);; setDimension(96, 48);
manual_ungroupable = false; manual_ungroupable = false;

4
scripts/node_strand_length_adjust/node_strand_length_adjust.gml
View file

@ -2,7 +2,7 @@ function Node_Strand_Length_Adjust(_x, _y, _group = noone) : _Node_Strand_Affect
name = "Strand Length"; name = "Strand Length";
color = COLORS.node_blend_strand; color = COLORS.node_blend_strand;
icon = THEME.strandSim; icon = THEME.strandSim;
setDimension(96, 48);; setDimension(96, 48);
manual_ungroupable = false; manual_ungroupable = false;
@ -26,6 +26,6 @@ function Node_Strand_Length_Adjust(_x, _y, _group = noone) : _Node_Strand_Affect
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_sprite_fit(s_node_strand_length, 0, bbox.xc, bbox.yc, bbox.w, bbox.h); draw_sprite_fit(s_node_strand_length_adjust, 0, bbox.xc, bbox.yc, bbox.w, bbox.h);
} }
} }

2
scripts/node_strand_update/node_strand_update.gml
View file

@ -2,7 +2,7 @@ function Node_Strand_Update(_x, _y, _group = noone) : Node(_x, _y, _group) const
name = "Strand Update"; name = "Strand Update";
color = COLORS.node_blend_strand; color = COLORS.node_blend_strand;
icon = THEME.strandSim; icon = THEME.strandSim;
setDimension(96, 48);; setDimension(96, 48);
manual_ungroupable = false; manual_ungroupable = false;

2
scripts/node_string/node_string.gml
View file

@ -1,6 +1,6 @@
function Node_String(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { function Node_String(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor {
name = "Text"; name = "Text";
setDimension(96, 48);; setDimension(96, 48);
newInput(0, nodeValue_Text("Text", self, "")); newInput(0, nodeValue_Text("Text", self, ""));

4
scripts/node_transform_single/node_transform_single.gml
View file

@ -29,11 +29,11 @@ function Node_Transform_Single(_x, _y, _group = noone) : Node_Processor(_x, _y,
surface_set_target(_outSurf); surface_set_target(_outSurf);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_surface_ext_safe(_data[0], pos_x + origin[0] - psc_x, pos_y + origin[1] - psc_y, sca_x, sca_y, rot, c_white, 1); draw_surface_ext_safe(_data[0], pos_x + origin[0] - psc_x, pos_y + origin[1] - psc_y, sca_x, sca_y, rot, c_white, 1);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
return _outSurf; return _outSurf;

2
scripts/node_value_palette/node_value_palette.gml
View file

@ -1,6 +1,6 @@
function nodeValue_Palette(_name, _node, _value, _tooltip = "") { return new __NodeValue_Palette(_name, _node, _value, _tooltip); } function nodeValue_Palette(_name, _node, _value, _tooltip = "") { return new __NodeValue_Palette(_name, _node, _value, _tooltip); }
function __NodeValue_Palette(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.color, _value, _tooltip) constructor {; function __NodeValue_Palette(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.color, _value, _tooltip) constructor {
setDisplay(VALUE_DISPLAY.palette); setDisplay(VALUE_DISPLAY.palette);

12
scripts/panel_collection/panel_collection.gml
View file

@ -352,9 +352,9 @@ function Panel_Collection() : PanelContent() constructor {
var gr_y1 = yy + grid_size; var gr_y1 = yy + grid_size;
if(yy + grid_size >= 0 && yy <= contentPane.surface_h) { if(yy + grid_size >= 0 && yy <= contentPane.surface_h) {
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_sprite_stretched(THEME.node_bg, 0, _boxx, yy, grid_size, grid_size); draw_sprite_stretched(THEME.node_bg, 0, _boxx, yy, grid_size, grid_size);
BLEND_NORMAL; BLEND_NORMAL
var meta = noone; var meta = noone;
if(variable_struct_exists(_node, "getMetadata")) if(variable_struct_exists(_node, "getMetadata"))
@ -451,9 +451,9 @@ function Panel_Collection() : PanelContent() constructor {
if(yy + list_height >= 0 && yy <= contentPane.surface_h) { if(yy + list_height >= 0 && yy <= contentPane.surface_h) {
if(i % 2) { if(i % 2) {
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_sprite_stretched_ext(THEME.node_bg, 0, ui(4), yy, list_width - 8, list_height, c_white, 0.2); draw_sprite_stretched_ext(THEME.node_bg, 0, ui(4), yy, list_width - 8, list_height, c_white, 0.2);
BLEND_NORMAL; BLEND_NORMAL
} }
if(_hover && point_in_rectangle(_m[0], _m[1], 0, yy, list_width, yy + list_height - 1)) { if(_hover && point_in_rectangle(_m[0], _m[1], 0, yy, list_width, yy + list_height - 1)) {
@ -653,9 +653,9 @@ function Panel_Collection() : PanelContent() constructor {
var gr_y1 = yy + grid_size; var gr_y1 = yy + grid_size;
if(yy + grid_size >= 0 && yy <= nodecontentPane.surface_h) { if(yy + grid_size >= 0 && yy <= nodecontentPane.surface_h) {
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_sprite_stretched(THEME.node_bg, 0, _boxx, yy, grid_size, grid_size); draw_sprite_stretched(THEME.node_bg, 0, _boxx, yy, grid_size, grid_size);
BLEND_NORMAL; BLEND_NORMAL
if(_hover && point_in_rectangle(_m[0], _m[1], _nx, yy, _nx + grid_width, yy + grid_size)) { if(_hover && point_in_rectangle(_m[0], _m[1], _nx, yy, _nx + grid_width, yy + grid_size)) {
TOOLTIP = _node.name; TOOLTIP = _node.name;

4
scripts/panel_history/panel_history.gml
View file

@ -81,7 +81,7 @@ function Panel_History() : PanelContent() constructor {
} }
hh = amoDisp * lh; hh = amoDisp * lh;
BLEND_OVERRIDE; BLEND_OVERRIDE
if(pHOVER && sc_history.hover && point_in_rectangle(_m[0], _m[1], ui(32), yy - ui(4), ww, yy + hh + ui(4) - 1)) { if(pHOVER && sc_history.hover && point_in_rectangle(_m[0], _m[1], ui(32), yy - ui(4), ww, yy + hh + ui(4) - 1)) {
sc_history.hover_content = true; sc_history.hover_content = true;
draw_sprite_stretched_ext(THEME.node_bg, 0, ui(32), yy - ui(2), lw, hh + ui(4), COLORS._main_icon_light, 1); draw_sprite_stretched_ext(THEME.node_bg, 0, ui(32), yy - ui(2), lw, hh + ui(4), COLORS._main_icon_light, 1);
@ -108,7 +108,7 @@ function Panel_History() : PanelContent() constructor {
else _yc = yy + hh; else _yc = yy + hh;
draw_sprite_ui(THEME.scroll_box_arrow, 0, ui(16), _yc, 1, 1 - (i > red) * 2, 0, cc, 1); draw_sprite_ui(THEME.scroll_box_arrow, 0, ui(16), _yc, 1, 1 - (i > red) * 2, 0, cc, 1);
BLEND_NORMAL; BLEND_NORMAL
if(i == hovering) if(i == hovering)
connect_line_ed = _yc; connect_line_ed = _yc;

2
scripts/pcx_ast/pcx_ast.gml
View file

@ -103,7 +103,7 @@
PROJECT_VARIABLES.Project.frame = [ function() { return CURRENT_FRAME }, EXPRESS_TREE_ANIM.animated ]; PROJECT_VARIABLES.Project.frame = [ function() { return CURRENT_FRAME }, EXPRESS_TREE_ANIM.animated ];
PROJECT_VARIABLES.Project.progress = [ function() { return CURRENT_FRAME / (TOTAL_FRAMES - 1) }, EXPRESS_TREE_ANIM.animated ]; PROJECT_VARIABLES.Project.progress = [ function() { return CURRENT_FRAME / (TOTAL_FRAMES - 1) }, EXPRESS_TREE_ANIM.animated ];
PROJECT_VARIABLES.Project.frameTotal = [ function() { return TOTAL_FRAMES }, EXPRESS_TREE_ANIM.none ]; PROJECT_VARIABLES.Project.frameTotal = [ function() { return TOTAL_FRAMES }, EXPRESS_TREE_ANIM.none ];
PROJECT_VARIABLES.Project.fps = [ function() { return PROJECT.animator.framerate }, EXPRESS_TREE_ANIM.none ]; PROJECT_VARIABLES.Project.FPS = [ function() { return PROJECT.animator.framerate }, EXPRESS_TREE_ANIM.none ];
PROJECT_VARIABLES.Project.time = [ function() { return CURRENT_FRAME / PROJECT.animator.framerate }, EXPRESS_TREE_ANIM.animated ]; PROJECT_VARIABLES.Project.time = [ function() { return CURRENT_FRAME / PROJECT.animator.framerate }, EXPRESS_TREE_ANIM.animated ];
PROJECT_VARIABLES.Project.name = [ function() { return filename_name_only(PROJECT.path) }, EXPRESS_TREE_ANIM.none ]; PROJECT_VARIABLES.Project.name = [ function() { return filename_name_only(PROJECT.path) }, EXPRESS_TREE_ANIM.none ];
PROJECT_VARIABLES.Project.dimension = [ function() { return PROJECT.attributes.surface_dimension; }, EXPRESS_TREE_ANIM.none ]; PROJECT_VARIABLES.Project.dimension = [ function() { return PROJECT.attributes.surface_dimension; }, EXPRESS_TREE_ANIM.none ];

4
scripts/pcx_server/pcx_server.gml
View file

@ -71,8 +71,8 @@ function pxl_autocomplete_server_node(prompt, pr_list) {
var tag = ""; var tag = "";
switch(string_lower(sp[1])) { switch(string_lower(sp[1])) {
case2_mf0/* */"inputs" case2_mf1 "input" case2_mf2 : tag = "input"; F = node.inputMap; break; case "inputs" : case "input" : tag = "input"; F = node.inputMap; break;
case2_mf0/* */"outputs" case2_mf1 "output" case2_mf2 : tag = "output"; F = node.outputMap; break; case "outputs" : case "output" : tag = "output"; F = node.outputMap; break;
} }
if(!is_struct(F)) return; if(!is_struct(F)) return;

94
scripts/preferences/preferences.gml
View file

@ -415,57 +415,57 @@
#macro __regFnPref_mf2 ); }); } #macro __regFnPref_mf2 ); }); }
function __fnInit_Preference() { function __fnInit_Preference() {
__regFnPref_mf0 __txtx("pref_double_click_delay", "Double click delay") __regFnPref_mf1 "double_click_delay" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_double_click_delay", "Double click delay") __regFnPref_mf1 "double_click_delay" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_mouse_wheel_speed", "Scroll speed") __regFnPref_mf1 "mouse_wheel_speed" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_mouse_wheel_speed", "Scroll speed") __regFnPref_mf1 "mouse_wheel_speed" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_keyboard_hold_start", "Keyboard hold start") __regFnPref_mf1 "keyboard_repeat_start" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_keyboard_hold_start", "Keyboard hold start") __regFnPref_mf1 "keyboard_repeat_start" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_keyboard_repeat_delay", "Keyboard repeat delay") __regFnPref_mf1 "keyboard_repeat_speed" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_keyboard_repeat_delay", "Keyboard repeat delay") __regFnPref_mf1 "keyboard_repeat_speed" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_expand_hovering_panel", "Expand hovering panel") __regFnPref_mf1 "expand_hover" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_expand_hovering_panel", "Expand hovering panel") __regFnPref_mf1 "expand_hover" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_expand_lock_mouse_slider", "Lock mouse when sliding") __regFnPref_mf1 "slider_lock_mouse" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_expand_lock_mouse_slider", "Lock mouse when sliding") __regFnPref_mf1 "slider_lock_mouse" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_pen_pool_delay", "Pen leave delay") __regFnPref_mf1 "pen_pool_delay" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_pen_pool_delay", "Pen leave delay") __regFnPref_mf1 "pen_pool_delay" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_auto_save_time", "Autosave delay (-1 to disable)") __regFnPref_mf1 "auto_save_time" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_auto_save_time", "Autosave delay (-1 to disable)") __regFnPref_mf1 "auto_save_time" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_save_layout", "Save layout") __regFnPref_mf1 "save_layout" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_save_layout", "Save layout") __regFnPref_mf1 "save_layout" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_save_file_minify", "Minify save file") __regFnPref_mf1 "save_file_minify" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_save_file_minify", "Minify save file") __regFnPref_mf1 "save_file_minify" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_save_backups", "Backup saves") __regFnPref_mf1 "save_backup" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_save_backups", "Backup saves") __regFnPref_mf1 "save_backup" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_legacy_exception", "Use legacy exception handler") __regFnPref_mf1 "use_legacy_exception" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_legacy_exception", "Use legacy exception handler") __regFnPref_mf1 "use_legacy_exception" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_crash_dialog", "Show dialog after crash") __regFnPref_mf1 "show_crash_dialog" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_crash_dialog", "Show dialog after crash") __regFnPref_mf1 "show_crash_dialog" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_clear_temp", "Clear temp file on close") __regFnPref_mf1 "clear_temp_on_close" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_clear_temp", "Clear temp file on close") __regFnPref_mf1 "clear_temp_on_close" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_enable_test_mode", "Enable developer mode*") __regFnPref_mf1 "test_mode" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_enable_test_mode", "Enable developer mode*") __regFnPref_mf1 "test_mode" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_exp_popup_dialog", "Pop-up Dialog") __regFnPref_mf1 "multi_window" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_exp_popup_dialog", "Pop-up Dialog") __regFnPref_mf1 "multi_window" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_gui_scaling", "GUI scaling") __regFnPref_mf1 "ui_scale" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_gui_scaling", "GUI scaling") __regFnPref_mf1 "ui_scale" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_ui_frame_rate", "UI frame rate") __regFnPref_mf1 "ui_framerate" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_ui_frame_rate", "UI frame rate") __regFnPref_mf1 "ui_framerate" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_ui_frame_rate", "UI inactive frame rate") __regFnPref_mf1 "ui_framerate_non_focus" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_ui_frame_rate", "UI inactive frame rate") __regFnPref_mf1 "ui_framerate_non_focus" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_interface_language", "Interface Language*") __regFnPref_mf1 "local" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_interface_language", "Interface Language*") __regFnPref_mf1 "local" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_ui_font", "Overwrite UI font") + "*" __regFnPref_mf1 "font_overwrite" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_ui_font", "Overwrite UI font") + "*" __regFnPref_mf1 "font_overwrite" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_windows_control", "Use Windows style window control.") __regFnPref_mf1 "panel_menu_right_control" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_windows_control", "Use Windows style window control.") __regFnPref_mf1 "panel_menu_right_control" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_ui_fix_window_size", "Fix Window size on start") __regFnPref_mf1 "window_fix" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_ui_fix_window_size", "Fix Window size on start") __regFnPref_mf1 "window_fix" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_ui_fix_width", "Fix width") __regFnPref_mf1 "window_fix_width" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_ui_fix_width", "Fix width") __regFnPref_mf1 "window_fix_width" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_ui_fix_height", "Fix height") __regFnPref_mf1 "window_fix_height" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_ui_fix_height", "Fix height") __regFnPref_mf1 "window_fix_height" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_supporter_icon", "Show supporter icon") __regFnPref_mf1 "show_supporter_icon" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_supporter_icon", "Show supporter icon") __regFnPref_mf1 "show_supporter_icon" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_add_node_remember", "Remember add node position") __regFnPref_mf1 "add_node_remember" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_add_node_remember", "Remember add node position") __regFnPref_mf1 "add_node_remember" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_connection_type", "Connection type") __regFnPref_mf1 "curve_connection_line" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_connection_type", "Connection type") __regFnPref_mf1 "curve_connection_line" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_connection_thickness", "Connection thickness") __regFnPref_mf1 "connection_line_width" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_connection_thickness", "Connection thickness") __regFnPref_mf1 "connection_line_width" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_connection_curve_smoothness", "Connection curve smoothness") __regFnPref_mf1 "connection_line_sample" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_connection_curve_smoothness", "Connection curve smoothness") __regFnPref_mf1 "connection_line_sample" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_connection_aa", "Connection anti aliasing") __regFnPref_mf1 "connection_line_aa" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_connection_aa", "Connection anti aliasing") __regFnPref_mf1 "connection_line_aa" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_connection_anim", "Connection line animation") __regFnPref_mf1 "connection_line_transition" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_connection_anim", "Connection line animation") __regFnPref_mf1 "connection_line_transition" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_graph_group_in_tab", "Open group in new tab") __regFnPref_mf1 "graph_open_group_in_tab" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_graph_group_in_tab", "Open group in new tab") __regFnPref_mf1 "graph_open_group_in_tab" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_graph_zoom_smoothing", "Graph zoom smoothing") __regFnPref_mf1 "graph_zoom_smoooth" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_graph_zoom_smoothing", "Graph zoom smoothing") __regFnPref_mf1 "graph_zoom_smoooth" __regFnPref_mf2
__regFnPref_mf0 __txtx("panel_graph_group_require_shift", "Hold Shift to enter group") __regFnPref_mf1 "panel_graph_group_require_shift" __regFnPref_mf2; __regFnPref_mf0 __txtx("panel_graph_group_require_shift", "Hold Shift to enter group") __regFnPref_mf1 "panel_graph_group_require_shift" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_use_alt", "Use ALT for") __regFnPref_mf1 "alt_picker" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_use_alt", "Use ALT for") __regFnPref_mf1 "alt_picker" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_preview_show_real_fps", "Show real fps") __regFnPref_mf1 "panel_preview_show_real_fps" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_preview_show_real_fps", "Show real fps") __regFnPref_mf1 "panel_preview_show_real_fps" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_inspector_focus_on_double_click", "Focus on double click") __regFnPref_mf1 "inspector_focus_on_double_click" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_inspector_focus_on_double_click", "Focus on double click") __regFnPref_mf1 "inspector_focus_on_double_click" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_collection_preview_speed", "Collection preview speed") __regFnPref_mf1 "collection_preview_speed" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_collection_preview_speed", "Collection preview speed") __regFnPref_mf1 "collection_preview_speed" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_warning_notification_time", "Warning notification time") __regFnPref_mf1 "notification_time" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_warning_notification_time", "Warning notification time") __regFnPref_mf1 "notification_time" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_widget_autocomplete_delay", "Code Autocomplete delay") __regFnPref_mf1 "widget_autocomplete_delay" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_widget_autocomplete_delay", "Code Autocomplete delay") __regFnPref_mf1 "widget_autocomplete_delay" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_widget_textbox_shake", "Textbox shake") __regFnPref_mf1 "textbox_shake" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_widget_textbox_shake", "Textbox shake") __regFnPref_mf1 "textbox_shake" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_widget_textbox_particles", "Textbox particles") __regFnPref_mf1 "textbox_particle" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_widget_textbox_particles", "Textbox particles") __regFnPref_mf1 "textbox_particle" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_node_param_show", "Show paramater on new node") __regFnPref_mf1 "node_param_show" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_node_param_show", "Show paramater on new node") __regFnPref_mf1 "node_param_show" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_node_param_width", "Default param width") __regFnPref_mf1 "node_param_width" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_node_param_width", "Default param width") __regFnPref_mf1 "node_param_width" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_node_3d_preview", "Preview surface size") __regFnPref_mf1 "node_3d_preview_size" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_node_3d_preview", "Preview surface size") __regFnPref_mf1 "node_3d_preview_size" __regFnPref_mf2
__regFnPref_mf0 __txtx("pref_file_watcher_delay", "File watcher delay (s)") __regFnPref_mf1 "file_watcher_delay" __regFnPref_mf2; __regFnPref_mf0 __txtx("pref_file_watcher_delay", "File watcher delay (s)") __regFnPref_mf1 "file_watcher_delay" __regFnPref_mf2
} }
#endregion #endregion

10
scripts/shader_functions/shader_functions.gml
View file

@ -224,10 +224,10 @@ function shader_set_palette(pal, pal_uni = "palette", amo_uni = "paletteAmount",
if(clear) DRAW_CLEAR; if(clear) DRAW_CLEAR;
switch(blend) { switch(blend) {
case BLEND.add : BLEND_ADD; break; case BLEND.add : BLEND_ADD break;
case BLEND.over: BLEND_OVERRIDE; break; case BLEND.over: BLEND_OVERRIDE break;
case BLEND.alpha: BLEND_ALPHA; break; case BLEND.alpha: BLEND_ALPHA break;
case BLEND.alphamulp: BLEND_ALPHA_MULP; break; case BLEND.alphamulp: BLEND_ALPHA_MULP break;
} }
if(shader == noone) if(shader == noone)
@ -243,7 +243,7 @@ function shader_set_palette(pal, pal_uni = "palette", amo_uni = "paletteAmount",
shader_set_i("interpolation", 0); shader_set_i("interpolation", 0);
BLEND_NORMAL; BLEND_NORMAL
surface_reset_target(); surface_reset_target();
gpu_set_tex_filter(false); gpu_set_tex_filter(false);

16
scripts/string_functions/string_functions.gml
View file

@ -243,7 +243,7 @@ function draw_text_match(_x, _y, _text, _search, _scale = 1) {
var run = 1; var run = 1;
var kchr = string_char_at(_search, 1); var kchr = string_char_at(_search, 1);
BLEND_ALPHA_MULP; BLEND_ALPHA_MULP
var aa = string_length(_text); var aa = string_length(_text);
var lw = string_width(_text) * _scale; var lw = string_width(_text) * _scale;
var tl = string_lower(_text); var tl = string_lower(_text);
@ -273,7 +273,7 @@ function draw_text_match(_x, _y, _text, _search, _scale = 1) {
j++; j++;
} }
BLEND_NORMAL; BLEND_NORMAL
draw_set_halign(ha); draw_set_halign(ha);
} }
@ -329,7 +329,7 @@ function draw_text_match_ext(_x, _y, _text, _w, _search) {
case fa_bottom : yy = _y - hh; break; case fa_bottom : yy = _y - hh; break;
} }
BLEND_ALPHA_MULP; BLEND_ALPHA_MULP
for( var i = 0, n = array_length(lines); i < n; i++ ) { for( var i = 0, n = array_length(lines); i < n; i++ ) {
var ll = lines[i]; var ll = lines[i];
var aa = string_length(ll); var aa = string_length(ll);
@ -362,7 +362,7 @@ function draw_text_match_ext(_x, _y, _text, _w, _search) {
yy += lh; yy += lh;
} }
BLEND_NORMAL; BLEND_NORMAL
draw_set_halign(ha); draw_set_halign(ha);
draw_set_valign(va); draw_set_valign(va);
@ -382,7 +382,7 @@ function draw_text_match_range(_x, _y, _text, _range, _scale = 1) {
draw_set_halign(fa_left); draw_set_halign(fa_left);
BLEND_ALPHA_MULP; BLEND_ALPHA_MULP
var aa = string_length(_text); var aa = string_length(_text);
var lw = string_width(_text) * _scale; var lw = string_width(_text) * _scale;
@ -403,7 +403,7 @@ function draw_text_match_range(_x, _y, _text, _range, _scale = 1) {
j++; j++;
} }
BLEND_NORMAL; BLEND_NORMAL
draw_set_halign(ha); draw_set_halign(ha);
} }
@ -456,7 +456,7 @@ function draw_text_match_range_ext(_x, _y, _text, _w, _range) {
var _rind = 1; var _rind = 1;
BLEND_ALPHA_MULP; BLEND_ALPHA_MULP
for( var i = 0, n = array_length(lines); i < n; i++ ) { for( var i = 0, n = array_length(lines); i < n; i++ ) {
var ll = lines[i]; var ll = lines[i];
var aa = string_length(ll); var aa = string_length(ll);
@ -481,7 +481,7 @@ function draw_text_match_range_ext(_x, _y, _text, _w, _range) {
yy += lh; yy += lh;
} }
BLEND_NORMAL; BLEND_NORMAL
draw_set_halign(ha); draw_set_halign(ha);
draw_set_valign(va); draw_set_valign(va);

6
scripts/surface_functions/surface_functions.gml
View file

@ -311,7 +311,7 @@ function surface_reset_target_override() { __surface_reset_target(); winwin_draw
var s = surface_create_valid(sw, sh, format); var s = surface_create_valid(sw, sh, format);
surface_set_target(s); surface_set_target(s);
BLEND_OVERRIDE; BLEND_OVERRIDE
DRAW_CLEAR DRAW_CLEAR
draw_sprite(spr, ind, sprite_get_xoffset(spr), sprite_get_yoffset(spr)); draw_sprite(spr, ind, sprite_get_xoffset(spr), sprite_get_yoffset(spr));
BLEND_NORMAL BLEND_NORMAL
@ -373,7 +373,7 @@ function surface_reset_target_override() { __surface_reset_target(); winwin_draw
surface_set_target(dst); surface_set_target(dst);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_surface_safe(src); draw_surface_safe(src);
BLEND_NORMAL BLEND_NORMAL
surface_reset_target(); surface_reset_target();
@ -390,7 +390,7 @@ function surface_reset_target_override() { __surface_reset_target(); winwin_draw
surface_set_target(destination); surface_set_target(destination);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE; BLEND_OVERRIDE
draw_surface_safe(surface); draw_surface_safe(surface);
BLEND_NORMAL BLEND_NORMAL
surface_reset_target(); surface_reset_target();

4
scripts/textBox/textBox.gml
View file

@ -615,7 +615,9 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
sliding = 2; sliding = 2;
if(hide < 3) { if(hide < 3) {
slider_object = instance_create_depth(rx + _x, ry + _y, -16000, slider_Slider, { w: _w, h: _h }); slider_object = instance_create_depth(rx + _x, ry + _y, -16000, slider_Slider);
slider_object.w = _w;
slider_object.h = _h;
slider_object.text = self; slider_object.text = self;
} }
} }