diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index f5d63708a..a0124a1a1 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -156,6 +156,7 @@ {"name":"Tile","order":12,"path":"folders/nodes/data/MKFX/Tile.yy",}, {"name":"PB","order":12,"path":"folders/nodes/data/PB.yy",}, {"name":"draw","order":2,"path":"folders/nodes/data/PB/draw.yy",}, + {"name":"shaders","order":2,"path":"folders/nodes/data/PB/main/shaders.yy",}, {"name":"modify","order":3,"path":"folders/nodes/data/PB/modify.yy",}, {"name":"pbbox","order":1,"path":"folders/nodes/data/PB/pbbox.yy",}, {"name":"PCX","order":11,"path":"folders/nodes/data/PCX.yy",}, @@ -256,11 +257,13 @@ {"name":"node","order":5,"path":"folders/shader/UI/node.yy",}, {"name":"palette mixer","order":2,"path":"folders/shader/UI/palette mixer.yy",}, {"name":"sprites","order":8,"path":"folders/sprites.yy",}, - {"name":"bs","order":3,"path":"folders/sprites/bs.yy",}, - {"name":"gameframe","order":4,"path":"folders/sprites/gameframe.yy",}, - {"name":"meta","order":2,"path":"folders/sprites/meta.yy",}, - {"name":"misc","order":5,"path":"folders/sprites/misc.yy",}, - {"name":"nodes","order":6,"path":"folders/sprites/nodes.yy",}, + {"name":"bs","order":2,"path":"folders/sprites/bs.yy",}, + {"name":"enum icons","order":6,"path":"folders/sprites/enum icons.yy",}, + {"name":"gameframe","order":3,"path":"folders/sprites/gameframe.yy",}, + {"name":"node","order":9,"path":"folders/sprites/node.yy",}, + {"name":"junctions","order":5,"path":"folders/sprites/junctions.yy",}, + {"name":"meta","order":1,"path":"folders/sprites/meta.yy",}, + {"name":"misc","order":4,"path":"folders/sprites/misc.yy",}, {"name":"profiler","order":8,"path":"folders/sprites/profiler.yy",}, {"name":"texture","order":7,"path":"folders/sprites/texture.yy",}, {"name":"widgets","order":6,"path":"folders/widgets.yy",}, @@ -268,7 +271,6 @@ {"name":"rotator","order":1,"path":"folders/widgets/rotator.yy",}, {"name":"sliders","order":2,"path":"folders/widgets/sliders.yy",}, {"name":"text","order":3,"path":"folders/widgets/text.yy",}, - {"name":"shaders","order":2,"path":"folders/nodes/data/PB/main/shaders.yy",}, ], "ResourceOrderSettings":[ {"name":"ac_disappear","order":2,"path":"animcurves/ac_disappear/ac_disappear.yy",}, @@ -349,7 +351,6 @@ {"name":"o_dialog_textbox_autocomplete","order":7,"path":"objects/o_dialog_textbox_autocomplete/o_dialog_textbox_autocomplete.yy",}, {"name":"o_dialog_textbox_function_guide","order":8,"path":"objects/o_dialog_textbox_function_guide/o_dialog_textbox_function_guide.yy",}, {"name":"o_dialog_value_editor","order":9,"path":"objects/o_dialog_value_editor/o_dialog_value_editor.yy",}, - {"name":"sh_corner_apply","order":1,"path":"shaders/sh_corner_apply/sh_corner_apply.yy",}, {"name":"o_dialog_warning","order":6,"path":"objects/o_dialog_warning/o_dialog_warning.yy",}, {"name":"o_pie_menu","order":14,"path":"objects/o_pie_menu/o_pie_menu.yy",}, {"name":"Obj_Debug_FallText_Firestore","order":6,"path":"objects/Obj_Debug_FallText_Firestore/Obj_Debug_FallText_Firestore.yy",}, @@ -1464,7 +1465,6 @@ {"name":"type_conversion","order":7,"path":"scripts/type_conversion/type_conversion.yy",}, {"name":"value_snap","order":9,"path":"scripts/value_snap/value_snap.yy",}, {"name":"var_comparison","order":1,"path":"scripts/var_comparison/var_comparison.yy",}, - {"name":"sh_corner_coord","order":4,"path":"shaders/sh_corner_coord/sh_corner_coord.yy",}, {"name":"vct_knob","order":2,"path":"scripts/vct_knob/vct_knob.yy",}, {"name":"vct_slider","order":1,"path":"scripts/vct_slider/vct_slider.yy",}, {"name":"vct_toggle","order":3,"path":"scripts/vct_toggle/vct_toggle.yy",}, @@ -1586,6 +1586,8 @@ {"name":"sh_content_sampler","order":17,"path":"shaders/sh_content_sampler/sh_content_sampler.yy",}, {"name":"sh_convolution","order":9,"path":"shaders/sh_convolution/sh_convolution.yy",}, {"name":"sh_coord","order":14,"path":"shaders/sh_coord/sh_coord.yy",}, + {"name":"sh_corner_apply","order":1,"path":"shaders/sh_corner_apply/sh_corner_apply.yy",}, + {"name":"sh_corner_coord","order":4,"path":"shaders/sh_corner_coord/sh_corner_coord.yy",}, {"name":"sh_corner_erode","order":2,"path":"shaders/sh_corner_erode/sh_corner_erode.yy",}, {"name":"sh_corner_iterate","order":3,"path":"shaders/sh_corner_iterate/sh_corner_iterate.yy",}, {"name":"sh_cross_section","order":17,"path":"shaders/sh_cross_section/sh_cross_section.yy",}, @@ -1688,7 +1690,6 @@ {"name":"sh_kuwahara_ani_pass3","order":3,"path":"shaders/sh_kuwahara_ani_pass3/sh_kuwahara_ani_pass3.yy",}, {"name":"sh_kuwahara_ani_pass4","order":4,"path":"shaders/sh_kuwahara_ani_pass4/sh_kuwahara_ani_pass4.yy",}, {"name":"sh_kuwahara_gen","order":5,"path":"shaders/sh_kuwahara_gen/sh_kuwahara_gen.yy",}, - {"name":"sh_pb_main_draw","order":0,"path":"shaders/sh_pb_main_draw/sh_pb_main_draw.yy",}, {"name":"sh_level_selector","order":23,"path":"shaders/sh_level_selector/sh_level_selector.yy",}, {"name":"sh_level","order":21,"path":"shaders/sh_level/sh_level.yy",}, {"name":"sh_liquefy_bloat","order":3,"path":"shaders/sh_liquefy_bloat/sh_liquefy_bloat.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index ccc466183..a3074db37 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -218,6 +218,7 @@ {"$GMFolder":"","%Name":"PB","folderPath":"folders/nodes/data/PB.yy","name":"PB","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"draw","folderPath":"folders/nodes/data/PB/draw.yy","name":"draw","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"main","folderPath":"folders/nodes/data/PB/main.yy","name":"main","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"shaders","folderPath":"folders/nodes/data/PB/main/shaders.yy","name":"shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"modify","folderPath":"folders/nodes/data/PB/modify.yy","name":"modify","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"pbbox","folderPath":"folders/nodes/data/PB/pbbox.yy","name":"pbbox","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"PCX","folderPath":"folders/nodes/data/PCX.yy","name":"PCX","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -335,11 +336,12 @@ {"$GMFolder":"","%Name":"palette mixer","folderPath":"folders/shader/UI/palette mixer.yy","name":"palette mixer","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"sprites","folderPath":"folders/sprites.yy","name":"sprites","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"bs","folderPath":"folders/sprites/bs.yy","name":"bs","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"enum icons","folderPath":"folders/sprites/enum icons.yy","name":"enum icons","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"gameframe","folderPath":"folders/sprites/gameframe.yy","name":"gameframe","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"node","folderPath":"folders/sprites/node.yy","name":"node","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"junctions","folderPath":"folders/sprites/junctions.yy","name":"junctions","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"meta","folderPath":"folders/sprites/meta.yy","name":"meta","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"misc","folderPath":"folders/sprites/misc.yy","name":"misc","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"nodes","folderPath":"folders/sprites/nodes.yy","name":"nodes","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"junctions","folderPath":"folders/sprites/nodes/junctions.yy","name":"junctions","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"profiler","folderPath":"folders/sprites/profiler.yy","name":"profiler","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"texture","folderPath":"folders/sprites/texture.yy","name":"texture","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"widgets","folderPath":"folders/widgets.yy","name":"widgets","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -348,7 +350,6 @@ {"$GMFolder":"","%Name":"rotator","folderPath":"folders/widgets/rotator.yy","name":"rotator","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"sliders","folderPath":"folders/widgets/sliders.yy","name":"sliders","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"text","folderPath":"folders/widgets/text.yy","name":"text","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"shaders","folderPath":"folders/nodes/data/PB/main/shaders.yy","name":"shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, ], "IncludedFiles":[ {"$GMIncludedFile":"","%Name":"Addons.zip","CopyToMask":-1,"filePath":"datafiles/data","name":"Addons.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -1314,7 +1315,11 @@ {"$GMIncludedFile":"","%Name":"Canvas.png","CopyToMask":-1,"filePath":"datafiles/data/Welcome files/Templates","name":"Canvas.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"Canvas.pxc","CopyToMask":-1,"filePath":"datafiles/data/Welcome files/Templates","name":"Canvas.pxc","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"Welcome files.zip","CopyToMask":-1,"filePath":"datafiles/data/Welcome files","name":"Welcome files.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"dllcredits.txt","ConfigValues":{"Itch":{"CopyToMask":"0",},},"CopyToMask":0,"filePath":"datafiles","name":"dllcredits.txt","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"dllcredits.txt","ConfigValues":{ + "Itch":{ + "CopyToMask":"0", + }, + },"CopyToMask":0,"filePath":"datafiles","name":"dllcredits.txt","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"dlltest1.dll","CopyToMask":-1,"filePath":"datafiles","name":"dlltest1.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"ffmpeg.exe","CopyToMask":-1,"filePath":"datafiles/ffmpeg/bin","name":"ffmpeg.exe","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"LICENSE","CopyToMask":-1,"filePath":"datafiles/ffmpeg","name":"LICENSE","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -1333,7 +1338,11 @@ {"$GMIncludedFile":"","%Name":"mf.dll","CopyToMask":-1,"filePath":"datafiles","name":"mf.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"mfcore.dll","CopyToMask":-1,"filePath":"datafiles","name":"mfcore.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"mfplat.dll","CopyToMask":-1,"filePath":"datafiles","name":"mfplat.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"PixelComposer_profile-2.provisionprofile","ConfigValues":{"Itch":{"CopyToMask":"2",},},"CopyToMask":-1,"filePath":"datafiles","name":"PixelComposer_profile-2.provisionprofile","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"PixelComposer_profile-2.provisionprofile","ConfigValues":{ + "Itch":{ + "CopyToMask":"2", + }, + },"CopyToMask":-1,"filePath":"datafiles","name":"PixelComposer_profile-2.provisionprofile","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"data.win","CopyToMask":-1,"filePath":"datafiles/report","name":"data.win","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"execute_shell_simple_ext_x64.dll","CopyToMask":-1,"filePath":"datafiles/report","name":"execute_shell_simple_ext_x64.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"options.ini","CopyToMask":-1,"filePath":"datafiles/report","name":"options.ini","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -1757,7 +1766,6 @@ {"id":{"name":"dynaSurf_3d","path":"scripts/dynaSurf_3d/dynaSurf_3d.yy",},}, {"id":{"name":"dynaSurf_iso","path":"scripts/dynaSurf_iso/dynaSurf_iso.yy",},}, {"id":{"name":"dynaSurf","path":"scripts/dynaSurf/dynaSurf.yy",},}, - {"id":{"name":"sh_pb_main_draw","path":"shaders/sh_pb_main_draw/sh_pb_main_draw.yy",},}, {"id":{"name":"event_recorder","path":"scripts/event_recorder/event_recorder.yy",},}, {"id":{"name":"export_portable","path":"scripts/export_portable/export_portable.yy",},}, {"id":{"name":"fft_functions","path":"scripts/fft_functions/fft_functions.yy",},}, @@ -1978,7 +1986,6 @@ {"id":{"name":"node_color_adjust","path":"scripts/node_color_adjust/node_color_adjust.yy",},}, {"id":{"name":"node_color_data","path":"scripts/node_color_data/node_color_data.yy",},}, {"id":{"name":"node_color_hsv","path":"scripts/node_color_hsv/node_color_hsv.yy",},}, - {"id":{"name":"sh_corner_coord","path":"shaders/sh_corner_coord/sh_corner_coord.yy",},}, {"id":{"name":"node_color_mix","path":"scripts/node_color_mix/node_color_mix.yy",},}, {"id":{"name":"node_color_oklch","path":"scripts/node_color_oklch/node_color_oklch.yy",},}, {"id":{"name":"node_color_remove","path":"scripts/node_color_remove/node_color_remove.yy",},}, @@ -2855,6 +2862,8 @@ {"id":{"name":"sh_content_sampler","path":"shaders/sh_content_sampler/sh_content_sampler.yy",},}, {"id":{"name":"sh_convolution","path":"shaders/sh_convolution/sh_convolution.yy",},}, {"id":{"name":"sh_coord","path":"shaders/sh_coord/sh_coord.yy",},}, + {"id":{"name":"sh_corner_apply","path":"shaders/sh_corner_apply/sh_corner_apply.yy",},}, + {"id":{"name":"sh_corner_coord","path":"shaders/sh_corner_coord/sh_corner_coord.yy",},}, {"id":{"name":"sh_corner_erode","path":"shaders/sh_corner_erode/sh_corner_erode.yy",},}, {"id":{"name":"sh_corner_iterate","path":"shaders/sh_corner_iterate/sh_corner_iterate.yy",},}, {"id":{"name":"sh_corner","path":"shaders/sh_corner/sh_corner.yy",},}, @@ -3053,6 +3062,7 @@ {"id":{"name":"sh_path_sdf","path":"shaders/sh_path_sdf/sh_path_sdf.yy",},}, {"id":{"name":"sh_pb_diamond","path":"shaders/sh_pb_diamond/sh_pb_diamond.yy",},}, {"id":{"name":"sh_pb_draw","path":"shaders/sh_pb_draw/sh_pb_draw.yy",},}, + {"id":{"name":"sh_pb_main_draw","path":"shaders/sh_pb_main_draw/sh_pb_main_draw.yy",},}, {"id":{"name":"sh_perlin_extra","path":"shaders/sh_perlin_extra/sh_perlin_extra.yy",},}, {"id":{"name":"sh_perlin_smear","path":"shaders/sh_perlin_smear/sh_perlin_smear.yy",},}, {"id":{"name":"sh_perlin_tiled","path":"shaders/sh_perlin_tiled/sh_perlin_tiled.yy",},}, @@ -3197,7 +3207,6 @@ {"id":{"name":"s_filter_node_inspector","path":"sprites/s_filter_node_inspector/s_filter_node_inspector.yy",},}, {"id":{"name":"s_filter_node","path":"sprites/s_filter_node/s_filter_node.yy",},}, {"id":{"name":"s_filter","path":"sprites/s_filter/s_filter.yy",},}, - {"id":{"name":"sh_corner_apply","path":"shaders/sh_corner_apply/sh_corner_apply.yy",},}, {"id":{"name":"s_flare_type","path":"sprites/s_flare_type/s_flare_type.yy",},}, {"id":{"name":"s_fx_pixel","path":"sprites/s_fx_pixel/s_fx_pixel.yy",},}, {"id":{"name":"s_gamemaker","path":"sprites/s_gamemaker/s_gamemaker.yy",},}, @@ -3262,6 +3271,7 @@ {"id":{"name":"s_node_3d_transform","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},}, {"id":{"name":"s_node_3d_uv_remap","path":"sprites/s_node_3d_uv_remap/s_node_3d_uv_remap.yy",},}, {"id":{"name":"s_node_9slice","path":"sprites/s_node_9slice/s_node_9slice.yy",},}, + {"id":{"name":"s_node_action_default","path":"sprites/s_node_action_default/s_node_action_default.yy",},}, {"id":{"name":"s_node_active_canvas","path":"sprites/s_node_active_canvas/s_node_active_canvas.yy",},}, {"id":{"name":"s_node_alignment","path":"sprites/s_node_alignment/s_node_alignment.yy",},}, {"id":{"name":"s_node_alpha_cutoff","path":"sprites/s_node_alpha_cutoff/s_node_alpha_cutoff.yy",},}, diff --git a/datafiles/data/Collections.zip b/datafiles/data/Collections.zip index d6fee95c4..6caccf500 100644 Binary files a/datafiles/data/Collections.zip and b/datafiles/data/Collections.zip differ diff --git a/objects/o_dialog_add_node/Create_0.gml b/objects/o_dialog_add_node/Create_0.gml index 241ba657a..238a25078 100644 --- a/objects/o_dialog_add_node/Create_0.gml +++ b/objects/o_dialog_add_node/Create_0.gml @@ -254,8 +254,10 @@ event_inherited(); } else if(is(_node, NodeAction)) { // NOT IMPLEMENTED var _dat = _node.build(node_target_x, node_target_y,, _param); - var _node_in = _dat.inputNode; - var _node_out = _dat.outputNode; + if(_dat == noone) return; + + var _node_in = _dat[$ "inputNode"] ?? noone; + var _node_out = _dat[$ "outputNode"] ?? noone; if(_node_in != noone) for( var i = 0, n = array_length(_node_in.inputs); i < n; i++ ) @@ -532,6 +534,8 @@ event_inherited(); if(is_global && !_node.show_in_global) continue; } + if(is(_node, NodeAction_create) && array_empty(PANEL_GRAPH.nodes_selecting)) continue; + if(is_string(_node)) { if(PREFERENCES.dialog_add_node_grouping == 0) continue; if(PREFERENCES.dialog_add_node_grouping == 1 && string_starts_with(_node, "/")) continue; @@ -716,6 +720,8 @@ event_inherited(); if(is_global && !_node.show_in_global) continue; } + if(is(_node, NodeAction_create) && array_empty(PANEL_GRAPH.nodes_selecting)) continue; + if(is_string(_node)) { if(PREFERENCES.dialog_add_node_grouping == 0) continue; if(PREFERENCES.dialog_add_node_grouping == 1 && string_starts_with(_node, "/")) continue; diff --git a/objects/o_dialog_scrollbox_horizontal/Create_0.gml b/objects/o_dialog_scrollbox_horizontal/Create_0.gml index 2d45c3b15..09c71d25d 100644 --- a/objects/o_dialog_scrollbox_horizontal/Create_0.gml +++ b/objects/o_dialog_scrollbox_horizontal/Create_0.gml @@ -2,7 +2,8 @@ event_inherited(); #region - max_h = 640; + max_w = WIN_W * .8; + max_h = ui(640); horizon = true; font = f_p0 @@ -11,6 +12,9 @@ event_inherited(); item_pad = ui(8); minWidth = 0; widths = []; + heights = []; + + minHeight = 0; draggable = false; destroy_on_click_out = true; @@ -72,22 +76,27 @@ event_inherited(); var lh = item_pad; var _emp = true; - widths = []; + widths = []; + heights = []; draw_set_text(font, fa_left, fa_top); for( var i = 0, n = array_length(data); i < n; i++ ) { var _val = data[i]; - var txt = is_instanceof(_val, scrollItem)? _val.name : _val; - var _spr = is_instanceof(_val, scrollItem) && _val.spr; + var txt = is(_val, scrollItem)? _val.name : _val; + var _spr = is(_val, scrollItem) && _val.spr; if(_hori) { if(_val == -1) { if(_emp) { - array_push(widths, 0); + array_push(widths, 0); + array_push(heights, 0); + } else { - lw = max(minWidth, lw); - array_push(widths, lw); + lw = max(minWidth, lw); + array_push(widths, lw); + array_push(heights, lh); + ww += lw; hh = max(hh, lh); } @@ -103,13 +112,15 @@ event_inherited(); _emp = false; - tw = string_width(txt) + _spr * (hght + _tpad * 2); - lw = max(lw, tw + _tpad * 2); - lh += hght; + tw = string_width(txt) + _spr * (hght + _tpad * 2) + _tpad * 2; + lw = max(lw, tw); + lh += hght; } lw = max(minWidth, lw); - array_push(widths, _emp? 0 : lw); + + array_push(widths, _emp? 0 : lw); + array_push(heights, _emp? 0 : lh); ww += lw; hh = max(hh, lh); @@ -122,6 +133,31 @@ event_inherited(); dialog_h = min(max_h, sh + lh); } + if(_hori && dialog_w >= max_w) { + var wwMin = 0; + minHeight = sh + hh; + + var lwMin = 0; + var lhMin = item_pad; + + for( var i = 0, n = array_length(heights); i < n; i++ ) { + var _w = widths[i]; + var _h = heights[i]; + + if(lhMin + _h > minHeight) { + wwMin += lwMin; + lwMin = 0; + lhMin = item_pad; + } + + lwMin = max(lwMin, _w); + lhMin += _h; + } + + wwMin += lwMin; + dialog_w = wwMin + _tpad * 2; + } + sc_content.resize(dialog_w - _tpad * 2, dialog_h - ui(40)); resetPosition(); @@ -141,20 +177,31 @@ event_inherited(); var _hori = horizon && search_string == ""; var _tpad = _hori? text_pad : ui(8); + var _ww = sc_content.surface_w; + var _hh = sc_content.surface_h; + var _dw = 0; + + if(MOUSE_MOVED) selecting = noone; + for( var i = 0, n = array_length(data); i < n; i++ ) { - var _dw = _hori? widths[_col] : sc_content.surface_w; var _val = data[i]; + _dw = max(_dw, _hori? widths[_col] : _ww); if(_hori) { if(_val == -1) { - _lx += _dw; - _ly = _y; _col++; + var _ch = heights[_col]; - _h = max(_h, _lh); - _lh = 0; - _lw = 0; - + if(_lh + _ch > minHeight) { + _lx += _dw; + _ly = _y; + + _h = max(_h, _lh); + _dw = 0; + _lh = 0; + _lw = 0; + + } continue; } @@ -213,8 +260,12 @@ event_inherited(); var _xc = _spr != noone? hght + (_dw - hght) / 2 : _dw / 2; draw_text_add(_lx + _xc, _ly + hght / 2, _txt); - } else if(align == fa_left) - draw_text_add(_tpad + _lx + (_spr != noone) * (_tpad * 2 + hght), _ly + hght / 2, _txt); + } else if(align == fa_left) { + var _tx = _tpad + _lx; + if(_spr != noone) _tx += _tpad * 2 + hght; + + draw_text_add(_tx, _ly + hght / 2, _txt); + } if(_spr) draw_sprite_ui(_val.spr, _val.spr_ind, _lx + ui(8) + hght / 2, _ly + hght / 2, 1, 1, 0, _val.spr_blend); @@ -244,7 +295,7 @@ event_inherited(); instance_destroy(); } - return _h; + return _h + ui(8); }); sc_content.scroll_resize = false; diff --git a/scripts/__node/__node.gml b/scripts/__node/__node.gml index a468e8ba4..7e7eb0f6c 100644 --- a/scripts/__node/__node.gml +++ b/scripts/__node/__node.gml @@ -9,6 +9,7 @@ function __Node_Base(x, y) constructor { outputs = []; input_value_map = {}; + is_selecting = false; active_index = -1; preview_index = 0; anim_priority = -999; diff --git a/scripts/directory_functions/directory_functions.gml b/scripts/directory_functions/directory_functions.gml index a12e0d976..b06293b57 100644 --- a/scripts/directory_functions/directory_functions.gml +++ b/scripts/directory_functions/directory_functions.gml @@ -1,6 +1,16 @@ function directory_verify(path) { - if(directory_exists(path)) return; - directory_create(path); + var _d = path; + var _v = ds_stack_create(); + + while(!directory_exists(_d)) { + ds_stack_push(_v, _d); + _d = filename_dir(_d); + } + + repeat(ds_stack_size(_v)) + directory_create(ds_stack_pop(_v)); + + ds_stack_destroy(_v); } function directory_clear(path) { @@ -12,4 +22,17 @@ function directory_clear(path) { function directory_size_mb(dir) { if(!directory_exists(dir)) return 0; return directory_size(dir) / (1024*1024); +} + +function directory_get_files_ext(dir, ext) { + var a = []; + + var f = file_find_first(dir + "/*", 0), _f; + while (f != "") { + if(filename_ext(f) == ext) array_push(a, f); + f = file_find_next(); + } + file_find_close(); + + return a; } \ No newline at end of file diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index f35e7e296..043f795fb 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -43,8 +43,8 @@ LATEST_VERSION = 1_18_00_0; VERSION = 1_18_09_0; SAVE_VERSION = 1_18_09_1; - VERSION_STRING = MAC? "1.18.003m" : "1.18.10.004"; - BUILD_NUMBER = 118101.004; + VERSION_STRING = MAC? "1.18.003m" : "1.18.10.005"; + BUILD_NUMBER = 118101.005; PREF_VERSION = 1_17_1; var _vsp = string_split(VERSION_STRING, "."); diff --git a/scripts/node_action_object/node_action_object.gml b/scripts/node_action_object/node_action_object.gml index 864a8e57f..5c68da59a 100644 --- a/scripts/node_action_object/node_action_object.gml +++ b/scripts/node_action_object/node_action_object.gml @@ -2,7 +2,7 @@ global.ACTIONS = []; function NodeAction() constructor { name = ""; - spr = noone; + spr = s_node_action_default; node = noone; tags = []; @@ -124,37 +124,31 @@ function NodeAction_create() : NodeAction() constructor { spr = s_action_add; hide_bg = true; - static build = function() { PANEL_GRAPH.createAction(); } + static build = function() { PANEL_GRAPH.createAction(); return noone; } } -function __initNodeActions() { - var root = $"{DIRECTORY}Nodes"; - directory_verify(root); +function __initNodeActions(_update = false) { + if(_update) { + array_resize(NODE_ACTION_LIST, 0); + array_push(NODE_ACTION_LIST, new NodeAction_create()); + + } else NODE_ACTION_LIST = [ new NodeAction_create() ]; var root = $"{DIRECTORY}Nodes/Actions"; directory_verify(root); - NODE_ACTION_LIST = [ new NodeAction_create() ]; + var _acts = directory_get_files_ext(root, ".json"); - var f = file_find_first(root + "/*", 0), _f; - - while (f != "") { - _f = f; - f = file_find_next(); - - if(filename_ext(_f) != ".json") continue; - + for( var i = 0, n = array_length(_acts); i < n; i++ ) { + var _f = _acts[i]; var _c = new NodeAction().deserialize($"{root}/{_f}"); array_push(NODE_ACTION_LIST, _c); if(_c.location == noone) continue; - var _cat = array_safe_get(_c.location, 0, ""); var _grp = array_safe_get(_c.location, 1, ""); - - } - file_find_close(); + } function __initAction() { diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index 28f7c46cd..b4771946b 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -125,7 +125,6 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { badgePreview = 0; badgeInspect = 0; - is_selecting = false; active_drawing = false; active_draw_index = -1; active_draw_anchor = false; diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index 9d1e7e7ae..476ed1f04 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -503,7 +503,6 @@ function __read_node_display(_list) { } else { var _txt = $"Missing node data [{_n}]: Check if node folder exists in {DIRECTORY}Nodes\Internal"; - // print(_txt); noti_warning(_txt); } } diff --git a/scripts/panel_action_create/panel_action_create.gml b/scripts/panel_action_create/panel_action_create.gml index 0e79cbc2b..104f2450d 100644 --- a/scripts/panel_action_create/panel_action_create.gml +++ b/scripts/panel_action_create/panel_action_create.gml @@ -2,7 +2,7 @@ function Panel_Action_Create() : PanelContent() constructor { #region data title = __txt("Create Action"); showHeader = true; - padding = ui(12); + padding = ui(8); w = min(WIN_W, ui(720)); h = ui(400); @@ -19,12 +19,12 @@ function Panel_Action_Create() : PanelContent() constructor { nodes = []; connections = []; - cat_index = 0; node_categories = [ "None" ]; + cat_index = 0; cat_value = [ noone ]; - for(var i = 0; i < ds_list_size(NODE_CATEGORY); i++) { - var _name = NODE_CATEGORY[| i].name; + for(var i = 0; i < array_length(NODE_CATEGORY); i++) { + var _name = NODE_CATEGORY[i].name; switch(_name) { case "Action" : case "Custom" : @@ -35,11 +35,12 @@ function Panel_Action_Create() : PanelContent() constructor { array_push(node_categories, _name); array_push(cat_value, [ _name, "" ]); - var _list = NODE_CATEGORY[| i].list; - for(var j = 0, m = ds_list_size(_list); j < m; j++ ) { - if(is_string(_list[| j])) { - array_push(node_categories, $"> {_list[| j]}"); - array_push(cat_value, [ _name, _list[| j] ]); + var _list = NODE_CATEGORY[i].list; + + for(var j = 0, m = array_length(_list); j < m; j++ ) { + if(is_string(_list[j])) { + array_push(node_categories, $"> {_list[j]}"); + array_push(cat_value, [ _name, _list[j] ]); } } @@ -47,18 +48,18 @@ function Panel_Action_Create() : PanelContent() constructor { array_push(cat_value, noone); } - tb_name = new textBox( TEXTBOX_INPUT.text, function(str) /*=>*/ { name = str; }).setAutoUpdate(); - tb_tooltip = new textArea(TEXTBOX_INPUT.text, function(str) /*=>*/ { tooltip = str; }).setAutoUpdate(); - tb_alias = new textArea(TEXTBOX_INPUT.text, function(str) /*=>*/ { tags = str; }).setAutoUpdate(); - tb_location = new scrollBox(node_categories, function(val) /*=>*/ { cat_index = val; }); - tb_location.align = fa_left; - tb_location.horizontal = true; - tb_location.padding = ui(16); - tb_location.item_pad = ui(4); - tb_location.font = f_p2; + tb_name = new textBox( TEXTBOX_INPUT.text, function(s) /*=>*/ { name = s; }).setAutoUpdate().setFont(f_p2); + tb_tooltip = new textArea(TEXTBOX_INPUT.text, function(s) /*=>*/ { tooltip = s; }).setAutoUpdate().setFont(f_p2); + tb_alias = new textArea(TEXTBOX_INPUT.text, function(s) /*=>*/ { tags = s; }).setAutoUpdate().setFont(f_p2); + tb_location = new scrollBox(node_categories, function(v) /*=>*/ { cat_index = v; }) + .setAlign(fa_left) + .setHorizontal(true) + .setFont(f_p2) + .setPadding(ui(16)) + .setPaddingItem(ui(4)); b_create = button(function() /*=>*/ { - var _path = $"{DIRECTORY}Actions/Nodes/{name}.json"; + var _path = $"{DIRECTORY}Nodes/Actions/{name}.json"; var _map = { name, sprPath : $"./{name}.png", @@ -71,10 +72,10 @@ function Panel_Action_Create() : PanelContent() constructor { json_save_struct(_path, _map); - if(spr) surface_save(spr, $"{DIRECTORY}Actions/Nodes/{name}.png"); + if(spr) surface_save(spr, $"{DIRECTORY}Nodes/Actions/{name}.png"); close(); - __initNodeActions(); + __initNodeActions(true); }); b_create.text = __txtx("new_action_create", "Create"); @@ -93,8 +94,8 @@ function Panel_Action_Create() : PanelContent() constructor { var _lh = line_get_height(f_p2); for (var i = 0, n = array_length(rawNodes); i < n; i++) { - var _r = rawNodes[i]; - var _n = _r.node; + var _r = rawNodes[i]; + var _n = _r.node; var _name = _n.getFullName(); var _nd = nodes[i]; @@ -125,7 +126,7 @@ function Panel_Action_Create() : PanelContent() constructor { var _bx = ui(8 + 12); var _by = yy + _lh / 2; var _tg = struct_has(_vali, "value"); _ttg |= _tg; - var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, 6); + var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, ui(8)); if(_hv) { TOOLTIP = "Save value"; sc_node_content.hover_content = true; @@ -140,7 +141,7 @@ function Panel_Action_Create() : PanelContent() constructor { if(_in.expUse) { var _tg = struct_has(_vali, "expression"); _ttg |= _tg; - var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, 6); + var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, ui(8)); if(_hv) { TOOLTIP = "Save expression"; sc_node_content.hover_content = true; @@ -156,7 +157,7 @@ function Panel_Action_Create() : PanelContent() constructor { if(_in.unit.reference != noone) { var _tg = struct_has(_vali, "unit"); _ttg |= _tg; - var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, 6); + var _hv = pHOVER && point_in_circle(_m[0], _m[1], _bx, _by, ui(8)); if(_hv) { TOOLTIP = "Save unit"; sc_node_content.hover_content = true; @@ -249,13 +250,14 @@ function Panel_Action_Create() : PanelContent() constructor { function drawContent(panel) { draw_clear_alpha(COLORS.panel_bg_clear, 0); - var _pd = padding; + var _pd = padding; + var _conw = ui(320); // Nodes var ndx = _pd; var ndy = _pd; - var ndw = w - _pd * 2 - ui(320); + var ndw = w - _pd * 2 - _conw; var ndh = h - _pd * 2; draw_sprite_stretched(THEME.ui_panel_bg, 1, ndx, ndy, ndw, ndh); @@ -265,11 +267,11 @@ function Panel_Action_Create() : PanelContent() constructor { // Metadata - var _tx = w - ui(320); + var _tx = w - _conw; var _nm = ui(128); var _wx = _tx + _nm; var _wy = ui(8); - var _ww = ui(320) - _pd - _nm; + var _ww = _conw - _pd - _nm; var _wh = TEXTBOX_HEIGHT; var _th = _wy; @@ -278,24 +280,28 @@ function Panel_Action_Create() : PanelContent() constructor { tb_alias.setFocusHover(pFOCUS, pHOVER); tb_alias.register(); tb_location.setFocusHover(pFOCUS, pHOVER); tb_location.register(); - draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text_add(_tx, _wy + _wh / 2, __txt("Name")); - var _hh = tb_name.draw(_wx, _wy, _ww, _wh, name, [ mx, my ]); _wy += _hh + ui(8); _th += _hh + ui(8); + draw_set_text(f_p2, fa_left, fa_center, COLORS._main_text); + draw_text_add(_tx + ui(8), _wy + _wh / 2, __txt("Name")); + var _hh = tb_name.draw(_wx, _wy, _ww, _wh, name, [ mx, my ]); + _wy += _hh + ui(8); _th += _hh + ui(8); - draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text_add(_tx, _wy + _wh / 2, __txt("Alias")); - var _hh = tb_alias.draw(_wx, _wy, _ww, _wh, tags, [ mx, my ]); _wy += _hh + ui(8); _th += _hh + ui(8); + draw_set_text(f_p2, fa_left, fa_center, COLORS._main_text); + draw_text_add(_tx + ui(8), _wy + _wh / 2, __txt("Alias")); + var _hh = tb_alias.draw(_wx, _wy, _ww, _wh, tags, [ mx, my ]); + _wy += _hh + ui(8); _th += _hh + ui(8); - draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text_add(_tx, _wy + _wh / 2, __txt("Tooltip")); - var _hh = tb_tooltip.draw(_wx, _wy, _ww, _wh * 2, tooltip, [ mx, my ]); _wy += _hh + ui(8); _th += _hh + ui(8); + draw_set_text(f_p2, fa_left, fa_center, COLORS._main_text); + draw_text_add(_tx + ui(8), _wy + _wh / 2, __txt("Tooltip")); + var _hh = tb_tooltip.draw(_wx, _wy, _ww, _wh * 2, tooltip, [ mx, my ]); + _wy += _hh + ui(8); _th += _hh + ui(8); - draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text_add(_tx, _wy + _wh / 2, __txt("Category")); - var _hh = tb_location.draw(_wx, _wy, _ww, _wh, cat_index, [ mx, my ], x, y); _wy += _hh + ui(8); _th += _hh + ui(8); + draw_set_text(f_p2, fa_left, fa_center, COLORS._main_text); + draw_text_add(_tx + ui(8), _wy + _wh / 2, __txt("Category")); + var _hh = tb_location.draw(_wx, _wy, _ww, _wh, cat_index, [ mx, my ], x, y); + _wy += _hh + ui(8); _th += _hh + ui(8); - draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text_add(_tx, _wy + _wh / 2, __txt("Icon")); + draw_set_text(f_p2, fa_left, fa_center, COLORS._main_text); + draw_text_add(_tx + ui(8), _wy + _wh / 2, __txt("Icon")); var spx = _wx; var spy = _wy; diff --git a/scripts/scrollBox/scrollBox.gml b/scripts/scrollBox/scrollBox.gml index ad7406bb6..f8a957a32 100644 --- a/scripts/scrollBox/scrollBox.gml +++ b/scripts/scrollBox/scrollBox.gml @@ -13,8 +13,8 @@ function scrollItem(name, spr = noone, spr_ind = 0, spr_blend = COLORS._main_ico static setTooltip = function(_tt) { tooltip = _tt; return self; } } -function scrollBox(_data, _onModify, update_hover = true) : widget() constructor { - self.update_hover = update_hover; +function scrollBox(_data, _onModify, _update_hover = true) : widget() constructor { + update_hover = _update_hover; onModify = _onModify; data_list = _data; @@ -40,11 +40,13 @@ function scrollBox(_data, _onModify, update_hover = true) : widget() constructor type = 0; hide = 0; - static setHorizontal = function(_l) /*=>*/ { horizontal = _l; return self; } - static setAlign = function(_l) /*=>*/ { align = _l; return self; } - static setTextColor = function(_l) /*=>*/ { text_color = _l; return self; } - static setUpdateHover = function(_l) /*=>*/ { update_hover = _l; return self; } - static setMinWidth = function(_l) /*=>*/ { minWidth = _l; return self; } + static setHorizontal = function(_l) /*=>*/ { horizontal = _l; return self; } + static setAlign = function(_l) /*=>*/ { align = _l; return self; } + static setTextColor = function(_l) /*=>*/ { text_color = _l; return self; } + static setUpdateHover = function(_l) /*=>*/ { update_hover = _l; return self; } + static setMinWidth = function(_l) /*=>*/ { minWidth = _l; return self; } + static setPadding = function(_l) /*=>*/ { padding = _l; return self; } + static setPaddingItem = function(_l) /*=>*/ { item_pad = _l; return self; } static setPaddingScroll = function(_l) /*=>*/ { padding_scroll = _l; return self; } static trigger = function() { diff --git a/sprites/s_bone_constrain/s_bone_constrain.yy b/sprites/s_bone_constrain/s_bone_constrain.yy index f8aa6602f..06230a959 100644 --- a/sprites/s_bone_constrain/s_bone_constrain.yy +++ b/sprites/s_bone_constrain/s_bone_constrain.yy @@ -31,8 +31,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_inspector_wavetable/s_inspector_wavetable.yy b/sprites/s_inspector_wavetable/s_inspector_wavetable.yy index 68b400046..52e0d7867 100644 --- a/sprites/s_inspector_wavetable/s_inspector_wavetable.yy +++ b/sprites/s_inspector_wavetable/s_inspector_wavetable.yy @@ -28,8 +28,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_junc_aseprite/s_junc_aseprite.yy b/sprites/s_junc_aseprite/s_junc_aseprite.yy index 4e8bbf8d0..ef645aac4 100644 --- a/sprites/s_junc_aseprite/s_junc_aseprite.yy +++ b/sprites/s_junc_aseprite/s_junc_aseprite.yy @@ -26,7 +26,7 @@ "origin":4, "parent":{ "name":"junctions", - "path":"folders/sprites/nodes/junctions.yy", + "path":"folders/sprites/junctions.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_2d_light_shape/s_node_2d_light_shape.yy b/sprites/s_node_2d_light_shape/s_node_2d_light_shape.yy index 2db9111f9..1de76039e 100644 --- a/sprites/s_node_2d_light_shape/s_node_2d_light_shape.yy +++ b/sprites/s_node_2d_light_shape/s_node_2d_light_shape.yy @@ -31,8 +31,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_3d_affector_shape/s_node_3d_affector_shape.yy b/sprites/s_node_3d_affector_shape/s_node_3d_affector_shape.yy index b97861124..9006719dd 100644 --- a/sprites/s_node_3d_affector_shape/s_node_3d_affector_shape.yy +++ b/sprites/s_node_3d_affector_shape/s_node_3d_affector_shape.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_action_default/f1335e25-2155-4fed-af9c-b7292e170940.png b/sprites/s_node_action_default/f1335e25-2155-4fed-af9c-b7292e170940.png new file mode 100644 index 000000000..0d57b554f Binary files /dev/null and b/sprites/s_node_action_default/f1335e25-2155-4fed-af9c-b7292e170940.png differ diff --git a/sprites/s_node_action_default/layers/f1335e25-2155-4fed-af9c-b7292e170940/be5ae4eb-183a-429f-9954-55735933c188.png b/sprites/s_node_action_default/layers/f1335e25-2155-4fed-af9c-b7292e170940/be5ae4eb-183a-429f-9954-55735933c188.png new file mode 100644 index 000000000..0d57b554f Binary files /dev/null and b/sprites/s_node_action_default/layers/f1335e25-2155-4fed-af9c-b7292e170940/be5ae4eb-183a-429f-9954-55735933c188.png differ diff --git a/sprites/s_node_action_default/s_node_action_default.yy b/sprites/s_node_action_default/s_node_action_default.yy new file mode 100644 index 000000000..f4ec41176 --- /dev/null +++ b/sprites/s_node_action_default/s_node_action_default.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"", + "%Name":"s_node_action_default", + "bboxMode":0, + "bbox_bottom":110, + "bbox_left":35, + "bbox_right":92, + "bbox_top":17, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"f1335e25-2155-4fed-af9c-b7292e170940","name":"f1335e25-2155-4fed-af9c-b7292e170940","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":128, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"be5ae4eb-183a-429f-9954-55735933c188","blendMode":0,"displayName":"default","isLocked":false,"name":"be5ae4eb-183a-429f-9954-55735933c188","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_node_action_default", + "nineSlice":null, + "origin":4, + "parent":{ + "name":"node", + "path":"folders/sprites/node.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_node_action_default", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_node_action_default", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1335e25-2155-4fed-af9c-b7292e170940","path":"sprites/s_node_action_default/s_node_action_default.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3ecce393-9c16-4452-9b46-9cc69f4fd423","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":64, + "yorigin":64, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":128, +} \ No newline at end of file diff --git a/sprites/s_node_alignment/s_node_alignment.yy b/sprites/s_node_alignment/s_node_alignment.yy index 3c4a97f9b..2d31085c3 100644 --- a/sprites/s_node_alignment/s_node_alignment.yy +++ b/sprites/s_node_alignment/s_node_alignment.yy @@ -28,8 +28,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_armature_mesh/s_node_armature_mesh.yy b/sprites/s_node_armature_mesh/s_node_armature_mesh.yy index 92a10f754..b2ec7c9c0 100644 --- a/sprites/s_node_armature_mesh/s_node_armature_mesh.yy +++ b/sprites/s_node_armature_mesh/s_node_armature_mesh.yy @@ -25,8 +25,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_axis_type/s_node_axis_type.yy b/sprites/s_node_axis_type/s_node_axis_type.yy index 8625d0c91..48ef61c4c 100644 --- a/sprites/s_node_axis_type/s_node_axis_type.yy +++ b/sprites/s_node_axis_type/s_node_axis_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_bend_type/s_node_bend_type.yy b/sprites/s_node_bend_type/s_node_bend_type.yy index 8e03dfd64..e90c0a315 100644 --- a/sprites/s_node_bend_type/s_node_bend_type.yy +++ b/sprites/s_node_bend_type/s_node_bend_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_camera_repeat/s_node_camera_repeat.yy b/sprites/s_node_camera_repeat/s_node_camera_repeat.yy index d49304d55..370b92e6b 100644 --- a/sprites/s_node_camera_repeat/s_node_camera_repeat.yy +++ b/sprites/s_node_camera_repeat/s_node_camera_repeat.yy @@ -28,8 +28,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_color_data_label/s_node_color_data_label.yy b/sprites/s_node_color_data_label/s_node_color_data_label.yy index d75401772..d488375be 100644 --- a/sprites/s_node_color_data_label/s_node_color_data_label.yy +++ b/sprites/s_node_color_data_label/s_node_color_data_label.yy @@ -51,8 +51,8 @@ }, "origin":5, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_condition_type/s_node_condition_type.yy b/sprites/s_node_condition_type/s_node_condition_type.yy index b50d4fae8..3d52e38c9 100644 --- a/sprites/s_node_condition_type/s_node_condition_type.yy +++ b/sprites/s_node_condition_type/s_node_condition_type.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_curve_type/s_node_curve_type.yy b/sprites/s_node_curve_type/s_node_curve_type.yy index 36b2d7eee..78863ec0c 100644 --- a/sprites/s_node_curve_type/s_node_curve_type.yy +++ b/sprites/s_node_curve_type/s_node_curve_type.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_flip_render_type/s_node_flip_render_type.yy b/sprites/s_node_flip_render_type/s_node_flip_render_type.yy index 7aebca631..d20f50625 100644 --- a/sprites/s_node_flip_render_type/s_node_flip_render_type.yy +++ b/sprites/s_node_flip_render_type/s_node_flip_render_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_gradient_type/s_node_gradient_type.yy b/sprites/s_node_gradient_type/s_node_gradient_type.yy index 5f531bf83..ed3b2beb3 100644 --- a/sprites/s_node_gradient_type/s_node_gradient_type.yy +++ b/sprites/s_node_gradient_type/s_node_gradient_type.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_line_cap/s_node_line_cap.yy b/sprites/s_node_line_cap/s_node_line_cap.yy index e30a4fd43..4bc8cd1e8 100644 --- a/sprites/s_node_line_cap/s_node_line_cap.yy +++ b/sprites/s_node_line_cap/s_node_line_cap.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_liquefy_type/s_node_liquefy_type.yy b/sprites/s_node_liquefy_type/s_node_liquefy_type.yy index 544063b24..35905ee12 100644 --- a/sprites/s_node_liquefy_type/s_node_liquefy_type.yy +++ b/sprites/s_node_liquefy_type/s_node_liquefy_type.yy @@ -28,8 +28,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_logic_type/s_node_logic_type.yy b/sprites/s_node_logic_type/s_node_logic_type.yy index 1810794bb..2d544efd7 100644 --- a/sprites/s_node_logic_type/s_node_logic_type.yy +++ b/sprites/s_node_logic_type/s_node_logic_type.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_math_operators/s_node_math_operators.yy b/sprites/s_node_math_operators/s_node_math_operators.yy index 19c9c6e54..586dc7d8c 100644 --- a/sprites/s_node_math_operators/s_node_math_operators.yy +++ b/sprites/s_node_math_operators/s_node_math_operators.yy @@ -43,8 +43,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_mesh_type/s_node_mesh_type.yy b/sprites/s_node_mesh_type/s_node_mesh_type.yy index 939b09b9e..0d171a4f8 100644 --- a/sprites/s_node_mesh_type/s_node_mesh_type.yy +++ b/sprites/s_node_mesh_type/s_node_mesh_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_mk_grid_flip/s_node_mk_grid_flip.yy b/sprites/s_node_mk_grid_flip/s_node_mk_grid_flip.yy index b0b108eda..e0e5b3a78 100644 --- a/sprites/s_node_mk_grid_flip/s_node_mk_grid_flip.yy +++ b/sprites/s_node_mk_grid_flip/s_node_mk_grid_flip.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_mk_rain_type/s_node_mk_rain_type.yy b/sprites/s_node_mk_rain_type/s_node_mk_rain_type.yy index c95e5e1ba..fae575f46 100644 --- a/sprites/s_node_mk_rain_type/s_node_mk_rain_type.yy +++ b/sprites/s_node_mk_rain_type/s_node_mk_rain_type.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_normal_light_type/s_node_normal_light_type.yy b/sprites/s_node_normal_light_type/s_node_normal_light_type.yy index 1e37f43a2..9eda5ebbd 100644 --- a/sprites/s_node_normal_light_type/s_node_normal_light_type.yy +++ b/sprites/s_node_normal_light_type/s_node_normal_light_type.yy @@ -33,8 +33,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_path_3d_shape/s_node_path_3d_shape.yy b/sprites/s_node_path_3d_shape/s_node_path_3d_shape.yy index 2b9fcccf7..b5b7db370 100644 --- a/sprites/s_node_path_3d_shape/s_node_path_3d_shape.yy +++ b/sprites/s_node_path_3d_shape/s_node_path_3d_shape.yy @@ -32,8 +32,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_plot_linear_type/s_node_plot_linear_type.yy b/sprites/s_node_plot_linear_type/s_node_plot_linear_type.yy index 08ab4c266..af82f3bd2 100644 --- a/sprites/s_node_plot_linear_type/s_node_plot_linear_type.yy +++ b/sprites/s_node_plot_linear_type/s_node_plot_linear_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_repeat_axis/s_node_repeat_axis.yy b/sprites/s_node_repeat_axis/s_node_repeat_axis.yy index bd30695f9..c4b5adf5f 100644 --- a/sprites/s_node_repeat_axis/s_node_repeat_axis.yy +++ b/sprites/s_node_repeat_axis/s_node_repeat_axis.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_repeat_selection_types/s_node_repeat_selection_types.yy b/sprites/s_node_repeat_selection_types/s_node_repeat_selection_types.yy index 2a1678fde..698b02848 100644 --- a/sprites/s_node_repeat_selection_types/s_node_repeat_selection_types.yy +++ b/sprites/s_node_repeat_selection_types/s_node_repeat_selection_types.yy @@ -27,8 +27,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shadow_type/s_node_shadow_type.yy b/sprites/s_node_shadow_type/s_node_shadow_type.yy index 747f2fd3c..8b8497b11 100644 --- a/sprites/s_node_shadow_type/s_node_shadow_type.yy +++ b/sprites/s_node_shadow_type/s_node_shadow_type.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_3d/s_node_shape_3d.yy b/sprites/s_node_shape_3d/s_node_shape_3d.yy index 946bb7641..63b313674 100644 --- a/sprites/s_node_shape_3d/s_node_shape_3d.yy +++ b/sprites/s_node_shape_3d/s_node_shape_3d.yy @@ -44,8 +44,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_circle/s_node_shape_circle.yy b/sprites/s_node_shape_circle/s_node_shape_circle.yy index dd86b8501..a41e41b17 100644 --- a/sprites/s_node_shape_circle/s_node_shape_circle.yy +++ b/sprites/s_node_shape_circle/s_node_shape_circle.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_leaf/s_node_shape_leaf.yy b/sprites/s_node_shape_leaf/s_node_shape_leaf.yy index c9f357d9c..167c908f9 100644 --- a/sprites/s_node_shape_leaf/s_node_shape_leaf.yy +++ b/sprites/s_node_shape_leaf/s_node_shape_leaf.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_misc/s_node_shape_misc.yy b/sprites/s_node_shape_misc/s_node_shape_misc.yy index 76a73e1b0..c24251be9 100644 --- a/sprites/s_node_shape_misc/s_node_shape_misc.yy +++ b/sprites/s_node_shape_misc/s_node_shape_misc.yy @@ -26,8 +26,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_poly_type/s_node_shape_poly_type.yy b/sprites/s_node_shape_poly_type/s_node_shape_poly_type.yy index fb1ff771c..d41c1b68c 100644 --- a/sprites/s_node_shape_poly_type/s_node_shape_poly_type.yy +++ b/sprites/s_node_shape_poly_type/s_node_shape_poly_type.yy @@ -44,8 +44,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_rectangle/s_node_shape_rectangle.yy b/sprites/s_node_shape_rectangle/s_node_shape_rectangle.yy index 55aad358e..18c4e653b 100644 --- a/sprites/s_node_shape_rectangle/s_node_shape_rectangle.yy +++ b/sprites/s_node_shape_rectangle/s_node_shape_rectangle.yy @@ -30,8 +30,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_shape_type/s_node_shape_type.yy b/sprites/s_node_shape_type/s_node_shape_type.yy index 13d454e02..3a9ed236e 100644 --- a/sprites/s_node_shape_type/s_node_shape_type.yy +++ b/sprites/s_node_shape_type/s_node_shape_type.yy @@ -46,8 +46,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_node_trigger_cond/s_node_trigger_cond.yy b/sprites/s_node_trigger_cond/s_node_trigger_cond.yy index 29b6c6716..34efabc71 100644 --- a/sprites/s_node_trigger_cond/s_node_trigger_cond.yy +++ b/sprites/s_node_trigger_cond/s_node_trigger_cond.yy @@ -28,8 +28,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_shape_curve/s_shape_curve.yy b/sprites/s_shape_curve/s_shape_curve.yy index 1790db05b..283725550 100644 --- a/sprites/s_shape_curve/s_shape_curve.yy +++ b/sprites/s_shape_curve/s_shape_curve.yy @@ -25,8 +25,8 @@ "nineSlice":null, "origin":4, "parent":{ - "name":"nodes", - "path":"folders/sprites/nodes.yy", + "name":"enum icons", + "path":"folders/sprites/enum icons.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite",