diff --git a/objects/o_dialog_add_multiple_images/o_dialog_add_multiple_images.yy b/objects/o_dialog_add_multiple_images/o_dialog_add_multiple_images.yy index 3c181eb22..b52452b4c 100644 --- a/objects/o_dialog_add_multiple_images/o_dialog_add_multiple_images.yy +++ b/objects/o_dialog_add_multiple_images/o_dialog_add_multiple_images.yy @@ -2,8 +2,8 @@ "$GMObject":"", "%Name":"o_dialog_add_multiple_images", "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%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":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"o_dialog_add_multiple_images", diff --git a/objects/o_dialog_add_node/o_dialog_add_node.yy b/objects/o_dialog_add_node/o_dialog_add_node.yy index 8970e52f6..5f475c077 100644 --- a/objects/o_dialog_add_node/o_dialog_add_node.yy +++ b/objects/o_dialog_add_node/o_dialog_add_node.yy @@ -2,9 +2,9 @@ "$GMObject":"", "%Name":"o_dialog_add_node", "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"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",}, + {"$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":1,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"o_dialog_add_node", diff --git a/objects/o_dialog_panel/Draw_64.gml b/objects/o_dialog_panel/Draw_64.gml index e6301de08..1bd2c62d7 100644 --- a/objects/o_dialog_panel/Draw_64.gml +++ b/objects/o_dialog_panel/Draw_64.gml @@ -32,7 +32,7 @@ if !ready exit; content.drawContent(panel); gpu_set_blendmode(bm_subtract); - draw_surface_safe(mask_surface, 0, 0); + draw_surface_safe(mask_surface); gpu_set_blendmode(bm_normal); surface_reset_target(); diff --git a/objects/o_main/o_main.yy b/objects/o_main/o_main.yy index c26819bb9..fa6e466ef 100644 --- a/objects/o_main/o_main.yy +++ b/objects/o_main/o_main.yy @@ -2,25 +2,25 @@ "$GMObject":"", "%Name":"o_main", "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":5,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":3,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":20,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":60,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":62,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":68,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":69,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":70,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":10,"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":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":5,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":3,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":20,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":60,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":62,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":68,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":69,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":70,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":7,"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",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":75,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":10,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"o_main", diff --git a/scripts/__node_3d_extrude/__node_3d_extrude.gml b/scripts/__node_3d_extrude/__node_3d_extrude.gml index 13fc9869a..65d36e6cf 100644 --- a/scripts/__node_3d_extrude/__node_3d_extrude.gml +++ b/scripts/__node_3d_extrude/__node_3d_extrude.gml @@ -141,7 +141,7 @@ function __Node_3D_Extrude(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro surface_set_shader(ts, sh_3d_extrude_filler); DRAW_CLEAR shader_set_f("dimension", ww, hh); - draw_surface_safe(_ins, 0, 0); + draw_surface_safe(_ins); surface_reset_shader(); _ins = ts; @@ -150,7 +150,7 @@ function __Node_3D_Extrude(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro surface_set_shader(ds, sh_3d_extrude_filler_depth); DRAW_CLEAR shader_set_f("dimension", ww, hh); - draw_surface_safe(_hei, 0, 0); + draw_surface_safe(_hei); surface_reset_shader(); _hei = ds; } @@ -485,7 +485,7 @@ function __Node_3D_Extrude(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro var ts = surface_create(ww, hh); surface_set_shader(ts, sh_3d_extrude_corner); shader_set_f("dimension", ww, hh); - draw_surface_safe(_ins, 0, 0); + draw_surface_safe(_ins); surface_reset_shader(); textures[_array_index] = ts; } else diff --git a/scripts/biterator/biterator.gml b/scripts/biterator/biterator.gml index cb0dd27ab..ef8fb0fc2 100644 --- a/scripts/biterator/biterator.gml +++ b/scripts/biterator/biterator.gml @@ -183,7 +183,7 @@ function Biterator(node) : VCT(node) constructor { var p = point_rotate(0, 0, _dim / 2, _dim / 2, ang); draw_surface_ext_safe(shap, p[0], p[1], 1, 1, ang, c_white, 1); } else - draw_surface(shap, 0, 0); + draw_surface_safe(shap); surface_reset_target(); surface_free(shap); diff --git a/scripts/blurSurface/blurSurface.gml b/scripts/blurSurface/blurSurface.gml index d3dfc0212..13d773a58 100644 --- a/scripts/blurSurface/blurSurface.gml +++ b/scripts/blurSurface/blurSurface.gml @@ -57,7 +57,7 @@ function surface_apply_gaussian(surface, size, bg = false, bg_c = c_white, sampl shader_set_i("overrideColor", overColor != noone); shader_set_f("overColor", colToVec4(overColor)); - draw_surface_safe(surface, 0, 0); + draw_surface_safe(surface); shader_reset(); surface_reset_target(); @@ -70,7 +70,7 @@ function surface_apply_gaussian(surface, size, bg = false, bg_c = c_white, sampl shader_set_i("size", _size_v); shader_set_i("horizontal", 0); - draw_surface_safe(__blur_hori, 0, 0); + draw_surface_safe(__blur_hori); shader_reset(); surface_reset_target(); gpu_set_tex_filter(false); diff --git a/scripts/canvas_freeform/canvas_freeform.gml b/scripts/canvas_freeform/canvas_freeform.gml index c8a1dde11..6be1fc7ad 100644 --- a/scripts/canvas_freeform/canvas_freeform.gml +++ b/scripts/canvas_freeform/canvas_freeform.gml @@ -44,7 +44,7 @@ function canvas_freeform_step(active, _x, _y, _s, _mx, _my, _draw) { #region draw_vertex(round(p2.x), round(p2.y)); } draw_primitive_end(); - draw_surface(drawing_surface, 0, 0); + draw_surface_safe(drawing_surface); surface_reset_target(); surface_set_shader(drawing_surface, sh_freeform_fill_cleanup); diff --git a/scripts/canvas_tool_brush_shape_iso/canvas_tool_brush_shape_iso.yy b/scripts/canvas_tool_brush_shape_iso/canvas_tool_brush_shape_iso.yy index 39a051afc..cfa973fb2 100644 --- a/scripts/canvas_tool_brush_shape_iso/canvas_tool_brush_shape_iso.yy +++ b/scripts/canvas_tool_brush_shape_iso/canvas_tool_brush_shape_iso.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"canvas_tool_brush_shape_iso", "isCompatibility":false, "isDnD":false, diff --git a/scripts/canvas_tool_corner/canvas_tool_corner.gml b/scripts/canvas_tool_corner/canvas_tool_corner.gml index d33ff825f..940f9c65b 100644 --- a/scripts/canvas_tool_corner/canvas_tool_corner.gml +++ b/scripts/canvas_tool_corner/canvas_tool_corner.gml @@ -29,7 +29,7 @@ function canvas_tool_corner() : canvas_tool_shader() constructor { surface_set_shader(temp_surface[0], sh_image_trace); shader_set_f("dimension", _dim); shader_set_i("diagonal", 0); - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); surface_reset_shader(); var _w = _dim[0], _h = _dim[1]; @@ -288,7 +288,7 @@ function canvas_tool_corner() : canvas_tool_shader() constructor { if(amount == 0) { surface_set_shader(preview_surface[1]); - draw_surface(preview_surface[0], 0, 0); + draw_surface_safe(preview_surface[0]); surface_reset_shader(); return; } @@ -372,10 +372,10 @@ function canvas_tool_corner() : canvas_tool_shader() constructor { surface_reset_shader(); surface_set_shader(preview_surface[1], noone); - draw_surface(preview_surface[0], 0, 0); + draw_surface_safe(preview_surface[0]); BLEND_MULTIPLY - draw_surface(temp_surface[1], 0, 0); + draw_surface_safe(temp_surface[1]); BLEND_NORMAL surface_reset_shader(); @@ -386,7 +386,7 @@ function canvas_tool_corner() : canvas_tool_shader() constructor { // shader_set_f("amount", amount); // shader_set_surface("base", _suf); - // draw_surface(preview_surface[0], 0, 0); + // draw_surface_safe(preview_surface[0]); // surface_reset_shader(); } diff --git a/scripts/canvas_tool_extrude/canvas_tool_extrude.gml b/scripts/canvas_tool_extrude/canvas_tool_extrude.gml index a612b5388..715889d73 100644 --- a/scripts/canvas_tool_extrude/canvas_tool_extrude.gml +++ b/scripts/canvas_tool_extrude/canvas_tool_extrude.gml @@ -32,7 +32,7 @@ function canvas_tool_extrude() : canvas_tool_shader() constructor { shader_set_f("itr", round(sqrt(_dx * _dx + _dy * _dy))); shader_set_color("color", CURRENT_COLOR); - draw_surface(preview_surface[0], 0, 0); + draw_surface_safe(preview_surface[0]); surface_reset_shader(); } diff --git a/scripts/canvas_tool_inset/canvas_tool_inset.gml b/scripts/canvas_tool_inset/canvas_tool_inset.gml index 531eb06d3..2d417834c 100644 --- a/scripts/canvas_tool_inset/canvas_tool_inset.gml +++ b/scripts/canvas_tool_inset/canvas_tool_inset.gml @@ -32,7 +32,7 @@ function canvas_tool_inset() : canvas_tool_shader() constructor { shader_set_f("itr", round(sqrt(_dx * _dx + _dy * _dy))); shader_set_color("color", CURRENT_COLOR); - draw_surface(preview_surface[0], 0, 0); + draw_surface_safe(preview_surface[0]); surface_reset_shader(); } diff --git a/scripts/canvas_tool_node/canvas_tool_node.gml b/scripts/canvas_tool_node/canvas_tool_node.gml index f43c7cc9d..65fee7451 100644 --- a/scripts/canvas_tool_node/canvas_tool_node.gml +++ b/scripts/canvas_tool_node/canvas_tool_node.gml @@ -191,7 +191,7 @@ function canvas_tool_node(canvas, node) : canvas_tool() constructor { surface_set_shader(maskedSurface); draw_surface_safe(_surf); BLEND_MULTIPLY - draw_surface_safe(canvas.tool_selection.selection_mask, 0, 0); + draw_surface_safe(canvas.tool_selection.selection_mask); BLEND_NORMAL surface_reset_shader(); diff --git a/scripts/canvas_tool_outline/canvas_tool_outline.gml b/scripts/canvas_tool_outline/canvas_tool_outline.gml index 49ee920f1..824bca816 100644 --- a/scripts/canvas_tool_outline/canvas_tool_outline.gml +++ b/scripts/canvas_tool_outline/canvas_tool_outline.gml @@ -23,7 +23,7 @@ function canvas_tool_outline() : canvas_tool_shader() constructor { shader_set_i("filter", array_create(9, 1)); shader_set_color("borderColor", CURRENT_COLOR); - draw_surface(preview_surface[0], 0, 0); + draw_surface_safe(preview_surface[0]); surface_reset_shader(); } @@ -43,7 +43,7 @@ function canvas_tool_outline() : canvas_tool_shader() constructor { shader_set_i("filter", array_create(9, 1)); shader_set_color("borderColor", c_white); - draw_surface(preview_surface[0], 0, 0); + draw_surface_safe(preview_surface[0]); surface_reset_shader(); mask_boundary[0] = mask_boundary_init[0] - _thck; @@ -59,7 +59,7 @@ function canvas_tool_outline() : canvas_tool_shader() constructor { shader_set_i("border", 0); shader_set_i("alpha", 1); - draw_surface(preview_surface[0], 0, 0); + draw_surface_safe(preview_surface[0]); surface_reset_shader(); mask_boundary[0] = mask_boundary_init[0] + _thck; diff --git a/scripts/canvas_tool_resize/canvas_tool_resize.gml b/scripts/canvas_tool_resize/canvas_tool_resize.gml index 53e3c043e..6d21b2dea 100644 --- a/scripts/canvas_tool_resize/canvas_tool_resize.gml +++ b/scripts/canvas_tool_resize/canvas_tool_resize.gml @@ -48,7 +48,7 @@ function canvas_tool_resize() : canvas_tool() constructor { BLEND_NORMAL surface_reset_target(); - draw_surface(overlay_surface, 0, 0); + draw_surface_safe(overlay_surface); draw_set_color(c_black); draw_rectangle(x0, y0, x1, y1, true); diff --git a/scripts/canvas_tool_selection/canvas_tool_selection.gml b/scripts/canvas_tool_selection/canvas_tool_selection.gml index f6ce14c08..da175c427 100644 --- a/scripts/canvas_tool_selection/canvas_tool_selection.gml +++ b/scripts/canvas_tool_selection/canvas_tool_selection.gml @@ -51,14 +51,14 @@ function canvas_tool_selection(selector = noone) : canvas_tool() constructor { surface_set_target(selection_surface); DRAW_CLEAR BLEND_OVERRIDE - draw_surface(surface, 0, 0); + draw_surface_safe(surface); BLEND_NORMAL surface_reset_target(); surface_set_target(selection_mask); DRAW_CLEAR BLEND_OVERRIDE - draw_surface(surface, 0, 0); + draw_surface_safe(surface); BLEND_NORMAL surface_reset_target(); @@ -140,13 +140,13 @@ function canvas_tool_selection(selector = noone) : canvas_tool() constructor { draw_surface_safe(_canvas_surface, -sel_x0, -sel_y0); BLEND_MULTIPLY - draw_surface_safe(_mask, 0, 0); + draw_surface_safe(_mask); BLEND_NORMAL surface_reset_target(); surface_set_target(selection_mask); DRAW_CLEAR - draw_surface_safe(_mask, 0, 0); + draw_surface_safe(_mask); surface_reset_target(); node.storeAction(); @@ -172,7 +172,7 @@ function canvas_tool_selection(selector = noone) : canvas_tool() constructor { surface_set_target(selection_surface); DRAW_CLEAR - draw_surface_safe(_canvas_surface, 0, 0); + draw_surface_safe(_canvas_surface); surface_reset_target(); surface_set_target(selection_mask); diff --git a/scripts/canvas_tool_skew/canvas_tool_skew.gml b/scripts/canvas_tool_skew/canvas_tool_skew.gml index f27ec5cb8..08f66b802 100644 --- a/scripts/canvas_tool_skew/canvas_tool_skew.gml +++ b/scripts/canvas_tool_skew/canvas_tool_skew.gml @@ -111,7 +111,7 @@ function canvas_tool_skew() : canvas_tool_shader() constructor { shader_set_color("color", CURRENT_COLOR); - draw_surface(preview_surface[0], 0, 0); + draw_surface_safe(preview_surface[0]); surface_reset_shader(); } diff --git a/scripts/d3d_light_point/d3d_light_point.gml b/scripts/d3d_light_point/d3d_light_point.gml index db769d1bc..20360d819 100644 --- a/scripts/d3d_light_point/d3d_light_point.gml +++ b/scripts/d3d_light_point/d3d_light_point.gml @@ -110,16 +110,16 @@ function __3dLightPoint() : __3dLight() constructor { draw_clear(c_black); gpu_set_blendmode_ext(bm_one, bm_one); - draw_surface(shadow_maps[0], 0, 0); + draw_surface_safe(shadow_maps[0]); draw_surface(shadow_maps[3], shadow_map_size, 0); shader_set(sh_channel_R2G); - draw_surface(shadow_maps[1], 0, 0); + draw_surface_safe(shadow_maps[1]); draw_surface(shadow_maps[4], shadow_map_size, 0); shader_reset(); shader_set(sh_channel_R2B); - draw_surface(shadow_maps[2], 0, 0); + draw_surface_safe(shadow_maps[2]); draw_surface(shadow_maps[5], shadow_map_size, 0); shader_reset(); diff --git a/scripts/fd_rectangle_set_target/fd_rectangle_set_target.gml b/scripts/fd_rectangle_set_target/fd_rectangle_set_target.gml index 9d9a51dbd..21ee0af31 100644 --- a/scripts/fd_rectangle_set_target/fd_rectangle_set_target.gml +++ b/scripts/fd_rectangle_set_target/fd_rectangle_set_target.gml @@ -22,7 +22,7 @@ function fd_rectangle_set_target(domain, type) { case FD_TARGET_TYPE.REPLACE_MATERIAL_ADVANCED: surface_set_target(sf_material_0_temporary); draw_enable_alphablend(false); - draw_surface(sf_material_0, 0, 0); + draw_surface_safe(sf_material_0); shader_set(sh_fd_replace_material_advanced_glsl); shader_set_uniform_f(shader_get_uniform(sh_fd_replace_material_advanced_glsl, "addend"), 0.5 + 0.5 * sf_material_texel_width, 0.5 + 0.5 * sf_material_texel_height); texture_set_stage(shader_get_sampler_index(sh_fd_replace_material_advanced_glsl, "texture_material_0"), surface_get_texture(sf_material_0)); @@ -40,7 +40,7 @@ function fd_rectangle_set_target(domain, type) { case FD_TARGET_TYPE.ADD_VELOCITY: surface_set_target(sf_velocity_temporary); draw_enable_alphablend(false); - draw_surface(sf_velocity, 0, 0); + draw_surface_safe(sf_velocity); shader_set(sh_fd_add_velocity_glsl); shader_set_uniform_f(shader_get_uniform(sh_fd_add_velocity_glsl, "addend"), 0.5 + 0.5 * sf_velocity_texel_width, 0.5 + 0.5 * sf_velocity_texel_height); diff --git a/scripts/fd_rectangle_update_material/fd_rectangle_update_material.gml b/scripts/fd_rectangle_update_material/fd_rectangle_update_material.gml index 25de921c2..96938de3e 100644 --- a/scripts/fd_rectangle_update_material/fd_rectangle_update_material.gml +++ b/scripts/fd_rectangle_update_material/fd_rectangle_update_material.gml @@ -29,7 +29,7 @@ function fd_rectangle_update_material(domain) { shader_set_uniform_f(shader_get_uniform(sh_fd_advect_material_a_8_glsl, "precalculated_1"), sf_material_texel_width * 0.5, sf_material_texel_height * 0.5, sf_material_texel_width * -0.5, sf_material_texel_height * -0.5); shader_set_uniform_f(shader_get_uniform(sh_fd_advect_material_a_8_glsl, "precalculated_2"), material_dissipation_type, material_dissipation_value, material_maccormack_weight * 0.5); - draw_surface(sf_material_0, 0, 0); + draw_surface_safe(sf_material_0); shader_reset(); surface_reset_target(); temporary = sf_material_0; sf_material_0 = sf_material_0_temporary; sf_material_0_temporary = temporary; @@ -47,7 +47,7 @@ function fd_rectangle_update_material(domain) { shader_set_uniform_f(shader_get_uniform(sh_fd_advect_material_rgba_8_glsl, "precalculated"), material_time_step * sf_material_texel_width, material_time_step * sf_material_texel_height); shader_set_uniform_f(shader_get_uniform(sh_fd_advect_material_rgba_8_glsl, "precalculated_1"), sf_material_texel_width * 0.5, sf_material_texel_height * 0.5, sf_material_texel_width * -0.5, sf_material_texel_height * -0.5); - draw_surface(sf_material_0, 0, 0); + draw_surface_safe(sf_material_0); shader_reset(); surface_reset_target(); temporary = sf_material_0; sf_material_0 = sf_material_0_temporary; sf_material_0_temporary = temporary; @@ -63,7 +63,7 @@ function fd_rectangle_update_material(domain) { shader_set_uniform_f(shader_get_uniform(sh_fd_advect_material_a_16_glsl, "precalculated_1"), sf_material_texel_width * 0.5, sf_material_texel_height * 0.5, sf_material_texel_width * -0.5, sf_material_texel_height * -0.5); shader_set_uniform_f(shader_get_uniform(sh_fd_advect_material_a_16_glsl, "precalculated_2"), material_dissipation_type, material_dissipation_value, material_maccormack_weight * 0.5); - draw_surface(sf_material_0, 0, 0); + draw_surface_safe(sf_material_0); shader_reset(); surface_reset_target(); temporary = sf_material_0; sf_material_0 = sf_material_0_temporary; sf_material_0_temporary = temporary; @@ -84,12 +84,12 @@ function fd_rectangle_update_material(domain) { surface_set_target(sf_material_0_temporary); shader_set_uniform_f(shader_get_uniform(sh_fd_advect_material_rgba_16_glsl, "target"), 0); - draw_surface(sf_material_0, 0, 0); + draw_surface_safe(sf_material_0); surface_reset_target(); surface_set_target(sf_material_1_temporary); shader_set_uniform_f(shader_get_uniform(sh_fd_advect_material_rgba_16_glsl, "target"), 1); - draw_surface(sf_material_0, 0, 0); + draw_surface_safe(sf_material_0); surface_reset_target(); temporary = sf_material_0; sf_material_0 = sf_material_0_temporary; sf_material_0_temporary = temporary; diff --git a/scripts/fd_rectangle_update_velocity/fd_rectangle_update_velocity.gml b/scripts/fd_rectangle_update_velocity/fd_rectangle_update_velocity.gml index 0c0ff2385..697ecd026 100644 --- a/scripts/fd_rectangle_update_velocity/fd_rectangle_update_velocity.gml +++ b/scripts/fd_rectangle_update_velocity/fd_rectangle_update_velocity.gml @@ -37,7 +37,7 @@ function fd_rectangle_update_velocity(domain) { shader_set_uniform_f(shader_get_uniform(sh_fd_advect_velocity_1_glsl, "acceleration"), acceleration_x, acceleration_y, acceleration_a, acceleration_b); break; } - draw_surface(sf_velocity, 0, 0); + draw_surface_safe(sf_velocity); shader_reset(); surface_reset_target(); temporary = sf_velocity; sf_velocity = sf_velocity_temporary; sf_velocity_temporary = temporary; @@ -56,7 +56,7 @@ function fd_rectangle_update_velocity(domain) { shader_set_uniform_f(shader_get_uniform(sh_fd_calculate_pressure_jacobi_glsl, "texel_size"), sf_pressure_texel_width, sf_pressure_texel_height); repeat (pressure_iteration_type) { surface_set_target(sf_pressure_temporary); - draw_surface(sf_pressure, 0, 0); + draw_surface_safe(sf_pressure); surface_reset_target(); temporary = sf_pressure; sf_pressure = sf_pressure_temporary; sf_pressure_temporary = temporary; } @@ -68,7 +68,7 @@ function fd_rectangle_update_velocity(domain) { for (var i = 0; i < length; ++i) { if (pressure_relaxation_parameter[i] != -1) shader_set_uniform_f(shader_get_uniform(sh_fd_calculate_pressure_srj_glsl, "precalculated"), 1 - pressure_relaxation_parameter[i], 0.25 * pressure_relaxation_parameter[i]); surface_set_target(sf_pressure_temporary); - draw_surface(sf_pressure, 0, 0); + draw_surface_safe(sf_pressure); surface_reset_target(); temporary = sf_pressure; sf_pressure = sf_pressure_temporary; sf_pressure_temporary = temporary; } @@ -80,7 +80,7 @@ function fd_rectangle_update_velocity(domain) { shader_set(sh_fd_subtract_pressure_gradient_glsl); texture_set_stage(shader_get_sampler_index(sh_fd_subtract_pressure_gradient_glsl, "texture_pressure"), surface_get_texture(sf_pressure)); shader_set_uniform_f(shader_get_uniform(sh_fd_subtract_pressure_gradient_glsl, "texel_size"), sf_pressure_texel_width, sf_pressure_texel_height); - draw_surface(sf_velocity, 0, 0); + draw_surface_safe(sf_velocity); shader_reset(); surface_reset_target(); temporary = sf_velocity; sf_velocity = sf_velocity_temporary; sf_velocity_temporary = temporary; diff --git a/scripts/hotkey_data/hotkey_data.yy b/scripts/hotkey_data/hotkey_data.yy index dd2294ad7..09b491cdd 100644 --- a/scripts/hotkey_data/hotkey_data.yy +++ b/scripts/hotkey_data/hotkey_data.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"hotkey_data", "isCompatibility":false, "isDnD":false, diff --git a/scripts/load_function/load_function.yy b/scripts/load_function/load_function.yy index 57deaf3e9..1fd07be7d 100644 --- a/scripts/load_function/load_function.yy +++ b/scripts/load_function/load_function.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"load_function", "isCompatibility":false, "isDnD":false, diff --git a/scripts/mask_function/mask_function.gml b/scripts/mask_function/mask_function.gml index 4bdb1a7f1..c45965476 100644 --- a/scripts/mask_function/mask_function.gml +++ b/scripts/mask_function/mask_function.gml @@ -33,7 +33,7 @@ function mask_modify(mask, invert = false, feather = 0) { #region surface_set_shader(__temp_mask, sh_mask_invert); shader_set_i("invert", invert); - draw_surface(mask, 0, 0); + draw_surface_safe(mask); surface_reset_shader(); if(feather > 0) { diff --git a/scripts/node_2d_light/node_2d_light.gml b/scripts/node_2d_light/node_2d_light.gml index 24656d351..2b22e4120 100644 --- a/scripts/node_2d_light/node_2d_light.gml +++ b/scripts/node_2d_light/node_2d_light.gml @@ -162,7 +162,7 @@ function Node_2D_light(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) surface_set_target(_outSurf); if(_output_index == 0) { DRAW_CLEAR - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); } else draw_clear_alpha(c_black, 1); diff --git a/scripts/node_3d_camera/node_3d_camera.gml b/scripts/node_3d_camera/node_3d_camera.gml index c10ad682b..6d37078f4 100644 --- a/scripts/node_3d_camera/node_3d_camera.gml +++ b/scripts/node_3d_camera/node_3d_camera.gml @@ -365,10 +365,10 @@ function Node_3D_Camera(_x, _y, _group = noone) : Node_3D_Object(_x, _y, _group) BLEND_ALPHA if(_dbg) { - draw_surface_safe(_bgSurf, 0, 0); + draw_surface_safe(_bgSurf); surface_free(_bgSurf); } - draw_surface_safe(_render, 0, 0); + draw_surface_safe(_render); if(deferData) { BLEND_MULTIPLY diff --git a/scripts/node_FLIP_render/node_FLIP_render.gml b/scripts/node_FLIP_render/node_FLIP_render.gml index 291fc0414..fd5256256 100644 --- a/scripts/node_FLIP_render/node_FLIP_render.gml +++ b/scripts/node_FLIP_render/node_FLIP_render.gml @@ -243,10 +243,10 @@ function Node_FLIP_Render(_x, _y, _group = noone) : Node(_x, _y, _group) constru if(_thr) { shader_set(sh_FLIP_render_threshold); shader_set_f("threshold", 1 - _bln); - draw_surface(temp_surface[0], 0, 0); + draw_surface_safe(temp_surface[0]); shader_reset(); } else - draw_surface(temp_surface[0], 0, 0); + draw_surface_safe(temp_surface[0]); if(_obs) for( var i = 0, n = array_length(domain.obstracles); i < n; i++ ) diff --git a/scripts/node_FXAA/node_FXAA.gml b/scripts/node_FXAA/node_FXAA.gml index 096d66a86..acc0d17c3 100644 --- a/scripts/node_FXAA/node_FXAA.gml +++ b/scripts/node_FXAA/node_FXAA.gml @@ -29,7 +29,7 @@ function Node_FXAA(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons shader_set_f("cornerDis", _data[2]); shader_set_f("mixAmo", _data[3]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); gpu_set_tex_filter(false); surface_reset_shader(); diff --git a/scripts/node_active_canvas/node_active_canvas.gml b/scripts/node_active_canvas/node_active_canvas.gml index 764a1a119..1a873e2c9 100644 --- a/scripts/node_active_canvas/node_active_canvas.gml +++ b/scripts/node_active_canvas/node_active_canvas.gml @@ -90,7 +90,7 @@ function Node_Active_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) const surface_set_target(_surf); DRAW_CLEAR - draw_surface(temp_surface[0], 0, 0); + draw_surface_safe(temp_surface[0]); if(!is_surface(_bsurf)) { if(IS_FIRST_FRAME || brush_prev == noone) diff --git a/scripts/node_alpha_cutoff/node_alpha_cutoff.gml b/scripts/node_alpha_cutoff/node_alpha_cutoff.gml index 724126df2..0031cf9b3 100644 --- a/scripts/node_alpha_cutoff/node_alpha_cutoff.gml +++ b/scripts/node_alpha_cutoff/node_alpha_cutoff.gml @@ -36,7 +36,7 @@ function Node_Alpha_Cutoff(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro shader_set(sh_alpha_cutoff); shader_set_uniform_f(shader_get_uniform(sh_alpha_cutoff, "cutoff"), _data[1]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); shader_reset(); BLEND_NORMAL; diff --git a/scripts/node_alpha_grey/node_alpha_grey.gml b/scripts/node_alpha_grey/node_alpha_grey.gml index ce92cf2f7..e3262a66d 100644 --- a/scripts/node_alpha_grey/node_alpha_grey.gml +++ b/scripts/node_alpha_grey/node_alpha_grey.gml @@ -16,7 +16,7 @@ function Node_Alpha_Grey(_x, _y, _group = noone) : Node_Processor(_x, _y, _group static processData = function(_outSurf, _data, _output_index, _array_index) { #region surface_set_shader(_outSurf, sh_alpha_grey); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); return _outSurf; diff --git a/scripts/node_alpha_hash/node_alpha_hash.gml b/scripts/node_alpha_hash/node_alpha_hash.gml index ce9497a66..0472ea69e 100644 --- a/scripts/node_alpha_hash/node_alpha_hash.gml +++ b/scripts/node_alpha_hash/node_alpha_hash.gml @@ -28,7 +28,7 @@ function Node_Alpha_Hash(_x, _y, _group = noone) : Node_Processor(_x, _y, _group 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_array_safe(uniform_dit, dither8); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); shader_reset(); BLEND_NORMAL; diff --git a/scripts/node_array_pin/node_array_pin.yy b/scripts/node_array_pin/node_array_pin.yy index 1290dabb7..b404c6cab 100644 --- a/scripts/node_array_pin/node_array_pin.yy +++ b/scripts/node_array_pin/node_array_pin.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"node_array_pin", "isCompatibility":false, "isDnD":false, diff --git a/scripts/node_atlas/node_atlas.gml b/scripts/node_atlas/node_atlas.gml index d98345801..6b7ca89d5 100644 --- a/scripts/node_atlas/node_atlas.gml +++ b/scripts/node_atlas/node_atlas.gml @@ -35,7 +35,7 @@ function Node_Atlas(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con repeat(_itr) { surface_set_shader(temp_surface[_bg], sh_atlas); shader_set_f("dimension", _dim); - draw_surface(temp_surface[!_bg], 0, 0); + draw_surface_safe(temp_surface[!_bg]); surface_reset_shader(); _bg = !_bg; diff --git a/scripts/node_average/node_average.gml b/scripts/node_average/node_average.gml index 010142b12..65c0935a4 100644 --- a/scripts/node_average/node_average.gml +++ b/scripts/node_average/node_average.gml @@ -51,7 +51,7 @@ function Node_Average(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c for( var i = 0; i <= lop; i++ ) { surface_set_shader(_Surf[_ind], sh_average); shader_set_f("dimension", side); - draw_surface_safe(_Surf[!_ind], 0, 0); + draw_surface_safe(_Surf[!_ind]); surface_reset_shader(); _ind = !_ind; diff --git a/scripts/node_blend/node_blend.gml b/scripts/node_blend/node_blend.gml index be4cb4465..1ed557d32 100644 --- a/scripts/node_blend/node_blend.gml +++ b/scripts/node_blend/node_blend.gml @@ -237,7 +237,7 @@ function Node_Blend(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con } else if(_outp == NODE_BLEND_OUTPUT.foreground) { surface_set_shader(_foreDraw, noone,, BLEND.over); - draw_surface_safe(_fore, 0, 0); + draw_surface_safe(_fore); surface_reset_shader(); surface_set_shader(_backDraw, noone,, BLEND.over); diff --git a/scripts/node_blend_edge/node_blend_edge.gml b/scripts/node_blend_edge/node_blend_edge.gml index 6dbce05aa..760aa814d 100644 --- a/scripts/node_blend_edge/node_blend_edge.gml +++ b/scripts/node_blend_edge/node_blend_edge.gml @@ -61,13 +61,13 @@ function Node_Blend_Edge(_x, _y, _group = noone) : Node_Processor(_x, _y, _group shader_set_f("blend" , clamp(_data[6], 0.001, 0.999)); shader_set_f("smooth" , _data[7]); - draw_surface(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); surface_set_shader(_outSurf, sh_blend_edge); shader_set_i("edge" , 1); - draw_surface(temp_surface[0], 0, 0); + draw_surface_safe(temp_surface[0]); surface_reset_shader(); } else { @@ -77,7 +77,7 @@ function Node_Blend_Edge(_x, _y, _group = noone) : Node_Processor(_x, _y, _group shader_set_i("edge" , _edg - 1); shader_set_f("blend" , clamp(_data[6], 0.001, 0.999)); - draw_surface(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); } diff --git a/scripts/node_blur/node_blur.gml b/scripts/node_blur/node_blur.gml index 8d30dd008..c4c244254 100644 --- a/scripts/node_blur/node_blur.gml +++ b/scripts/node_blur/node_blur.gml @@ -92,7 +92,7 @@ function Node_Blur(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons shader_set_f("overColor", colToVec4(_overc)); shader_set_f("angle", degtorad(_dirr)); - draw_surface_safe(_surf, 0, 0); + draw_surface_safe(_surf); shader_reset(); surface_reset_target(); @@ -106,7 +106,7 @@ function Node_Blur(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons shader_set_i("size", _size_v); shader_set_i("horizontal", 0); - draw_surface_safe(temp_surface[0], 0, 0); + draw_surface_safe(temp_surface[0]); shader_reset(); surface_reset_target(); @@ -114,7 +114,7 @@ function Node_Blur(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons surface_set_target(_outSurf); draw_clear_alpha(_isovr? _overc : 0, 0); - draw_surface(temp_surface[1], 0, 0); + draw_surface_safe(temp_surface[1]); surface_reset_target(); BLEND_NORMAL; diff --git a/scripts/node_blur_bokeh/node_blur_bokeh.gml b/scripts/node_blur_bokeh/node_blur_bokeh.gml index 762e9a72e..598f04c41 100644 --- a/scripts/node_blur_bokeh/node_blur_bokeh.gml +++ b/scripts/node_blur_bokeh/node_blur_bokeh.gml @@ -47,7 +47,7 @@ function Node_Blur_Bokeh(_x, _y, _group = noone) : Node_Processor(_x, _y, _group shader_set_f("dimension", surface_get_width_safe(_data[0]), surface_get_height_safe(_data[0])); shader_set_f_map("strength", _data[1], _data[8], inputs[| 1]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_blur_contrast/node_blur_contrast.gml b/scripts/node_blur_contrast/node_blur_contrast.gml index 74a962427..94f9c3a37 100644 --- a/scripts/node_blur_contrast/node_blur_contrast.gml +++ b/scripts/node_blur_contrast/node_blur_contrast.gml @@ -56,7 +56,7 @@ function Node_Blur_Contrast(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr shader_set_f("treshold", _tres); shader_set_i("gamma", _gam); - draw_surface_safe(_surf, 0, 0); + draw_surface_safe(_surf); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_blur_directional/node_blur_directional.gml b/scripts/node_blur_directional/node_blur_directional.gml index 836de68f4..bb23831d6 100644 --- a/scripts/node_blur_directional/node_blur_directional.gml +++ b/scripts/node_blur_directional/node_blur_directional.gml @@ -79,7 +79,7 @@ function Node_Blur_Directional(_x, _y, _group = noone) : Node_Processor(_x, _y, shader_set_i("gamma", _data[12]); shader_set_i("sampleMode", struct_try_get(attributes, "oversample")); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_blur_slope/node_blur_slope.gml b/scripts/node_blur_slope/node_blur_slope.gml index 9464cfd3e..e0c3fd1be 100644 --- a/scripts/node_blur_slope/node_blur_slope.gml +++ b/scripts/node_blur_slope/node_blur_slope.gml @@ -61,7 +61,7 @@ function Node_Blur_Slope(_x, _y, _group = noone) : Node_Processor(_x, _y, _group shader_set_i("sampleMode", struct_try_get(attributes, "oversample")); shader_set_i("gamma", _data[11]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_bw/node_bw.gml b/scripts/node_bw/node_bw.gml index 6db945165..218abd4a7 100644 --- a/scripts/node_bw/node_bw.gml +++ b/scripts/node_bw/node_bw.gml @@ -53,7 +53,7 @@ function Node_BW(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constr surface_set_shader(_outSurf, sh_bw); shader_set_f_map("brightness", _data[1], _data[ 9], inputs[| 1]); shader_set_f_map("contrast", _data[2], _data[10], inputs[| 2]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_canvas/node_canvas.gml b/scripts/node_canvas/node_canvas.gml index 182c03499..6b151695e 100644 --- a/scripts/node_canvas/node_canvas.gml +++ b/scripts/node_canvas/node_canvas.gml @@ -584,7 +584,7 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor var _newCanvas = surface_create(_dim[0], _dim[1]); surface_set_target(_newCanvas); DRAW_CLEAR - draw_surface(_canvas_surface, 0, 0); + draw_surface_safe(_canvas_surface); surface_reset_target(); setCanvasSurface(_newCanvas, index); @@ -649,7 +649,7 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor if(tool_attribute.mirror[1] && tool_attribute.mirror[2]) draw_surface_ext_safe(drawing_surface, _spx * 2 + _spw - _spx, _spy * 2 + _sph - _spy, -1, -1); BLEND_MULTIPLY - draw_surface(tool_selection.selection_mask, 0, 0); + draw_surface_safe(tool_selection.selection_mask); BLEND_NORMAL surface_reset_target(); @@ -663,7 +663,7 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor DRAW_CLEAR BLEND_OVERRIDE - draw_surface(drawing_surface, 0, 0); + draw_surface_safe(drawing_surface); BLEND_ALPHA if(tool_attribute.mirror[0] == false) { @@ -853,7 +853,7 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor if(_tool) _tool.drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); surface_set_shader(preview_draw_surface, noone,, BLEND.alpha); - draw_surface_safe(_drawing_surface, 0, 0); + draw_surface_safe(_drawing_surface); if(tool_selection.is_selected) { var _spx = tool_selection.selection_position[0]; @@ -1054,7 +1054,7 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor surface_set_shader(output_surface[0], noone,, BLEND.alpha); if(_bgr && is_surface(_bg)) draw_surface_stretched_ext(_bg, 0, 0, _dim[0], _dim[1], c_white, _bga); - draw_surface_safe(_canvas_surface, 0, 0); + draw_surface_safe(_canvas_surface); surface_reset_shader(); outputs[| 0].setValue(output_surface[0]); @@ -1067,7 +1067,7 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor surface_set_shader(output_surface[i], noone,, BLEND.alpha); if(_bgr && is_surface(_bgArray)) draw_surface_stretched_ext(_bgArray, 0, 0, _dim[0], _dim[1], c_white, _bga); - draw_surface_safe(_canvas_surface, 0, 0); + draw_surface_safe(_canvas_surface); surface_reset_shader(); } diff --git a/scripts/node_color_remove/node_color_remove.gml b/scripts/node_color_remove/node_color_remove.gml index 097a7954c..f1989bfde 100644 --- a/scripts/node_color_remove/node_color_remove.gml +++ b/scripts/node_color_remove/node_color_remove.gml @@ -59,7 +59,7 @@ function Node_Color_Remove(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro shader_set_f_map("treshold", _data[2], _data[10], inputs[| 2]); shader_set_i("invert", _data[6]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_color_replace/node_color_replace.gml b/scripts/node_color_replace/node_color_replace.gml index e36b39157..48b50bfb9 100644 --- a/scripts/node_color_replace/node_color_replace.gml +++ b/scripts/node_color_replace/node_color_replace.gml @@ -71,7 +71,7 @@ function Node_Color_replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr shader_set_i("useMask", is_surface(msk)); shader_set_surface("mask", msk); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_colors_replace/node_colors_replace.gml b/scripts/node_colors_replace/node_colors_replace.gml index 80660a09a..7df5838bd 100644 --- a/scripts/node_colors_replace/node_colors_replace.gml +++ b/scripts/node_colors_replace/node_colors_replace.gml @@ -294,7 +294,7 @@ function Node_Colors_Replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _g shader_set_i("useMask", is_surface(msk)); shader_set_surface("mask", msk); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); diff --git a/scripts/node_cross_section/node_cross_section.gml b/scripts/node_cross_section/node_cross_section.gml index ca86cc6c9..7a35ce933 100644 --- a/scripts/node_cross_section/node_cross_section.gml +++ b/scripts/node_cross_section/node_cross_section.gml @@ -67,7 +67,7 @@ function Node_Cross_Section(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr shader_set_i("aa", _aa); shader_set_i("mode", _mode); - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); surface_reset_shader(); return _outSurf; diff --git a/scripts/node_data/node_data.yy b/scripts/node_data/node_data.yy index 5779d766f..627c2ef23 100644 --- a/scripts/node_data/node_data.yy +++ b/scripts/node_data/node_data.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"node_data", "isCompatibility":false, "isDnD":false, diff --git a/scripts/node_dilate/node_dilate.gml b/scripts/node_dilate/node_dilate.gml index fb67c80a4..fe8bd3d2a 100644 --- a/scripts/node_dilate/node_dilate.gml +++ b/scripts/node_dilate/node_dilate.gml @@ -83,7 +83,7 @@ function Node_Dilate(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co shader_set_f_map("radius", _data[3], _data[12], inputs[| 3]); shader_set_i("sampleMode", sam); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_edge_detect/node_edge_detect.gml b/scripts/node_edge_detect/node_edge_detect.gml index 120c00564..f70621725 100644 --- a/scripts/node_edge_detect/node_edge_detect.gml +++ b/scripts/node_edge_detect/node_edge_detect.gml @@ -53,7 +53,7 @@ function Node_Edge_Detect(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou shader_set_uniform_f_array_safe(uniform_dim, [surface_get_width_safe(_data[0]), surface_get_height_safe(_data[0])]); shader_set_uniform_i(uniform_filter, ft); shader_set_uniform_i(uniform_sam, ov); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); shader_reset(); BLEND_NORMAL; diff --git a/scripts/node_erode/node_erode.gml b/scripts/node_erode/node_erode.gml index 1439508a6..470b00e34 100644 --- a/scripts/node_erode/node_erode.gml +++ b/scripts/node_erode/node_erode.gml @@ -53,7 +53,7 @@ function Node_Erode(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con shader_set_f_map("size" , _data[1], _data[10], inputs[| 1]); shader_set_i("border" , _data[2]); shader_set_i("alpha" , _data[3]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_flood_fill/node_flood_fill.gml b/scripts/node_flood_fill/node_flood_fill.gml index 3ada50ba8..e63e84245 100644 --- a/scripts/node_flood_fill/node_flood_fill.gml +++ b/scripts/node_flood_fill/node_flood_fill.gml @@ -81,7 +81,7 @@ function Node_Flood_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _group shader_set_f("color", colaToVec4(_filC)); shader_set_f("thres", _thr); BLEND_OVERRIDE - draw_surface_safe(inSurf, 0, 0); + draw_surface_safe(inSurf); BLEND_NORMAL shader_reset(); @@ -99,7 +99,7 @@ function Node_Flood_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _group surface_set_shader(temp_surface[ind], sh_flood_fill_it); shader_set_f("dimension", [ sw, sh ]); shader_set_i("diagonal", _dia); - draw_surface_safe(temp_surface[!ind], 0, 0); + draw_surface_safe(temp_surface[!ind]); surface_reset_shader(); } @@ -108,7 +108,7 @@ function Node_Flood_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _group shader_set_surface("mask", temp_surface[ind]); shader_set_i("blend", _bnd); - draw_surface_safe(inSurf, 0, 0); + draw_surface_safe(inSurf); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_gamma_map/node_gamma_map.gml b/scripts/node_gamma_map/node_gamma_map.gml index 896298a5b..31ef7a682 100644 --- a/scripts/node_gamma_map/node_gamma_map.gml +++ b/scripts/node_gamma_map/node_gamma_map.gml @@ -19,7 +19,7 @@ function Node_Gamma_Map(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) surface_set_shader(_outSurf, sh_gamma_map); shader_set_i("invert", _data[1]) - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); return _outSurf; diff --git a/scripts/node_grey_alpha/node_grey_alpha.gml b/scripts/node_grey_alpha/node_grey_alpha.gml index e1b2c8f48..bb7eccd34 100644 --- a/scripts/node_grey_alpha/node_grey_alpha.gml +++ b/scripts/node_grey_alpha/node_grey_alpha.gml @@ -31,7 +31,7 @@ function Node_Grey_Alpha(_x, _y, _group = noone) : Node_Processor(_x, _y, _group shader_set_i("replace", _replace); shader_set_color("color", _color); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); return _outSurf; diff --git a/scripts/node_greyscale/node_greyscale.gml b/scripts/node_greyscale/node_greyscale.gml index 841d930f4..911fa083b 100644 --- a/scripts/node_greyscale/node_greyscale.gml +++ b/scripts/node_greyscale/node_greyscale.gml @@ -51,7 +51,7 @@ function Node_Greyscale(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) surface_set_shader(_outSurf, sh_greyscale); shader_set_f_map("brightness", _data[1], _data[ 9], inputs[| 1]); shader_set_f_map("contrast", _data[2], _data[10], inputs[| 2]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_image_grid/node_image_grid.gml b/scripts/node_image_grid/node_image_grid.gml index 76452d154..838970ac1 100644 --- a/scripts/node_image_grid/node_image_grid.gml +++ b/scripts/node_image_grid/node_image_grid.gml @@ -123,7 +123,7 @@ function Node_Image_Grid(_x, _y, _group = noone) : Node(_x, _y, _group) construc shader_set_f("fdimension", sw, sh); shader_set_f("position", sx + _padd[PADDING.left], sy + _padd[PADDING.top]); - draw_surface(temp_surface[ppind], 0, 0); + draw_surface_safe(temp_surface[ppind]); surface_reset_shader(); ppind = !ppind; @@ -140,7 +140,7 @@ function Node_Image_Grid(_x, _y, _group = noone) : Node(_x, _y, _group) construc } surface_set_shader(_outSurf, noone); - draw_surface(temp_surface[ppind], 0, 0); + draw_surface_safe(temp_surface[ppind]); surface_reset_shader(); outputs[| 0].setValue(_outSurf); diff --git a/scripts/node_image_sheet/node_image_sheet.gml b/scripts/node_image_sheet/node_image_sheet.gml index def709d6b..3a8b2986d 100644 --- a/scripts/node_image_sheet/node_image_sheet.gml +++ b/scripts/node_image_sheet/node_image_sheet.gml @@ -341,7 +341,7 @@ function Node_Image_Sheet(_x, _y, _group = noone) : Node(_x, _y, _group) constru shader_set_color("color", _flcl); shader_set_i("empty", !_fltp); - draw_surface(_inSurf, 0, 0); + draw_surface_safe(_inSurf); surface_reset_shader(); } diff --git a/scripts/node_invert/node_invert.gml b/scripts/node_invert/node_invert.gml index 8d1ddee65..1657c3af8 100644 --- a/scripts/node_invert/node_invert.gml +++ b/scripts/node_invert/node_invert.gml @@ -34,7 +34,7 @@ function Node_Invert(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co BLEND_OVERRIDE; shader_set(sh_invert); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); shader_reset(); BLEND_NORMAL; diff --git a/scripts/node_level_selector/node_level_selector.gml b/scripts/node_level_selector/node_level_selector.gml index 050bc080a..f428c19a7 100644 --- a/scripts/node_level_selector/node_level_selector.gml +++ b/scripts/node_level_selector/node_level_selector.gml @@ -112,7 +112,7 @@ function Node_Level_Selector(_x, _y, _group = noone) : Node_Processor(_x, _y, _g shader_set_f_map("range" , _data[2], _data[10], inputs[| 2]); shader_set_i("keep", _data[11]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_lovify/node_lovify.gml b/scripts/node_lovify/node_lovify.gml index 110538139..1270fa747 100644 --- a/scripts/node_lovify/node_lovify.gml +++ b/scripts/node_lovify/node_lovify.gml @@ -49,7 +49,7 @@ function Node_Lovify(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co DRAW_CLEAR shader_set(sh_lovify); - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); shader_reset(); repeat(amo) { diff --git a/scripts/node_mesh_warp/node_mesh_warp.gml b/scripts/node_mesh_warp/node_mesh_warp.gml index ac19f99ec..b4729a0c6 100644 --- a/scripts/node_mesh_warp/node_mesh_warp.gml +++ b/scripts/node_mesh_warp/node_mesh_warp.gml @@ -451,7 +451,7 @@ function Node_Mesh_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) shader_set_uniform_f_array_safe(uniform_dim, [ww, hh]); shader_set_uniform_f_array_safe(uniform_sam, [gw, gh]); - draw_surface_safe(surf, 0, 0); + draw_surface_safe(surf); shader_reset(); surface_reset_target(); } #endregion diff --git a/scripts/node_mk_blinker/node_mk_blinker.gml b/scripts/node_mk_blinker/node_mk_blinker.gml index c5eb90b63..fdd5a5765 100644 --- a/scripts/node_mk_blinker/node_mk_blinker.gml +++ b/scripts/node_mk_blinker/node_mk_blinker.gml @@ -87,7 +87,7 @@ function Node_MK_Blinker(_x, _y, _group = noone) : Node_Processor(_x, _y, _group shader_set_i("useMask", _umask); shader_set_surface("mask", _mask); - draw_surface(temp_surface[ind], 0, 0); + draw_surface_safe(temp_surface[ind]); surface_reset_shader(); ind = !ind; @@ -104,7 +104,7 @@ function Node_MK_Blinker(_x, _y, _group = noone) : Node_Processor(_x, _y, _group surface_set_target(light_only[_array_index]); DRAW_CLEAR BLEND_OVERRIDE - draw_surface(temp_surface[2], 0, 0); + draw_surface_safe(temp_surface[2]); BLEND_NORMAL surface_reset_target(); @@ -114,7 +114,7 @@ function Node_MK_Blinker(_x, _y, _group = noone) : Node_Processor(_x, _y, _group DRAW_CLEAR BLEND_OVERRIDE - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); if(_glow) { BLEND_ADD @@ -122,7 +122,7 @@ function Node_MK_Blinker(_x, _y, _group = noone) : Node_Processor(_x, _y, _group } BLEND_ALPHA_MULP - draw_surface(temp_surface[2], 0, 0); + draw_surface_safe(temp_surface[2]); BLEND_NORMAL surface_reset_target(); diff --git a/scripts/node_mk_flag/node_mk_flag.gml b/scripts/node_mk_flag/node_mk_flag.gml index 1d571dc0d..9b5b53cd9 100644 --- a/scripts/node_mk_flag/node_mk_flag.gml +++ b/scripts/node_mk_flag/node_mk_flag.gml @@ -286,7 +286,7 @@ function Node_MK_Flag(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c shader_set_i("shadowInv", _shdInv); shader_set_i("side", _pinn > 1); - draw_surface(temp_surface[0], 0, 0); + draw_surface_safe(temp_surface[0]); surface_reset_shader(); return _outSurf; diff --git a/scripts/node_mk_flare/node_mk_flare.gml b/scripts/node_mk_flare/node_mk_flare.gml index 11911a4f2..329821c45 100644 --- a/scripts/node_mk_flare/node_mk_flare.gml +++ b/scripts/node_mk_flare/node_mk_flare.gml @@ -574,11 +574,11 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) if(_bg) { BLEND_OVERRIDE - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); } BLEND_ADD - draw_surface(flares[_array_index], 0, 0); + draw_surface_safe(flares[_array_index]); BLEND_NORMAL surface_reset_target(); diff --git a/scripts/node_mk_rain/node_mk_rain.gml b/scripts/node_mk_rain/node_mk_rain.gml index a1362ea09..794b5dce0 100644 --- a/scripts/node_mk_rain/node_mk_rain.gml +++ b/scripts/node_mk_rain/node_mk_rain.gml @@ -118,7 +118,7 @@ function Node_MK_Rain(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c surface_set_target(_outSurf); DRAW_CLEAR - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); var _lcc = _cc; if(_afad) BLEND_ADD diff --git a/scripts/node_mk_saber/node_mk_saber.gml b/scripts/node_mk_saber/node_mk_saber.gml index f1bb95eb1..e377c0122 100644 --- a/scripts/node_mk_saber/node_mk_saber.gml +++ b/scripts/node_mk_saber/node_mk_saber.gml @@ -259,7 +259,7 @@ function Node_MK_Saber(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) if(_gint > 0) { #region surface_set_target(temp_surface[1]); draw_clear(c_black); - draw_surface(temp_surface[0], 0, 0); + draw_surface_safe(temp_surface[0]); surface_reset_target(); temp_surface[2] = surface_apply_gaussian(temp_surface[1], _grad, false, 0, 1); @@ -273,12 +273,12 @@ function Node_MK_Saber(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) shader_set(sh_mk_saber_glow); shader_set_color("color", _colr.eval(1)); shader_set_f("intensity", _gint); - draw_surface(temp_surface[2], 0, 0); + draw_surface_safe(temp_surface[2]); shader_reset(); } BLEND_ALPHA_MULP - draw_surface(temp_surface[0], 0, 0); + draw_surface_safe(temp_surface[0]); BLEND_NORMAL surface_reset_target(); #endregion diff --git a/scripts/node_mk_tile/node_mk_tile.gml b/scripts/node_mk_tile/node_mk_tile.gml index 92187af40..340ef6ab4 100644 --- a/scripts/node_mk_tile/node_mk_tile.gml +++ b/scripts/node_mk_tile/node_mk_tile.gml @@ -182,9 +182,9 @@ function Node_MK_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c DRAW_CLEAR BLEND_ALPHA_MULP - if(_use1) draw_surface(_tex1, 0, 0); + if(_use1) draw_surface_safe(_tex1); - if(_index == 255) draw_surface(_tex0, 0, 0); + if(_index == 255) draw_surface_safe(_tex0); else draw_surface_part(_tex0, l, t, _sw - l - r, _sh - t - b, l, t); if(_index & 0b0100_0000 >= 0b0100_0000) draw_surface_part(_tex0, l, t, _sw - l - r, _sh - t, l, t); @@ -286,8 +286,8 @@ function Node_MK_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c DRAW_CLEAR BLEND_ALPHA_MULP - if(_index == 15) draw_surface(_tex0, 0, 0); - else if(_use1) draw_surface(_tex1, 0, 0); + if(_index == 15) draw_surface_safe(_tex0); + else if(_use1) draw_surface_safe(_tex1); if(_index & 0b0001) draw_surface_part(_tex0, 0, 0, _sw - r, _sh - b, 0, 0); if(_index & 0b0010) draw_surface_part(_tex0, l, 0, _sw - l, _sh - b, l, 0); @@ -406,7 +406,7 @@ function Node_MK_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c __edge_uniform[3] = surface_verify(__edge_uniform[3], _esh, _esw); surface_set_shader(__edge_uniform[0], noone); - draw_surface(_data[6], 0, 0); + draw_surface_safe(_data[6]); surface_reset_shader(); surface_set_shader(__edge_uniform[1], noone); @@ -448,7 +448,7 @@ function Node_MK_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c BLEND_OVERRIDE if(_edgSprt == 0) { - draw_surface(_ed, 0, 0); + draw_surface_safe(_ed); } else if(_edgSprt == 1) { // flip side switch(j) { case 0 : draw_surface(_ed, -_esw * 0, -_esh * 0); break; diff --git a/scripts/node_normal_light/node_normal_light.gml b/scripts/node_normal_light/node_normal_light.gml index 6bf542844..de8cd8209 100644 --- a/scripts/node_normal_light/node_normal_light.gml +++ b/scripts/node_normal_light/node_normal_light.gml @@ -70,7 +70,7 @@ function Node_Normal_Light(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro shader_set_f("lightIntensity", _light_int); shader_set_i("lightType", _light_typ); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); return _outSurf; diff --git a/scripts/node_normalize/node_normalize.gml b/scripts/node_normalize/node_normalize.gml index 5af136e0a..91b4bc0a0 100644 --- a/scripts/node_normalize/node_normalize.gml +++ b/scripts/node_normalize/node_normalize.gml @@ -33,11 +33,11 @@ function Node_Normalize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) temp_surface[i] = surface_verify(temp_surface[i], _sw, _sh); surface_set_shader(temp_surface[0]); - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); surface_reset_shader(); surface_set_shader(temp_surface[1]); - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); surface_reset_shader(); surface_clear(temp_surface[2]); diff --git a/scripts/node_onion_skin/node_onion_skin.gml b/scripts/node_onion_skin/node_onion_skin.gml index 3fd750dee..e71f0fd60 100644 --- a/scripts/node_onion_skin/node_onion_skin.gml +++ b/scripts/node_onion_skin/node_onion_skin.gml @@ -74,7 +74,7 @@ function Node_Onion_Skin(_x, _y, _group = noone) : Node(_x, _y, _group) construc draw_surface_ext_safe(surf, 0, 0, 1, 1, 0, cc, aa); } - if(_top) draw_surface_safe(_surf, 0, 0); + if(_top) draw_surface_safe(_surf); surface_reset_target(); } } \ No newline at end of file diff --git a/scripts/node_palette_shift/node_palette_shift.gml b/scripts/node_palette_shift/node_palette_shift.gml index bb6533c8f..47f04f47e 100644 --- a/scripts/node_palette_shift/node_palette_shift.gml +++ b/scripts/node_palette_shift/node_palette_shift.gml @@ -51,7 +51,7 @@ function Node_Palette_Shift(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr shader_set_f("paletteAmount", array_length(_pal)); shader_set_f("shift", _shf); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_particle/node_particle.gml b/scripts/node_particle/node_particle.gml index db8c05a44..b2ec8aa78 100644 --- a/scripts/node_particle/node_particle.gml +++ b/scripts/node_particle/node_particle.gml @@ -125,7 +125,7 @@ function Node_Particle(_x, _y, _group = noone) : Node_VFX_Spawner_Base(_x, _y, _ if(is_surface(_bg)) _dim = surface_get_dimension(_bg) surface_set_shader(_outSurf, _type == PARTICLE_RENDER_TYPE.surface? sh_sample : noone); - if(is_surface(_bg)) draw_surface(_bg, 0, 0); + if(is_surface(_bg)) draw_surface_safe(_bg); switch(_blend) { case PARTICLE_BLEND_MODE.normal: BLEND_NORMAL; break; diff --git a/scripts/node_path/node_path.gml b/scripts/node_path/node_path.gml index 70afbe35c..4f2a9f56e 100644 --- a/scripts/node_path/node_path.gml +++ b/scripts/node_path/node_path.gml @@ -891,7 +891,7 @@ function Node_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { shader_set_f("cornerDis", 0.5); shader_set_f("mixAmo", 1); - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); surface_reset_shader(); surface_free(_surf); diff --git a/scripts/node_path_3d/node_path_3d.gml b/scripts/node_path_3d/node_path_3d.gml index c1b8d3e6b..149330cc2 100644 --- a/scripts/node_path_3d/node_path_3d.gml +++ b/scripts/node_path_3d/node_path_3d.gml @@ -573,7 +573,7 @@ function Node_Path_3D(_x, _y, _group = noone) : Node(_x, _y, _group) constructor // shader_set_f("cornerDis", 0.5); // shader_set_f("mixAmo", 1); - // draw_surface(_surf, 0, 0); + // draw_surface_safe(_surf); // surface_reset_shader(); // surface_free(_surf); diff --git a/scripts/node_pb_box_inset/node_pb_box_inset.gml b/scripts/node_pb_box_inset/node_pb_box_inset.gml index 1e9b2a584..00c5f0b8f 100644 --- a/scripts/node_pb_box_inset/node_pb_box_inset.gml +++ b/scripts/node_pb_box_inset/node_pb_box_inset.gml @@ -120,7 +120,7 @@ function Node_PB_Box_Inset(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _group) surface_set_target(_nbox.mask); if(is_surface(_pbox.mask)) { draw_clear_alpha(0, 0); - draw_surface_safe(_pbox.mask, 0, 0); + draw_surface_safe(_pbox.mask); } else draw_clear(c_white); diff --git a/scripts/node_pb_box_split/node_pb_box_split.gml b/scripts/node_pb_box_split/node_pb_box_split.gml index 7d77ab354..1116f0d71 100644 --- a/scripts/node_pb_box_split/node_pb_box_split.gml +++ b/scripts/node_pb_box_split/node_pb_box_split.gml @@ -79,7 +79,7 @@ function Node_PB_Box_Split(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _group) _nbox.mask = surface_verify(_nbox.mask, _nbox.w, _nbox.h); surface_set_target(_nbox.mask); DRAW_CLEAR - draw_surface_safe(_pbox.mask, 0, 0); + draw_surface_safe(_pbox.mask); surface_reset_target(); } @@ -87,7 +87,7 @@ function Node_PB_Box_Split(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _group) _nbox.content = surface_verify(_nbox.content, _nbox.w, _nbox.h); surface_set_target(_nbox.content); DRAW_CLEAR - draw_surface_safe(_pbox.content, 0, 0); + draw_surface_safe(_pbox.content); surface_reset_target(); } } else if(_output_index == 1) { @@ -142,7 +142,7 @@ function Node_PB_Box_Split(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _group) _nbox.mask = surface_verify(_nbox.mask, _nbox.w, _nbox.h); surface_set_target(_nbox.mask); DRAW_CLEAR - draw_surface_safe(_pbox.mask, 0, 0); + draw_surface_safe(_pbox.mask); surface_reset_target(); } @@ -150,7 +150,7 @@ function Node_PB_Box_Split(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _group) _nbox.content = surface_verify(_nbox.content, _nbox.w, _nbox.h); surface_set_target(_nbox.content); DRAW_CLEAR - draw_surface_safe(_pbox.content, 0, 0); + draw_surface_safe(_pbox.content); surface_reset_target(); } } else if(_output_index == 1) { diff --git a/scripts/node_pb_draw/node_pb_draw.gml b/scripts/node_pb_draw/node_pb_draw.gml index 3d4c0a046..73bf39f4e 100644 --- a/scripts/node_pb_draw/node_pb_draw.gml +++ b/scripts/node_pb_draw/node_pb_draw.gml @@ -24,12 +24,12 @@ function Node_PB_Draw(_x, _y, _group = noone) : Node_PB(_x, _y, _group) construc #macro PB_DRAW_CREATE_MASK _nbox.mask = surface_verify(_nbox.mask, _nbox.w, _nbox.h); \ surface_set_shader(_nbox.mask, sh_pb_to_mask); \ - draw_surface_safe(_nbox.content, 0, 0); \ + draw_surface_safe(_nbox.content); \ surface_reset_shader(); #macro PB_DRAW_APPLY_MASK if(_mask) { \ BLEND_MULTIPLY \ if(is_surface(_pbox.mask)) \ - draw_surface_safe(_pbox.mask, 0, 0); \ + draw_surface_safe(_pbox.mask); \ BLEND_NORMAL \ } \ No newline at end of file diff --git a/scripts/node_pb_fx/node_pb_fx.gml b/scripts/node_pb_fx/node_pb_fx.gml index be48d621a..f3625c7b7 100644 --- a/scripts/node_pb_fx/node_pb_fx.gml +++ b/scripts/node_pb_fx/node_pb_fx.gml @@ -34,7 +34,7 @@ function Node_PB_Fx(_x, _y, _group = noone) : Node_PB(_x, _y, _group) constructo \ _pbox.mask = surface_create(_pbox.w, _pbox.h); \ surface_set_shader(_pbox.mask, sh_pb_to_mask); \ - draw_surface_safe(_surf, 0, 0); \ + draw_surface_safe(_surf); \ surface_reset_shader(); \ \ return _pbox; \ diff --git a/scripts/node_pb_fx_highlight/node_pb_fx_highlight.gml b/scripts/node_pb_fx_highlight/node_pb_fx_highlight.gml index b88a0df69..aeb045fa3 100644 --- a/scripts/node_pb_fx_highlight/node_pb_fx_highlight.gml +++ b/scripts/node_pb_fx_highlight/node_pb_fx_highlight.gml @@ -105,7 +105,7 @@ function Node_PB_Fx_Highlight(_x, _y, _group = noone) : Node_PB_Fx(_x, _y, _grou shader_set_f("seed", _seed); DRAW_CLEAR - draw_surface_safe(_pbox.content, 0, 0); + draw_surface_safe(_pbox.content); surface_reset_shader(); return _nbox; diff --git a/scripts/node_pixel_cloud/node_pixel_cloud.gml b/scripts/node_pixel_cloud/node_pixel_cloud.gml index 854ca6aba..6d96f8e45 100644 --- a/scripts/node_pixel_cloud/node_pixel_cloud.gml +++ b/scripts/node_pixel_cloud/node_pixel_cloud.gml @@ -62,7 +62,7 @@ function Node_Pixel_Cloud(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou shader_set_i("curve_amount", array_length(_data[6])); shader_set_f("randomAmount", _data[7]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); return _outSurf; diff --git a/scripts/node_pixel_sort/node_pixel_sort.gml b/scripts/node_pixel_sort/node_pixel_sort.gml index 5fd60e83a..3422a977a 100644 --- a/scripts/node_pixel_sort/node_pixel_sort.gml +++ b/scripts/node_pixel_sort/node_pixel_sort.gml @@ -53,7 +53,7 @@ function Node_Pixel_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _group if(_it <= 0) { surface_set_target(_outSurf); BLEND_OVERRIDE; - draw_surface_safe(_in, 0, 0); + draw_surface_safe(_in); BLEND_NORMAL; surface_reset_target(); @@ -69,7 +69,7 @@ function Node_Pixel_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _group surface_set_target(pp[1]); DRAW_CLEAR BLEND_OVERRIDE; - draw_surface_safe(_in, 0, 0); + draw_surface_safe(_in); BLEND_NORMAL; surface_reset_target(); @@ -87,7 +87,7 @@ function Node_Pixel_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _group DRAW_CLEAR BLEND_OVERRIDE; shader_set_uniform_f(uniform_itr, i); - draw_surface_safe(sDraw, 0, 0); + draw_surface_safe(sDraw); BLEND_NORMAL; surface_reset_target(); } @@ -96,7 +96,7 @@ function Node_Pixel_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _group surface_set_target(_outSurf); BLEND_OVERRIDE; - draw_surface_safe(sBase, 0, 0); + draw_surface_safe(sBase); BLEND_NORMAL; surface_reset_target(); diff --git a/scripts/node_polar/node_polar.gml b/scripts/node_polar/node_polar.gml index b340734cb..cfea04b61 100644 --- a/scripts/node_polar/node_polar.gml +++ b/scripts/node_polar/node_polar.gml @@ -64,7 +64,7 @@ function Node_Polar(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con shader_set_i("swap", _data[10]); shader_set_2("tile", _data[12]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_posterize/node_posterize.gml b/scripts/node_posterize/node_posterize.gml index b48dbddb8..8169d9a53 100644 --- a/scripts/node_posterize/node_posterize.gml +++ b/scripts/node_posterize/node_posterize.gml @@ -80,11 +80,11 @@ function Node_Posterize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) temp_surface[i] = surface_verify(temp_surface[i], _sw, _sh); surface_set_shader(temp_surface[0]); - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); surface_reset_shader(); surface_set_shader(temp_surface[1]); - draw_surface(_surf, 0, 0); + draw_surface_safe(_surf); surface_reset_shader(); surface_clear(temp_surface[2]); diff --git a/scripts/node_random_shape/node_random_shape.gml b/scripts/node_random_shape/node_random_shape.gml index 887378436..a854c31f5 100644 --- a/scripts/node_random_shape/node_random_shape.gml +++ b/scripts/node_random_shape/node_random_shape.gml @@ -117,10 +117,10 @@ function Node_Random_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro if(random(1) < 0.5) { shader_set(sh_rsh_rotate); shader_set_f("dimension", _dim[0], _dim[1]); - draw_surface_safe(_surf, 0, 0); + draw_surface_safe(_surf); shader_reset(); } else - draw_surface_safe(_surf, 0, 0); + draw_surface_safe(_surf); BLEND_SUBTRACT draw_surface_safe(_subs, _sx - _size[0] / 2, _sy - _size[1] / 2); @@ -144,7 +144,7 @@ function Node_Random_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro shader_set_f("dimension", _dim[0], _dim[1]); shader_set_i("type", choose(0, 0, 1, 1, 1)); - draw_surface_safe(_prog, 0, 0); + draw_surface_safe(_prog); if(_side == 1) draw_surface_ext_safe(_prog, 0, _dim[1], 1, -1, 0, c_white, 1); if(_side == 2) draw_surface_ext_safe(_prog, _dim[0], 0, -1, 1, 0, c_white, 1); surface_reset_shader(); diff --git a/scripts/node_registry/node_registry.yy b/scripts/node_registry/node_registry.yy index 89f8acbbc..9c9bf3792 100644 --- a/scripts/node_registry/node_registry.yy +++ b/scripts/node_registry/node_registry.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"node_registry", "isCompatibility":false, "isDnD":false, diff --git a/scripts/node_rigid_object/node_rigid_object.gml b/scripts/node_rigid_object/node_rigid_object.gml index 6ae66051d..6ad51349e 100644 --- a/scripts/node_rigid_object/node_rigid_object.gml +++ b/scripts/node_rigid_object/node_rigid_object.gml @@ -346,7 +346,7 @@ function Node_Rigid_Object(_x, _y, _group = noone) : Node(_x, _y, _group) constr shader_set_uniform_f(uni_dim, ww, hh); shader_set_uniform_f(uni_com, cmX, cmY); - draw_surface_safe(_tex, 0, 0); + draw_surface_safe(_tex); shader_reset(); surface_reset_target(); diff --git a/scripts/node_sdf/node_sdf.gml b/scripts/node_sdf/node_sdf.gml index 8c1aaf1bb..6e77a7324 100644 --- a/scripts/node_sdf/node_sdf.gml +++ b/scripts/node_sdf/node_sdf.gml @@ -44,7 +44,7 @@ function Node_SDF(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) const _outSurf = surface_verify(_outSurf, sw, sh, cDep); surface_set_shader(temp_surface[0], sh_sdf_tex); - draw_surface_safe(inSurf, 0, 0); + draw_surface_safe(inSurf); surface_reset_shader(); var _step = ceil(log2(_n)); @@ -59,14 +59,14 @@ function Node_SDF(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) const shader_set_uniform_f(uniform_sdf_dim, _n, _n ); shader_set_uniform_f(uniform_sdf_stp, stepSize); shader_set_uniform_i(uniform_sdf_sid, _side); - draw_surface_safe(temp_surface[!bg], 0, 0); + draw_surface_safe(temp_surface[!bg]); surface_reset_shader(); } surface_set_shader(_outSurf, sh_sdf_dist); shader_set_uniform_i(uniform_dst_sid, _side); shader_set_uniform_f(uniform_dst_dst, _dist); - draw_surface_safe(temp_surface[bg], 0, 0); + draw_surface_safe(temp_surface[bg]); surface_reset_shader(); return _outSurf; diff --git a/scripts/node_shadow/node_shadow.gml b/scripts/node_shadow/node_shadow.gml index e3d23d229..04d3b48c8 100644 --- a/scripts/node_shadow/node_shadow.gml +++ b/scripts/node_shadow/node_shadow.gml @@ -80,7 +80,7 @@ function Node_Shadow(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co BLEND_OVERRIDE; draw_surface_ext_safe(surface_apply_gaussian(pass1, _size, false, cl), 0, 0, 1, 1, 0, cl, _stre * _color_get_alpha(cl)); BLEND_NORMAL; - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_target(); surface_free(pass1); diff --git a/scripts/node_skew/node_skew.gml b/scripts/node_skew/node_skew.gml index 7a99b946f..1d386a4b4 100644 --- a/scripts/node_skew/node_skew.gml +++ b/scripts/node_skew/node_skew.gml @@ -82,7 +82,7 @@ function Node_Skew(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons shader_set_i("axis", _data[1]); shader_set_f_map("amount", _data[2], _data[12], inputs[| 2]); shader_set_i("sampleMode", _samp); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_smear/node_smear.gml b/scripts/node_smear/node_smear.gml index 543c2524a..db68e8f9c 100644 --- a/scripts/node_smear/node_smear.gml +++ b/scripts/node_smear/node_smear.gml @@ -91,7 +91,7 @@ function Node_Smear(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con shader_set_i("modulateStr", _data[12]); shader_set_f("spread", _data[13]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_smoke_repulse/node_smoke_repulse.gml b/scripts/node_smoke_repulse/node_smoke_repulse.gml index 5ac92225e..a107c7c71 100644 --- a/scripts/node_smoke_repulse/node_smoke_repulse.gml +++ b/scripts/node_smoke_repulse/node_smoke_repulse.gml @@ -64,7 +64,7 @@ function Node_Smoke_Repulse(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) with(_dom) { fd_rectangle_set_target(id, _mod? FD_TARGET_TYPE.ADD_VELOCITY : FD_TARGET_TYPE.REPLACE_VELOCITY); - draw_surface_safe(vSurface, 0, 0); + draw_surface_safe(vSurface); fd_rectangle_reset_target(id); } diff --git a/scripts/node_smoke_turbulence/node_smoke_turbulence.gml b/scripts/node_smoke_turbulence/node_smoke_turbulence.gml index 1506732f9..8ebba64e3 100644 --- a/scripts/node_smoke_turbulence/node_smoke_turbulence.gml +++ b/scripts/node_smoke_turbulence/node_smoke_turbulence.gml @@ -60,7 +60,7 @@ function Node_Smoke_Turbulence(_x, _y, _group = noone) : Node_Smoke(_x, _y, _gro surface_reset_target(); fd_rectangle_set_target(_dom, _mod? FD_TARGET_TYPE.ADD_VELOCITY : FD_TARGET_TYPE.REPLACE_VELOCITY); - draw_surface_safe(vSurface, 0, 0); + draw_surface_safe(vSurface); fd_rectangle_reset_target(_dom); surface_free(vSurface); diff --git a/scripts/node_smoke_vortex/node_smoke_vortex.gml b/scripts/node_smoke_vortex/node_smoke_vortex.gml index 9c78bafbd..beb3ba253 100644 --- a/scripts/node_smoke_vortex/node_smoke_vortex.gml +++ b/scripts/node_smoke_vortex/node_smoke_vortex.gml @@ -70,7 +70,7 @@ function Node_Smoke_Vortex(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) with(_dom) { fd_rectangle_set_target(id, _mod? FD_TARGET_TYPE.ADD_VELOCITY : FD_TARGET_TYPE.REPLACE_VELOCITY); - draw_surface_safe(vSurface, 0, 0); + draw_surface_safe(vSurface); fd_rectangle_reset_target(id); } diff --git a/scripts/node_spherize/node_spherize.gml b/scripts/node_spherize/node_spherize.gml index 41d358ebc..6550ebfef 100644 --- a/scripts/node_spherize/node_spherize.gml +++ b/scripts/node_spherize/node_spherize.gml @@ -89,7 +89,7 @@ function Node_Spherize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) shader_set_f_map("radius", _data[3], _data[12], inputs[| 3]); shader_set_i("sampleMode", sam); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); __process_mask_modifier(_data); diff --git a/scripts/node_stack/node_stack.gml b/scripts/node_stack/node_stack.gml index a6e87dea5..d12274ad7 100644 --- a/scripts/node_stack/node_stack.gml +++ b/scripts/node_stack/node_stack.gml @@ -127,7 +127,7 @@ function Node_Stack(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { shader_set_f("fdimension", sw, sh); shader_set_f("position", sx + _padd[PADDING.left], sy + _padd[PADDING.top]); - draw_surface(temp_surface[ppind], 0, 0); + draw_surface_safe(temp_surface[ppind]); BLEND_NORMAL surface_reset_shader(); @@ -143,7 +143,7 @@ function Node_Stack(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { DRAW_CLEAR BLEND_OVERRIDE - draw_surface(temp_surface[ppind], 0, 0); + draw_surface_safe(temp_surface[ppind]); BLEND_NORMAL surface_reset_target(); diff --git a/scripts/node_time_remap/node_time_remap.gml b/scripts/node_time_remap/node_time_remap.gml index fac1d8659..386bebc30 100644 --- a/scripts/node_time_remap/node_time_remap.gml +++ b/scripts/node_time_remap/node_time_remap.gml @@ -55,7 +55,7 @@ function Node_Time_Remap(_x, _y, _group = noone) : Node(_x, _y, _group) construc shader_set_uniform_f(uniform_min, i * ste); shader_set_uniform_f(uniform_max, i * ste + ste); - draw_surface_safe(s, 0, 0); + draw_surface_safe(s); } surface_reset_shader(); diff --git a/scripts/node_value/node_value.yy b/scripts/node_value/node_value.yy index 579996a81..91346face 100644 --- a/scripts/node_value/node_value.yy +++ b/scripts/node_value/node_value.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"node_value", "isCompatibility":false, "isDnD":false, diff --git a/scripts/node_vignette/node_vignette.gml b/scripts/node_vignette/node_vignette.gml index 5bfdb5549..1f2ae5093 100644 --- a/scripts/node_vignette/node_vignette.gml +++ b/scripts/node_vignette/node_vignette.gml @@ -33,7 +33,7 @@ function Node_Vignette(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) shader_set_f("amplitude", _data[4]); shader_set_f("smoothness", _data[5]); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); return _outSurf; diff --git a/scripts/node_warp/node_warp.gml b/scripts/node_warp/node_warp.gml index aa46aef36..44bab5f8c 100644 --- a/scripts/node_warp/node_warp.gml +++ b/scripts/node_warp/node_warp.gml @@ -116,7 +116,7 @@ function Node_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons warpSurface( warp_surface[0], warp_surface[1], params.w, params.h, tl, tr, bl, br, true ); BLEND_ADD - draw_surface(warp_surface[0], 0, 0); + draw_surface_safe(warp_surface[0]); BLEND_NORMAL #endregion diff --git a/scripts/node_wrap_perspective/node_wrap_perspective.gml b/scripts/node_wrap_perspective/node_wrap_perspective.gml index 6f34606ea..489f939e7 100644 --- a/scripts/node_wrap_perspective/node_wrap_perspective.gml +++ b/scripts/node_wrap_perspective/node_wrap_perspective.gml @@ -220,7 +220,7 @@ function Node_Warp_Perspective(_x, _y, _group = noone) : Node_Processor(_x, _y, shader_set_f("t3", Ttl[0] / sw, Ttl[1] / sh); shader_set_f("t4", Tbl[0] / sw, Tbl[1] / sh); - draw_surface_safe(_data[0], 0, 0); + draw_surface_safe(_data[0]); surface_reset_shader(); return _outSurf; diff --git a/scripts/panel_animation/panel_animation.gml b/scripts/panel_animation/panel_animation.gml index 665e3545b..276b26aee 100644 --- a/scripts/panel_animation/panel_animation.gml +++ b/scripts/panel_animation/panel_animation.gml @@ -742,7 +742,7 @@ function Panel_Animation() : PanelContent() constructor { #endregion gpu_set_blendmode(bm_subtract); - draw_surface_safe(timeline_mask, 0, 0); + draw_surface_safe(timeline_mask); gpu_set_blendmode(bm_normal); surface_reset_target(); @@ -1734,7 +1734,7 @@ function Panel_Animation() : PanelContent() constructor { #endregion gpu_set_blendmode(bm_subtract); - draw_surface_safe(dope_sheet_name_mask, 0, 0); + draw_surface_safe(dope_sheet_name_mask); gpu_set_blendmode(bm_normal); surface_reset_target(); } #endregion @@ -2371,7 +2371,7 @@ function Panel_Animation() : PanelContent() constructor { #endregion gpu_set_blendmode(bm_subtract); - draw_surface_safe(dope_sheet_mask, 0, 0); + draw_surface_safe(dope_sheet_mask); gpu_set_blendmode(bm_normal); surface_reset_target(); diff --git a/scripts/panel_data/panel_data.gml b/scripts/panel_data/panel_data.gml index afef46019..1912f6b0b 100644 --- a/scripts/panel_data/panel_data.gml +++ b/scripts/panel_data/panel_data.gml @@ -700,7 +700,7 @@ function Panel(_parent, _x, _y, _w, _h) constructor { } gpu_set_blendmode(bm_subtract); - draw_surface_safe(mask_surface, 0, 0); + draw_surface_safe(mask_surface); gpu_set_blendmode(bm_normal); surface_reset_target(); diff --git a/scripts/panel_display_additional/panel_display_additional.gml b/scripts/panel_display_additional/panel_display_additional.gml index 2437a7277..9e198ab43 100644 --- a/scripts/panel_display_additional/panel_display_additional.gml +++ b/scripts/panel_display_additional/panel_display_additional.gml @@ -48,7 +48,7 @@ function panelDisplayDraw() { BLEND_NORMAL surface_reset_target(); - draw_surface(focusing_surface, 0, 0); + draw_surface_safe(focusing_surface); draw_sprite_stretched_ext(THEME.ui_panel_active, 1, x0, y0, ww, hh, COLORS._main_accent, 1); } diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index d01073de3..0c6d11c2b 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -1382,12 +1382,12 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { surface_set_shader(connection_surface_aa, sh_downsample); shader_set_f("down", aa); shader_set_dim("dimension", connection_surface); - draw_surface(connection_surface, 0, 0); + draw_surface_safe(connection_surface); surface_reset_shader(); gpu_set_texfilter(false); BLEND_ALPHA_MULP - draw_surface(connection_surface_aa, 0, 0); + draw_surface_safe(connection_surface_aa); BLEND_NORMAL junction_hovering = node_hovering == noone? hov : noone; diff --git a/scripts/panel_graph_export_image/panel_graph_export_image.gml b/scripts/panel_graph_export_image/panel_graph_export_image.gml index c00c1b212..79219d35b 100644 --- a/scripts/panel_graph_export_image/panel_graph_export_image.gml +++ b/scripts/panel_graph_export_image/panel_graph_export_image.gml @@ -108,7 +108,7 @@ function graph_export_image(allList, nodeList, settings = {}) { nodeList[i].drawConnections(param, true); surface_reset_target(); - draw_surface(cs, 0, 0); + draw_surface_safe(cs); #endregion #region draw node @@ -135,7 +135,7 @@ function graph_export_image(allList, nodeList, settings = {}) { draw_clear_alpha(0, 0); BLEND_OVERRIDE - draw_surface(s, 0, 0); + draw_surface_safe(s); BLEND_NORMAL gpu_set_colorwriteenable(1, 1, 1, 1); diff --git a/scripts/panel_palette_mixer/panel_palette_mixer.gml b/scripts/panel_palette_mixer/panel_palette_mixer.gml index 51bbb5866..206eef2e8 100644 --- a/scripts/panel_palette_mixer/panel_palette_mixer.gml +++ b/scripts/panel_palette_mixer/panel_palette_mixer.gml @@ -679,7 +679,7 @@ function Panel_Palette_Mixer() : PanelContent() constructor { shader_set_f("influence", node_size / ui(4)); shader_set_f("progress", shade_mode); - draw_surface(connect_surf, 0, 0); + draw_surface_safe(connect_surf); surface_reset_shader(); draw_surface(connect_blend_surf, px, py); diff --git a/scripts/panel_preview/panel_preview.gml b/scripts/panel_preview/panel_preview.gml index 75fd62537..e0070ef74 100644 --- a/scripts/panel_preview/panel_preview.gml +++ b/scripts/panel_preview/panel_preview.gml @@ -1128,7 +1128,7 @@ function Panel_Preview() : PanelContent() constructor { shader_set(sh_d3d_outline); shader_set_dim("dimension", d3_surface_outline); shader_set_color("outlineColor", COLORS._main_accent); - draw_surface(d3_surface_outline, 0, 0); + draw_surface_safe(d3_surface_outline); shader_reset(); } #endregion @@ -2101,7 +2101,7 @@ function Panel_Preview() : PanelContent() constructor { surface_set_target(s); shader_set(sh_BGR); - draw_surface(prevS, 0, 0); + draw_surface_safe(prevS); shader_reset(); surface_reset_target(); diff --git a/scripts/panel_preview_window/panel_preview_window.gml b/scripts/panel_preview_window/panel_preview_window.gml index cf55ec757..2f199de40 100644 --- a/scripts/panel_preview_window/panel_preview_window.gml +++ b/scripts/panel_preview_window/panel_preview_window.gml @@ -97,7 +97,7 @@ function Panel_Preview_Window() : PanelContent() constructor { dx += (sw + 2) * scale; } surface_reset_target(); - draw_surface_safe(content_surface, 0, 0); + draw_surface_safe(content_surface); if(panning) { panx = pan_sx + (mouse_mx - pan_mx); diff --git a/scripts/pcx_parse/pcx_parse.yy b/scripts/pcx_parse/pcx_parse.yy index 9f1027b44..25f5fa804 100644 --- a/scripts/pcx_parse/pcx_parse.yy +++ b/scripts/pcx_parse/pcx_parse.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"pcx_parse", "isCompatibility":false, "isDnD":false, diff --git a/scripts/preferences/preferences.yy b/scripts/preferences/preferences.yy index ef8dc4ab7..1471d3d7d 100644 --- a/scripts/preferences/preferences.yy +++ b/scripts/preferences/preferences.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"preferences", "isCompatibility":false, "isDnD":false, diff --git a/scripts/render_data/render_data.yy b/scripts/render_data/render_data.yy index 0c9d15e85..360f7b7a9 100644 --- a/scripts/render_data/render_data.yy +++ b/scripts/render_data/render_data.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"render_data", "isCompatibility":false, "isDnD":false, diff --git a/scripts/surface_functions/surface_functions.gml b/scripts/surface_functions/surface_functions.gml index aa534c5be..380933020 100644 --- a/scripts/surface_functions/surface_functions.gml +++ b/scripts/surface_functions/surface_functions.gml @@ -370,7 +370,7 @@ surface_set_target(dst); DRAW_CLEAR BLEND_OVERRIDE; - draw_surface_safe(src, 0, 0); + draw_surface_safe(src); BLEND_NORMAL surface_reset_target(); } #endregion @@ -387,7 +387,7 @@ surface_set_target(destination); DRAW_CLEAR BLEND_OVERRIDE; - draw_surface_safe(surface, 0, 0); + draw_surface_safe(surface); BLEND_NORMAL surface_reset_target(); @@ -448,7 +448,7 @@ shader_set_i("keys", array_length(PROJECT.attributes.palette)); shader_set_i("alpha", 1); - draw_surface(surf, 0, 0); + draw_surface_safe(surf); surface_reset_shader(); surface_free(surf); @@ -650,7 +650,7 @@ case surface_rgba16float : case surface_rgba32float : surface_set_shader(s, sh_draw_normal); - draw_surface(surface, 0, 0); + draw_surface_safe(surface); surface_reset_shader(); surface_save(s, path); return; @@ -661,7 +661,7 @@ } surface_set_shader(s, sh_draw_single_channel); - draw_surface(surface, 0, 0); + draw_surface_safe(surface); surface_reset_shader(); surface_save(s, path); @@ -689,7 +689,7 @@ break; } - draw_surface(surface, 0, 0); + draw_surface_safe(surface); surface_reset_shader(); return target; diff --git a/scripts/svg_objects/svg_objects.gml b/scripts/svg_objects/svg_objects.gml index cd28dbe3d..c88c456b2 100644 --- a/scripts/svg_objects/svg_objects.gml +++ b/scripts/svg_objects/svg_objects.gml @@ -666,7 +666,7 @@ function SVG_path(svgObj = noone) : SVGElement(svgObj) constructor { } - draw_surface(_temp[!(i % 2)], 0, 0); + draw_surface_safe(_temp[!(i % 2)]); surface_free(_surf); surface_free(_temp[0]); diff --git a/scripts/timeline_data/timeline_data.yy b/scripts/timeline_data/timeline_data.yy index 0ab9e2789..be3cd82b8 100644 --- a/scripts/timeline_data/timeline_data.yy +++ b/scripts/timeline_data/timeline_data.yy @@ -1,5 +1,5 @@ { - "$GMScript":"", + "$GMScript":"v1", "%Name":"timeline_data", "isCompatibility":false, "isDnD":false,