diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 53670a455..0fd9c3a1d 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -100,12 +100,12 @@ {"name":"fixes","order":6,"path":"folders/nodes/data/filter/fixes.yy",}, {"name":"warps","order":2,"path":"folders/nodes/data/filter/warps.yy",}, {"name":"generator","order":5,"path":"folders/nodes/data/generator.yy",}, - {"name":"noise","order":14,"path":"folders/nodes/data/generator/noise.yy",}, - {"name":"pattern","order":15,"path":"folders/nodes/data/generator/pattern.yy",}, - {"name":"regions","order":23,"path":"folders/nodes/data/generator/regions.yy",}, + {"name":"noise","order":13,"path":"folders/nodes/data/generator/noise.yy",}, + {"name":"pattern","order":14,"path":"folders/nodes/data/generator/pattern.yy",}, + {"name":"regions","order":21,"path":"folders/nodes/data/generator/regions.yy",}, {"name":"group","order":7,"path":"folders/nodes/data/group.yy",}, {"name":"IO","order":1,"path":"folders/nodes/data/IO.yy",}, - {"name":"network","order":16,"path":"folders/nodes/data/IO/network.yy",}, + {"name":"network","order":15,"path":"folders/nodes/data/IO/network.yy",}, {"name":"iterate","order":9,"path":"folders/nodes/data/iterate.yy",}, {"name":"feedback","order":7,"path":"folders/nodes/data/iterate/feedback.yy",}, {"name":"for each","order":1,"path":"folders/nodes/data/iterate/for each.yy",}, @@ -241,7 +241,7 @@ {"name":"node_PCX_equation","order":5,"path":"scripts/node_PCX_equation/node_PCX_equation.yy",}, {"name":"sh_scale3x","order":29,"path":"shaders/sh_scale3x/sh_scale3x.yy",}, {"name":"__node_3d","order":8,"path":"scripts/__node_3d/__node_3d.yy",}, - {"name":"node_csv_file_write","order":13,"path":"scripts/node_csv_file_write/node_csv_file_write.yy",}, + {"name":"node_csv_file_write","order":12,"path":"scripts/node_csv_file_write/node_csv_file_write.yy",}, {"name":"surface_functions","order":5,"path":"scripts/surface_functions/surface_functions.yy",}, {"name":"dynaSurf_iso","order":1,"path":"scripts/dynaSurf_iso/dynaSurf_iso.yy",}, {"name":"sh_fd_add_velocity_glsl","order":1,"path":"shaders/sh_fd_add_velocity_glsl/sh_fd_add_velocity_glsl.yy",}, @@ -250,7 +250,7 @@ {"name":"node_hlsl","order":13,"path":"scripts/node_hlsl/node_hlsl.yy",}, {"name":"sh_dither","order":28,"path":"shaders/sh_dither/sh_dither.yy",}, {"name":"__vec2","order":7,"path":"scripts/__vec2/__vec2.yy",}, - {"name":"node_region_fill","order":20,"path":"scripts/node_region_fill/node_region_fill.yy",}, + {"name":"node_region_fill","order":18,"path":"scripts/node_region_fill/node_region_fill.yy",}, {"name":"sh_d3d_normal","order":18,"path":"shaders/sh_d3d_normal/sh_d3d_normal.yy",}, {"name":"s_node_text_file_read","order":13,"path":"sprites/s_node_text_file_read/s_node_text_file_read.yy",}, {"name":"s_node_text_trim","order":7,"path":"sprites/s_node_text_trim/s_node_text_trim.yy",}, @@ -271,6 +271,7 @@ {"name":"o_dialog_file_name_collection","order":6,"path":"objects/o_dialog_file_name_collection/o_dialog_file_name_collection.yy",}, {"name":"node_line","order":3,"path":"scripts/node_line/node_line.yy",}, {"name":"s_node_frame","order":1,"path":"sprites/s_node_frame/s_node_frame.yy",}, + {"name":"node_active_canvas","order":22,"path":"scripts/node_active_canvas/node_active_canvas.yy",}, {"name":"s_node_fluidSim_turbulence","order":10,"path":"sprites/s_node_fluidSim_turbulence/s_node_fluidSim_turbulence.yy",}, {"name":"node_pb_fx_hash","order":7,"path":"scripts/node_pb_fx_hash/node_pb_fx_hash.yy",}, {"name":"sh_pb_draw_mask","order":8,"path":"shaders/sh_pb_draw_mask/sh_pb_draw_mask.yy",}, @@ -305,7 +306,7 @@ {"name":"o_dialog_textbox_autocomplete","order":7,"path":"objects/o_dialog_textbox_autocomplete/o_dialog_textbox_autocomplete.yy",}, {"name":"s_node_loop_input","order":14,"path":"sprites/s_node_loop_input/s_node_loop_input.yy",}, {"name":"node_strand_length_adjust","order":11,"path":"scripts/node_strand_length_adjust/node_strand_length_adjust.yy",}, - {"name":"node_blinker","order":18,"path":"scripts/node_blinker/node_blinker.yy",}, + {"name":"node_blinker","order":17,"path":"scripts/node_blinker/node_blinker.yy",}, {"name":"fd_rectangle_add_material_surface","order":25,"path":"scripts/fd_rectangle_add_material_surface/fd_rectangle_add_material_surface.yy",}, {"name":"perlin_noise","order":5,"path":"scripts/perlin_noise/perlin_noise.yy",}, {"name":"fd_rectangle_replace_material","order":14,"path":"scripts/fd_rectangle_replace_material/fd_rectangle_replace_material.yy",}, @@ -372,13 +373,13 @@ {"name":"sh_d3d_extrude_extends","order":26,"path":"shaders/sh_d3d_extrude_extends/sh_d3d_extrude_extends.yy",}, {"name":"scrollBox","order":13,"path":"scripts/scrollBox/scrollBox.yy",}, {"name":"o_dialog_exit","order":2,"path":"objects/o_dialog_exit/o_dialog_exit.yy",}, - {"name":"node_polygonal_shape","order":10,"path":"scripts/node_polygonal_shape/node_polygonal_shape.yy",}, + {"name":"node_polygonal_shape","order":9,"path":"scripts/node_polygonal_shape/node_polygonal_shape.yy",}, {"name":"fd_rectangle_get_collision_mask_sprite","order":4,"path":"scripts/fd_rectangle_get_collision_mask_sprite/fd_rectangle_get_collision_mask_sprite.yy",}, {"name":"node_flip","order":13,"path":"scripts/node_flip/node_flip.yy",}, {"name":"s_node_pb_fx_subtract","order":1,"path":"sprites/s_node_pb_fx_subtract/s_node_pb_fx_subtract.yy",}, {"name":"sh_FXAA","order":52,"path":"shaders/sh_FXAA/sh_FXAA.yy",}, {"name":"s_biterator_slider","order":6,"path":"sprites/s_biterator_slider/s_biterator_slider.yy",}, - {"name":"node_gradient_points","order":8,"path":"scripts/node_gradient_points/node_gradient_points.yy",}, + {"name":"node_gradient_points","order":7,"path":"scripts/node_gradient_points/node_gradient_points.yy",}, {"name":"s_button_hide_fill","order":4,"path":"sprites/s_button_hide_fill/s_button_hide_fill.yy",}, {"name":"_f_code","order":9,"path":"fonts/_f_code/_f_code.yy",}, {"name":"sh_combine_rgb","order":11,"path":"shaders/sh_combine_rgb/sh_combine_rgb.yy",}, @@ -516,7 +517,7 @@ {"name":"s_node_pb_fx_strip","order":26,"path":"sprites/s_node_pb_fx_strip/s_node_pb_fx_strip.yy",}, {"name":"s_node_rigidSim_global","order":4,"path":"sprites/s_node_rigidSim_global/s_node_rigidSim_global.yy",}, {"name":"sh_channel_G_grey","order":8,"path":"shaders/sh_channel_G_grey/sh_channel_G_grey.yy",}, - {"name":"node_3d_depth","order":16,"path":"scripts/node_3d_depth/node_3d_depth.yy",}, + {"name":"node_3d_depth","order":15,"path":"scripts/node_3d_depth/node_3d_depth.yy",}, {"name":"s_node_vec4","order":9,"path":"sprites/s_node_vec4/s_node_vec4.yy",}, {"name":"vct_knob","order":2,"path":"scripts/vct_knob/vct_knob.yy",}, {"name":"node_to_number","order":13,"path":"scripts/node_to_number/node_to_number.yy",}, @@ -544,7 +545,7 @@ {"name":"s_node_iterator_length","order":24,"path":"sprites/s_node_iterator_length/s_node_iterator_length.yy",}, {"name":"preview_overlay_vector","order":2,"path":"scripts/preview_overlay_vector/preview_overlay_vector.yy",}, {"name":"sh_gradient_display","order":18,"path":"shaders/sh_gradient_display/sh_gradient_display.yy",}, - {"name":"node_json_file_write","order":12,"path":"scripts/node_json_file_write/node_json_file_write.yy",}, + {"name":"node_json_file_write","order":11,"path":"scripts/node_json_file_write/node_json_file_write.yy",}, {"name":"s_node_chromatic_abarration","order":14,"path":"sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy",}, {"name":"node_blur_directional","order":2,"path":"scripts/node_blur_directional/node_blur_directional.yy",}, {"name":"s_node_group","order":4,"path":"sprites/s_node_group/s_node_group.yy",}, @@ -649,7 +650,7 @@ {"name":"s_node_to_number","order":16,"path":"sprites/s_node_to_number/s_node_to_number.yy",}, {"name":"node_string_regex_replace","order":9,"path":"scripts/node_string_regex_replace/node_string_regex_replace.yy",}, {"name":"s_node_particle","order":12,"path":"sprites/s_node_particle/s_node_particle.yy",}, - {"name":"node_random_shape","order":17,"path":"scripts/node_random_shape/node_random_shape.yy",}, + {"name":"node_random_shape","order":16,"path":"scripts/node_random_shape/node_random_shape.yy",}, {"name":"s_node_random","order":3,"path":"sprites/s_node_random/s_node_random.yy",}, {"name":"sh_3d_extrude_filler","order":8,"path":"shaders/sh_3d_extrude_filler/sh_3d_extrude_filler.yy",}, {"name":"quarternionBox","order":8,"path":"scripts/quarternionBox/quarternionBox.yy",}, @@ -685,7 +686,7 @@ {"name":"node_noise_ani","order":1,"path":"scripts/node_noise_ani/node_noise_ani.yy",}, {"name":"s_node_transform","order":8,"path":"sprites/s_node_transform/s_node_transform.yy",}, {"name":"s_node_pb_draw_line","order":27,"path":"sprites/s_node_pb_draw_line/s_node_pb_draw_line.yy",}, - {"name":"node_canvas","order":5,"path":"scripts/node_canvas/node_canvas.yy",}, + {"name":"node_canvas","order":18,"path":"scripts/node_canvas/node_canvas.yy",}, {"name":"s_node_path_array","order":11,"path":"sprites/s_node_path_array/s_node_path_array.yy",}, {"name":"node_display_image","order":4,"path":"scripts/node_display_image/node_display_image.yy",}, {"name":"node_rigid_global","order":5,"path":"scripts/node_rigid_global/node_rigid_global.yy",}, @@ -746,7 +747,7 @@ {"name":"node_3d_material","order":16,"path":"scripts/node_3d_material/node_3d_material.yy",}, {"name":"pcx_server","order":2,"path":"scripts/pcx_server/pcx_server.yy",}, {"name":"s_node_array_set","order":9,"path":"sprites/s_node_array_set/s_node_array_set.yy",}, - {"name":"node_dust","order":21,"path":"scripts/node_dust/node_dust.yy",}, + {"name":"node_dust","order":19,"path":"scripts/node_dust/node_dust.yy",}, {"name":"node_noise_cell","order":2,"path":"scripts/node_noise_cell/node_noise_cell.yy",}, {"name":"s_node_pb_fx_radial","order":4,"path":"sprites/s_node_pb_fx_radial/s_node_pb_fx_radial.yy",}, {"name":"__background_get_internal","order":2,"path":"scripts/__background_get_internal/__background_get_internal.yy",}, @@ -760,7 +761,7 @@ {"name":"s_node_pb_draw_semi_ellipse","order":11,"path":"sprites/s_node_pb_draw_semi_ellipse/s_node_pb_draw_semi_ellipse.yy",}, {"name":"mtl_reader","order":6,"path":"scripts/mtl_reader/mtl_reader.yy",}, {"name":"s_node_3d_array","order":7,"path":"sprites/s_node_3d_array/s_node_3d_array.yy",}, - {"name":"node_plot_linear","order":13,"path":"scripts/node_plot_linear/node_plot_linear.yy",}, + {"name":"node_plot_linear","order":12,"path":"scripts/node_plot_linear/node_plot_linear.yy",}, {"name":"addon_lua_constant","order":5,"path":"scripts/addon_lua_constant/addon_lua_constant.yy",}, {"name":"sh_fd_velocity_combine","order":21,"path":"shaders/sh_fd_velocity_combine/sh_fd_velocity_combine.yy",}, {"name":"sh_scale2x","order":27,"path":"shaders/sh_scale2x/sh_scale2x.yy",}, @@ -800,7 +801,7 @@ {"name":"node_fluid_update","order":3,"path":"scripts/node_fluid_update/node_fluid_update.yy",}, {"name":"s_node_grid_noise","order":5,"path":"sprites/s_node_grid_noise/s_node_grid_noise.yy",}, {"name":"fd_rectangle_set_velocity_size","order":16,"path":"scripts/fd_rectangle_set_velocity_size/fd_rectangle_set_velocity_size.yy",}, - {"name":"node_image_gif","order":6,"path":"scripts/node_image_gif/node_image_gif.yy",}, + {"name":"node_image_gif","order":5,"path":"scripts/node_image_gif/node_image_gif.yy",}, {"name":"node_iterator_each_output","order":2,"path":"scripts/node_iterator_each_output/node_iterator_each_output.yy",}, {"name":"s_node_strandSim_render_texture","order":5,"path":"sprites/s_node_strandSim_render_texture/s_node_strandSim_render_texture.yy",}, {"name":"node_3d_set_material","order":2,"path":"scripts/node_3d_set_material/node_3d_set_material.yy",}, @@ -848,11 +849,11 @@ {"name":"s_node_pb_draw_rectangle","order":13,"path":"sprites/s_node_pb_draw_rectangle/s_node_pb_draw_rectangle.yy",}, {"name":"panel_animation","order":1,"path":"scripts/panel_animation/panel_animation.yy",}, {"name":"sh_pb_to_mask","order":7,"path":"shaders/sh_pb_to_mask/sh_pb_to_mask.yy",}, - {"name":"node_surface_replace","order":12,"path":"scripts/node_surface_replace/node_surface_replace.yy",}, + {"name":"node_surface_replace","order":11,"path":"scripts/node_surface_replace/node_surface_replace.yy",}, {"name":"node_strand_create","order":1,"path":"scripts/node_strand_create/node_strand_create.yy",}, {"name":"sh_gradient","order":17,"path":"shaders/sh_gradient/sh_gradient.yy",}, {"name":"sh_region_fill_init","order":2,"path":"shaders/sh_region_fill_init/sh_region_fill_init.yy",}, - {"name":"node_json_file_read","order":8,"path":"scripts/node_json_file_read/node_json_file_read.yy",}, + {"name":"node_json_file_read","order":7,"path":"scripts/node_json_file_read/node_json_file_read.yy",}, {"name":"s_node_array_remove","order":7,"path":"sprites/s_node_array_remove/s_node_array_remove.yy",}, {"name":"s_node_zigzag","order":18,"path":"sprites/s_node_zigzag/s_node_zigzag.yy",}, {"name":"s_key_display_mouse","order":1,"path":"sprites/s_key_display_mouse/s_key_display_mouse.yy",}, @@ -952,7 +953,7 @@ {"name":"node_VFX_effect_turbulence","order":5,"path":"scripts/node_VFX_effect_turbulence/node_VFX_effect_turbulence.yy",}, {"name":"action_loader","order":15,"path":"scripts/action_loader/action_loader.yy",}, {"name":"sh_surface_replace_replace","order":1,"path":"shaders/sh_surface_replace_replace/sh_surface_replace_replace.yy",}, - {"name":"node_ase_file_read","order":14,"path":"scripts/node_ase_file_read/node_ase_file_read.yy",}, + {"name":"node_ase_file_read","order":13,"path":"scripts/node_ase_file_read/node_ase_file_read.yy",}, {"name":"s_node_print","order":30,"path":"sprites/s_node_print/s_node_print.yy",}, {"name":"sh_seperate_shape_counter","order":1,"path":"shaders/sh_seperate_shape_counter/sh_seperate_shape_counter.yy",}, {"name":"s_node_stack","order":37,"path":"sprites/s_node_stack/s_node_stack.yy",}, @@ -1040,7 +1041,7 @@ {"name":"sh_fd_calculate_velocity_divergence_glsl","order":10,"path":"shaders/sh_fd_calculate_velocity_divergence_glsl/sh_fd_calculate_velocity_divergence_glsl.yy",}, {"name":"s_node_pb_fx_add","order":9,"path":"sprites/s_node_pb_fx_add/s_node_pb_fx_add.yy",}, {"name":"node_simple_shape","order":2,"path":"scripts/node_simple_shape/node_simple_shape.yy",}, - {"name":"node_wav_file_write","order":18,"path":"scripts/node_wav_file_write/node_wav_file_write.yy",}, + {"name":"node_wav_file_write","order":17,"path":"scripts/node_wav_file_write/node_wav_file_write.yy",}, {"name":"node_random","order":5,"path":"scripts/node_random/node_random.yy",}, {"name":"node_atlas","order":2,"path":"scripts/node_atlas/node_atlas.yy",}, {"name":"sh_blend_sat","order":18,"path":"shaders/sh_blend_sat/sh_blend_sat.yy",}, @@ -1089,6 +1090,7 @@ {"name":"number_function","order":14,"path":"scripts/number_function/number_function.yy",}, {"name":"s_node_array_shift","order":12,"path":"sprites/s_node_array_shift/s_node_array_shift.yy",}, {"name":"s_node_statistic","order":5,"path":"sprites/s_node_statistic/s_node_statistic.yy",}, + {"name":"s_node_active_canvas","order":22,"path":"sprites/s_node_active_canvas/s_node_active_canvas.yy",}, {"name":"s_node_cache_array","order":25,"path":"sprites/s_node_cache_array/s_node_cache_array.yy",}, {"name":"sh_blend_alpha_addition","order":13,"path":"shaders/sh_blend_alpha_addition/sh_blend_alpha_addition.yy",}, {"name":"widget","order":25,"path":"scripts/widget/widget.yy",}, @@ -1102,7 +1104,7 @@ {"name":"node_string_path_separate_folder","order":12,"path":"scripts/node_string_path_separate_folder/node_string_path_separate_folder.yy",}, {"name":"sh_erode","order":17,"path":"shaders/sh_erode/sh_erode.yy",}, {"name":"fd_rectangle_get_velocity_dissipation_value","order":21,"path":"scripts/fd_rectangle_get_velocity_dissipation_value/fd_rectangle_get_velocity_dissipation_value.yy",}, - {"name":"node_pixel_cloud","order":7,"path":"scripts/node_pixel_cloud/node_pixel_cloud.yy",}, + {"name":"node_pixel_cloud","order":6,"path":"scripts/node_pixel_cloud/node_pixel_cloud.yy",}, {"name":"s_node_crop_content","order":13,"path":"sprites/s_node_crop_content/s_node_crop_content.yy",}, {"name":"draw_line_zigzag","order":20,"path":"scripts/draw_line_zigzag/draw_line_zigzag.yy",}, {"name":"sh_alpha_grey","order":1,"path":"shaders/sh_alpha_grey/sh_alpha_grey.yy",}, @@ -1132,7 +1134,7 @@ {"name":"s_node_padding","order":4,"path":"sprites/s_node_padding/s_node_padding.yy",}, {"name":"sh_blend_add_alpha_adj","order":2,"path":"shaders/sh_blend_add_alpha_adj/sh_blend_add_alpha_adj.yy",}, {"name":"preview_overlay_area","order":3,"path":"scripts/preview_overlay_area/preview_overlay_area.yy",}, - {"name":"node_text","order":5,"path":"scripts/node_text/node_text.yy",}, + {"name":"node_text","order":4,"path":"scripts/node_text/node_text.yy",}, {"name":"panel_collection","order":3,"path":"scripts/panel_collection/panel_collection.yy",}, {"name":"node_string_trim","order":4,"path":"scripts/node_string_trim/node_string_trim.yy",}, {"name":"d3d_material","order":9,"path":"scripts/d3d_material/d3d_material.yy",}, @@ -1176,7 +1178,7 @@ {"name":"json_prettify","order":7,"path":"scripts/json_prettify/json_prettify.yy",}, {"name":"s_node_loop_output","order":13,"path":"sprites/s_node_loop_output/s_node_loop_output.yy",}, {"name":"panel_notification","order":4,"path":"scripts/panel_notification/panel_notification.yy",}, - {"name":"node_interpret_number","order":22,"path":"scripts/node_interpret_number/node_interpret_number.yy",}, + {"name":"node_interpret_number","order":20,"path":"scripts/node_interpret_number/node_interpret_number.yy",}, {"name":"render_data","order":3,"path":"scripts/render_data/render_data.yy",}, {"name":"panel_preview_grid_setting","order":6,"path":"scripts/panel_preview_grid_setting/panel_preview_grid_setting.yy",}, {"name":"fd_rectangle_get_velocity_height","order":22,"path":"scripts/fd_rectangle_get_velocity_height/fd_rectangle_get_velocity_height.yy",}, @@ -1226,7 +1228,7 @@ {"name":"s_node_greyscale","order":26,"path":"sprites/s_node_greyscale/s_node_greyscale.yy",}, {"name":"sh_dilate","order":4,"path":"shaders/sh_dilate/sh_dilate.yy",}, {"name":"node_image_sequence","order":1,"path":"scripts/node_image_sequence/node_image_sequence.yy",}, - {"name":"node_text_file_read","order":7,"path":"scripts/node_text_file_read/node_text_file_read.yy",}, + {"name":"node_text_file_read","order":6,"path":"scripts/node_text_file_read/node_text_file_read.yy",}, {"name":"node_note","order":17,"path":"scripts/node_note/node_note.yy",}, {"name":"node_pb_box_divide_grid","order":7,"path":"scripts/node_pb_box_divide_grid/node_pb_box_divide_grid.yy",}, {"name":"panel_preview_onion_setting","order":7,"path":"scripts/panel_preview_onion_setting/panel_preview_onion_setting.yy",}, @@ -1264,7 +1266,7 @@ {"name":"file_dropper","order":1,"path":"extensions/file_dropper/file_dropper.yy",}, {"name":"s_biterator_b_shape_idle","order":3,"path":"sprites/s_biterator_b_shape_idle/s_biterator_b_shape_idle.yy",}, {"name":"sh_mirror_mask","order":8,"path":"shaders/sh_mirror_mask/sh_mirror_mask.yy",}, - {"name":"node_export","order":10,"path":"scripts/node_export/node_export.yy",}, + {"name":"node_export","order":9,"path":"scripts/node_export/node_export.yy",}, {"name":"controlPointBox","order":4,"path":"scripts/controlPointBox/controlPointBox.yy",}, {"name":"sh_vertex_pt","order":5,"path":"shaders/sh_vertex_pt/sh_vertex_pt.yy",}, {"name":"node_cache_base","order":18,"path":"scripts/node_cache_base/node_cache_base.yy",}, @@ -1362,7 +1364,7 @@ {"name":"node_3d_mesh_icosphere","order":5,"path":"scripts/node_3d_mesh_icosphere/node_3d_mesh_icosphere.yy",}, {"name":"s_node_timeline_preview","order":2,"path":"sprites/s_node_timeline_preview/s_node_timeline_preview.yy",}, {"name":"s_node_3d_light_point","order":18,"path":"sprites/s_node_3d_light_point/s_node_3d_light_point.yy",}, - {"name":"node_csv_file_read","order":9,"path":"scripts/node_csv_file_read/node_csv_file_read.yy",}, + {"name":"node_csv_file_read","order":8,"path":"scripts/node_csv_file_read/node_csv_file_read.yy",}, {"name":"scrollPane","order":14,"path":"scripts/scrollPane/scrollPane.yy",}, {"name":"node_gradient_extract","order":13,"path":"scripts/node_gradient_extract/node_gradient_extract.yy",}, {"name":"node_base_convert","order":7,"path":"scripts/node_base_convert/node_base_convert.yy",}, @@ -1472,7 +1474,7 @@ {"name":"sh_warp_4points","order":9,"path":"shaders/sh_warp_4points/sh_warp_4points.yy",}, {"name":"_f_p2","order":4,"path":"fonts/_f_p2/_f_p2.yy",}, {"name":"fd_rectangle_get_pressure_iteration_type","order":17,"path":"scripts/fd_rectangle_get_pressure_iteration_type/fd_rectangle_get_pressure_iteration_type.yy",}, - {"name":"node_text_file_write","order":11,"path":"scripts/node_text_file_write/node_text_file_write.yy",}, + {"name":"node_text_file_write","order":10,"path":"scripts/node_text_file_write/node_text_file_write.yy",}, {"name":"sh_lum2alpha","order":16,"path":"shaders/sh_lum2alpha/sh_lum2alpha.yy",}, {"name":"s_node_3d_sphere","order":8,"path":"sprites/s_node_3d_sphere/s_node_3d_sphere.yy",}, {"name":"fd_rectangle_replace_velocity","order":16,"path":"scripts/fd_rectangle_replace_velocity/fd_rectangle_replace_velocity.yy",}, @@ -1510,7 +1512,7 @@ {"name":"sh_surface_replace_fast_find","order":2,"path":"shaders/sh_surface_replace_fast_find/sh_surface_replace_fast_find.yy",}, {"name":"fd_rectangle_add_material","order":4,"path":"scripts/fd_rectangle_add_material/fd_rectangle_add_material.yy",}, {"name":"fd_rectangle_set_target","order":18,"path":"scripts/fd_rectangle_set_target/fd_rectangle_set_target.yy",}, - {"name":"node_wav_file_read","order":17,"path":"scripts/node_wav_file_read/node_wav_file_read.yy",}, + {"name":"node_wav_file_read","order":16,"path":"scripts/node_wav_file_read/node_wav_file_read.yy",}, {"name":"s_node_vfx_render_output","order":12,"path":"sprites/s_node_vfx_render_output/s_node_vfx_render_output.yy",}, {"name":"s_node_3d_discretize","order":19,"path":"sprites/s_node_3d_discretize/s_node_3d_discretize.yy",}, {"name":"draw_line_dashed","order":7,"path":"scripts/draw_line_dashed/draw_line_dashed.yy",}, @@ -1534,7 +1536,7 @@ {"name":"string_scale","order":4,"path":"scripts/string_scale/string_scale.yy",}, {"name":"node_struct_set","order":3,"path":"scripts/node_struct_set/node_struct_set.yy",}, {"name":"s_node_cache","order":27,"path":"sprites/s_node_cache/s_node_cache.yy",}, - {"name":"node_repeat","order":9,"path":"scripts/node_repeat/node_repeat.yy",}, + {"name":"node_repeat","order":8,"path":"scripts/node_repeat/node_repeat.yy",}, {"name":"draw_arc","order":22,"path":"scripts/draw_arc/draw_arc.yy",}, {"name":"sh_fd_advect_velocity_1_glsl","order":7,"path":"shaders/sh_fd_advect_velocity_1_glsl/sh_fd_advect_velocity_1_glsl.yy",}, {"name":"mac_window_step","order":1,"path":"scripts/mac_window_step/mac_window_step.yy",}, @@ -1564,7 +1566,7 @@ {"name":"rangeBox","order":9,"path":"scripts/rangeBox/rangeBox.yy",}, {"name":"s_node_array_copy","order":14,"path":"sprites/s_node_array_copy/s_node_array_copy.yy",}, {"name":"node_VFX_effect_accelerate","order":1,"path":"scripts/node_VFX_effect_accelerate/node_VFX_effect_accelerate.yy",}, - {"name":"node_flood_fill","order":11,"path":"scripts/node_flood_fill/node_flood_fill.yy",}, + {"name":"node_flood_fill","order":10,"path":"scripts/node_flood_fill/node_flood_fill.yy",}, {"name":"node_frame","order":1,"path":"scripts/node_frame/node_frame.yy",}, {"name":"s_node_scale_algo","order":7,"path":"sprites/s_node_scale_algo/s_node_scale_algo.yy",}, {"name":"sh_sdf_dist","order":4,"path":"shaders/sh_sdf_dist/sh_sdf_dist.yy",}, @@ -1620,7 +1622,7 @@ {"name":"dialog_management","order":2,"path":"scripts/dialog_management/dialog_management.yy",}, {"name":"draw_shapes","order":10,"path":"scripts/draw_shapes/draw_shapes.yy",}, {"name":"sh_surface_replace_fast_replace","order":3,"path":"shaders/sh_surface_replace_fast_replace/sh_surface_replace_fast_replace.yy",}, - {"name":"node_solid","order":6,"path":"scripts/node_solid/node_solid.yy",}, + {"name":"node_solid","order":5,"path":"scripts/node_solid/node_solid.yy",}, {"name":"sh_blend_luma","order":19,"path":"shaders/sh_blend_luma/sh_blend_luma.yy",}, {"name":"fd_rectangle_set_material_dissipation_value","order":5,"path":"scripts/fd_rectangle_set_material_dissipation_value/fd_rectangle_set_material_dissipation_value.yy",}, {"name":"node_iterator_output","order":2,"path":"scripts/node_iterator_output/node_iterator_output.yy",}, @@ -1638,7 +1640,7 @@ {"name":"sh_mask_expand","order":55,"path":"shaders/sh_mask_expand/sh_mask_expand.yy",}, {"name":"node_texture_remap","order":2,"path":"scripts/node_texture_remap/node_texture_remap.yy",}, {"name":"sh_fd_visualize_pixel_art_fiery_smoke_glsl","order":14,"path":"shaders/sh_fd_visualize_pixel_art_fiery_smoke_glsl/sh_fd_visualize_pixel_art_fiery_smoke_glsl.yy",}, - {"name":"node_ase_layer","order":15,"path":"scripts/node_ase_layer/node_ase_layer.yy",}, + {"name":"node_ase_layer","order":14,"path":"scripts/node_ase_layer/node_ase_layer.yy",}, {"name":"sh_local_analyze","order":47,"path":"shaders/sh_local_analyze/sh_local_analyze.yy",}, {"name":"s_node_array_zip","order":13,"path":"sprites/s_node_array_zip/s_node_array_zip.yy",}, {"name":"fd_rectangle_get_material_width","order":15,"path":"scripts/fd_rectangle_get_material_width/fd_rectangle_get_material_width.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index 1770bdc7f..9c9c875c4 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -837,6 +837,7 @@ {"id":{"name":"__node_3d_prim_cone","path":"scripts/__node_3d_prim_cone/__node_3d_prim_cone.yy",},}, {"id":{"name":"node_line","path":"scripts/node_line/node_line.yy",},}, {"id":{"name":"s_node_frame","path":"sprites/s_node_frame/s_node_frame.yy",},}, + {"id":{"name":"node_active_canvas","path":"scripts/node_active_canvas/node_active_canvas.yy",},}, {"id":{"name":"s_node_fluidSim_turbulence","path":"sprites/s_node_fluidSim_turbulence/s_node_fluidSim_turbulence.yy",},}, {"id":{"name":"node_pb_fx_hash","path":"scripts/node_pb_fx_hash/node_pb_fx_hash.yy",},}, {"id":{"name":"sh_pb_draw_mask","path":"shaders/sh_pb_draw_mask/sh_pb_draw_mask.yy",},}, @@ -1770,6 +1771,7 @@ {"id":{"name":"number_function","path":"scripts/number_function/number_function.yy",},}, {"id":{"name":"s_node_array_shift","path":"sprites/s_node_array_shift/s_node_array_shift.yy",},}, {"id":{"name":"s_node_statistic","path":"sprites/s_node_statistic/s_node_statistic.yy",},}, + {"id":{"name":"s_node_active_canvas","path":"sprites/s_node_active_canvas/s_node_active_canvas.yy",},}, {"id":{"name":"s_node_cache_array","path":"sprites/s_node_cache_array/s_node_cache_array.yy",},}, {"id":{"name":"sh_blend_alpha_addition","path":"shaders/sh_blend_alpha_addition/sh_blend_alpha_addition.yy",},}, {"id":{"name":"widget","path":"scripts/widget/widget.yy",},}, diff --git a/objects/o_main/Step_0.gml b/objects/o_main/Step_0.gml index 48cc51f80..1bb39d885 100644 --- a/objects/o_main/Step_0.gml +++ b/objects/o_main/Step_0.gml @@ -131,4 +131,4 @@ if(PROJECT.active && !PROJECT.safeMode) { steam_send_screenshot(file, window_get_width(), window_get_height()); } } -#endregion +#endregion \ No newline at end of file diff --git a/scripts/__node_process_template/__node_process_template.gml b/scripts/__node_process_template/__node_process_template.gml index f8df5aada..fc9f459c5 100644 --- a/scripts/__node_process_template/__node_process_template.gml +++ b/scripts/__node_process_template/__node_process_template.gml @@ -7,6 +7,8 @@ function Node_Process_Template(_x, _y, _group = noone) : Node_Processor(_x, _y, input_display_list = [ 0 ]; + static drawOverlay = function(active, _x, _y, _s, _mx, _my, _snx, _sny) {} + static step = function() {} static processData = function(_outSurf, _data, _output_index, _array_index = 0) { return _outSurf; } diff --git a/scripts/__node_template/__node_template.gml b/scripts/__node_template/__node_template.gml index 8a7218c26..1e02f2947 100644 --- a/scripts/__node_template/__node_template.gml +++ b/scripts/__node_template/__node_template.gml @@ -7,6 +7,8 @@ function Node_Template(_x, _y, _group = noone) : Node(_x, _y, _group) constructo input_display_list = [ 0 ]; + static drawOverlay = function(active, _x, _y, _s, _mx, _my, _snx, _sny) {} + static step = function() {} static update = function() {} diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 387979481..bf6d0f0a4 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -25,10 +25,10 @@ globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER; - VERSION = 11562; + VERSION = 11570; SAVE_VERSION = 11560; - VERSION_STRING = "1.15.6.2"; - BUILD_NUMBER = 11562; + VERSION_STRING = "1.15.7"; + BUILD_NUMBER = 11570; globalvar APPEND_MAP; APPEND_MAP = ds_map_create(); diff --git a/scripts/node_active_canvas/node_active_canvas.gml b/scripts/node_active_canvas/node_active_canvas.gml new file mode 100644 index 000000000..eae6d6f95 --- /dev/null +++ b/scripts/node_active_canvas/node_active_canvas.gml @@ -0,0 +1,126 @@ +function Node_Active_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { + name = "Active Canvas"; + + inputs[| 0] = nodeValue("Dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF ) + .setDisplay(VALUE_DISPLAY.vector); + + inputs[| 1] = nodeValue("Texture", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, noone ); + + inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) + .setDisplay(VALUE_DISPLAY.vector); + + inputs[| 3] = nodeValue("Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + .setDisplay(VALUE_DISPLAY.rotation); + + inputs[| 4] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) + .setDisplay(VALUE_DISPLAY.vector); + + inputs[| 5] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + + inputs[| 6] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + .setDisplay(VALUE_DISPLAY.slider); + + inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + + inputs[| 8] = nodeValue("Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) + .setDisplay(VALUE_DISPLAY.range, { linked : true }); + + outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone ); + + input_display_list = [ 0, + [ "Brush transform", false ], 7, 2, 3, 4, + [ "Brush properties", false ], 1, 5, 6, 8, + ]; + + brush_prev = []; + brush_next_dist = 0; + + static drawOverlay = function(active, _x, _y, _s, _mx, _my, _snx, _sny) { + inputs[| 2].drawOverlay(active, _x, _y, _s, _mx, _my, _snx, _sny); + } + + static step = function() { #region + + } #endregion + + static brush_draw_surface = function(_surf, _x, _y, _sx, _sy, _rot, _clr, _alp) { #region + INLINE + + var _bsw = surface_get_width_safe(_surf); + var _bsh = surface_get_height_safe(_surf); + var _p = point_rotate(-_bsw * _sx / 2, -_bsh * _sy / 2, 0, 0, _rot); + draw_surface_ext_safe(_surf, _x + _p[0], _y + _p[1], _sx, _sy, _rot, _clr, _alp); + } #endregion + + static update = function() { #region + var _surf = outputs[| 0].getValue(); + + var _dim = getInputData(0); + var _bsurf = getInputData(1); + var _bpos = getInputData(2); + var _brot = getInputData(3); + var _bsca = getInputData(4); + var _bcol = getInputData(5); + var _balp = getInputData(6); + var _bact = getInputData(7); + var _bdst = getInputData(8); + + _surf = surface_verify(_surf, _dim[0], _dim[1]); + var _bdense = _bdst[0] == _bdst[1] && _bdst[0] == 1; + + surface_set_target(_surf); + if(CURRENT_FRAME == 0) DRAW_CLEAR + + if(_bact) { + if(!is_surface(_bsurf)) { + if(CURRENT_FRAME == 0) + draw_point_color(_bpos[0] - 1, _bpos[1] - 1, _bcol); + else + draw_line_color(brush_prev[2][0] - 1, brush_prev[2][1] - 1, _bpos[0] - 1, _bpos[1] - 1, brush_prev[5], _bcol); + } else { + BLEND_ALPHA + + if(CURRENT_FRAME == 0) { + brush_draw_surface(_bsurf, _bpos[0], _bpos[1], _bsca[0], _bsca[1], _brot, _bcol, _balp); + } else { + var _x0 = brush_prev[2][0]; + var _y0 = brush_prev[2][1]; + var diss = point_distance(_x0, _y0, _bpos[0], _bpos[1]); + var dirr = point_direction(_x0, _y0, _bpos[0], _bpos[1]); + + var st_x = lengthdir_x(1, dirr); + var st_y = lengthdir_y(1, dirr); + + var _draw = !brush_prev[7]; + var _i = _draw? 0 : brush_next_dist; + var _dst = diss; + + if(_i < diss) { + while(_i < diss) { + var _px = _x0 + st_x * _i; + var _py = _y0 + st_y * _i; + + brush_draw_surface(_bsurf, _px, _py, _bsca[0], _bsca[1], _brot, _bcol, _balp); + + brush_next_dist = random_range(_bdst[0], _bdst[1]); + _i += brush_next_dist; + _dst -= brush_next_dist; + } + + brush_next_dist -= _dst; + } else + brush_next_dist -= diss; + + if(_bdense) brush_draw_surface(_bsurf, _bpos[0], _bpos[1], _bsca[0], _bsca[1], _brot, _bcol, _balp); + } + BLEND_NORMAL + } + } + surface_reset_target(); + + for( var i = 0, n = array_length(inputs_data); i < n; i++ ) + brush_prev[i] = variable_clone(inputs_data[i], 1); + + outputs[| 0].setValue(_surf); + } #endregion +} \ No newline at end of file diff --git a/scripts/node_active_canvas/node_active_canvas.yy b/scripts/node_active_canvas/node_active_canvas.yy new file mode 100644 index 000000000..127dcb752 --- /dev/null +++ b/scripts/node_active_canvas/node_active_canvas.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "node_active_canvas", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "generator", + "path": "folders/nodes/data/generator.yy", + }, +} \ No newline at end of file diff --git a/scripts/node_active_canvas/node_outline.yy b/scripts/node_active_canvas/node_outline.yy new file mode 100644 index 000000000..86468bc09 --- /dev/null +++ b/scripts/node_active_canvas/node_outline.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "process", + "path": "folders/nodes/data/process.yy", + }, + "resourceVersion": "1.0", + "name": "node_outline", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/node_alpha_cutoff/node_alpha_cutoff.gml b/scripts/node_alpha_cutoff/node_alpha_cutoff.gml index 6fc5c9b5c..bf110f4e6 100644 --- a/scripts/node_alpha_cutoff/node_alpha_cutoff.gml +++ b/scripts/node_alpha_cutoff/node_alpha_cutoff.gml @@ -15,7 +15,7 @@ function Node_Alpha_Cutoff(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro active_index = 4; input_display_list = [ 4, - ["Output", true], 0, 2, 3, + ["Surfaces", true], 0, 2, 3, ["Cutoff", false], 1, ] diff --git a/scripts/node_alpha_to_grey/node_alpha_to_grey.gml b/scripts/node_alpha_to_grey/node_alpha_to_grey.gml index e138e2f5b..28696bbde 100644 --- a/scripts/node_alpha_to_grey/node_alpha_to_grey.gml +++ b/scripts/node_alpha_to_grey/node_alpha_to_grey.gml @@ -9,7 +9,7 @@ function Node_Alpha_Grey(_x, _y, _group = noone) : Node_Processor(_x, _y, _group outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 1, - ["Output", false], 0, + ["Surfaces", false], 0, ] attribute_surface_depth(); diff --git a/scripts/node_average/node_average.gml b/scripts/node_average/node_average.gml index 33689dea2..2fc9e2d7a 100644 --- a/scripts/node_average/node_average.gml +++ b/scripts/node_average/node_average.gml @@ -15,7 +15,7 @@ function Node_Average(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c active_index = 3; input_display_list = [ 3, - ["Output", false], 0, 1, 2, + ["Surfaces", false], 0, 1, 2, ] outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); diff --git a/scripts/node_bevel/node_bevel.gml b/scripts/node_bevel/node_bevel.gml index 0111da10a..309995481 100644 --- a/scripts/node_bevel/node_bevel.gml +++ b/scripts/node_bevel/node_bevel.gml @@ -35,7 +35,7 @@ function Node_Bevel(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 7, - ["Output", true], 0, 5, 6, + ["Surfaces", true], 0, 5, 6, ["Bevel", false], 4, 1, ["Transform", false], 2, 3, ]; diff --git a/scripts/node_blinker/node_blinker.gml b/scripts/node_blinker/node_blinker.gml index e520e4c3a..23ce7496f 100644 --- a/scripts/node_blinker/node_blinker.gml +++ b/scripts/node_blinker/node_blinker.gml @@ -22,8 +22,8 @@ function Node_Blinker(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0); input_display_list = [ 6, - ["Output", false], 0, 1, - ["Blink", false], 2, 3, 4, 5, + ["Surfaces", false], 0, 1, + ["Blink", false], 2, 3, 4, 5, ] temp_surface = [ surface_create( 1, 1 ) ]; diff --git a/scripts/node_bloom/node_bloom.gml b/scripts/node_bloom/node_bloom.gml index ed7225721..87fb5a671 100644 --- a/scripts/node_bloom/node_bloom.gml +++ b/scripts/node_bloom/node_bloom.gml @@ -29,7 +29,7 @@ function Node_Bloom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con active_index = 7; input_display_list = [ 7, - ["Output", true], 0, 5, 6, + ["Surfaces", true], 0, 5, 6, ["Bloom", false], 1, 2, 3, 4, ] diff --git a/scripts/node_blur/node_blur.gml b/scripts/node_blur/node_blur.gml index a64557341..73c2a0b46 100644 --- a/scripts/node_blur/node_blur.gml +++ b/scripts/node_blur/node_blur.gml @@ -23,7 +23,7 @@ function Node_Blur(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 7, - ["Output", true], 0, 5, 6, + ["Surfaces", true], 0, 5, 6, ["Blur", false], 1, 3, 4, ]; diff --git a/scripts/node_blur_bokeh/node_blur_bokeh.gml b/scripts/node_blur_bokeh/node_blur_bokeh.gml index 897b17b6d..20ddf98f5 100644 --- a/scripts/node_blur_bokeh/node_blur_bokeh.gml +++ b/scripts/node_blur_bokeh/node_blur_bokeh.gml @@ -19,7 +19,7 @@ function Node_Blur_Bokeh(_x, _y, _group = noone) : Node_Processor(_x, _y, _group active_index = 4; input_display_list = [ 4, - ["Output", true], 0, 2, 3, + ["Surfaces", true], 0, 2, 3, ["Blur", false], 1, ] diff --git a/scripts/node_blur_contrast/node_blur_contrast.gml b/scripts/node_blur_contrast/node_blur_contrast.gml index 85d878a87..97787bfbc 100644 --- a/scripts/node_blur_contrast/node_blur_contrast.gml +++ b/scripts/node_blur_contrast/node_blur_contrast.gml @@ -24,7 +24,7 @@ function Node_Blur_Contrast(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr active_index = 5; input_display_list = [ 5, - ["Output", true], 0, 3, 4, + ["Surfaces", true], 0, 3, 4, ["Blur", false], 1, 2, ] diff --git a/scripts/node_blur_directional/node_blur_directional.gml b/scripts/node_blur_directional/node_blur_directional.gml index f0eb54f64..f88662d56 100644 --- a/scripts/node_blur_directional/node_blur_directional.gml +++ b/scripts/node_blur_directional/node_blur_directional.gml @@ -18,7 +18,7 @@ function Node_Blur_Directional(_x, _y, _group = noone) : Node_Processor(_x, _y, active_index = 5; input_display_list = [ 5, - ["Output", true], 0, 3, 4, + ["Surfaces", true], 0, 3, 4, ["Blur", false], 1, 2, ] diff --git a/scripts/node_blur_radial/node_blur_radial.gml b/scripts/node_blur_radial/node_blur_radial.gml index 6492fbcbd..e46f80a2c 100644 --- a/scripts/node_blur_radial/node_blur_radial.gml +++ b/scripts/node_blur_radial/node_blur_radial.gml @@ -24,7 +24,7 @@ function Node_Blur_Radial(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 6, - ["Output", true], 0, 4, 5, + ["Surfaces", true], 0, 4, 5, ["Blur", false], 1, 2, ]; diff --git a/scripts/node_blur_simple/node_blur_simple.gml b/scripts/node_blur_simple/node_blur_simple.gml index d0d28cc47..8fde079c1 100644 --- a/scripts/node_blur_simple/node_blur_simple.gml +++ b/scripts/node_blur_simple/node_blur_simple.gml @@ -33,7 +33,7 @@ function Node_Blur_Simple(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou active_index = 8; input_display_list = [ 8, - ["Output", true], 0, 6, 7, + ["Surfaces", true], 0, 6, 7, ["Blur", false], 1, 3, 4, 5, ]; diff --git a/scripts/node_blur_zoom/node_blur_zoom.gml b/scripts/node_blur_zoom/node_blur_zoom.gml index 078c4ae21..ef23e7479 100644 --- a/scripts/node_blur_zoom/node_blur_zoom.gml +++ b/scripts/node_blur_zoom/node_blur_zoom.gml @@ -28,7 +28,7 @@ function Node_Blur_Zoom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 8, - ["Output", true], 0, 6, 7, + ["Surfaces", true], 0, 6, 7, ["Blur", false], 1, 2, 4, 5 ]; diff --git a/scripts/node_bw/node_bw.gml b/scripts/node_bw/node_bw.gml index 268eb5432..e7c26d354 100644 --- a/scripts/node_bw/node_bw.gml +++ b/scripts/node_bw/node_bw.gml @@ -22,7 +22,7 @@ function Node_BW(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constr active_index = 5; input_display_list = [ 5, - ["Output", true], 0, 3, 4, + ["Surfaces", true], 0, 3, 4, ["BW", false], 1, 2, ] diff --git a/scripts/node_cache/node_cache.gml b/scripts/node_cache/node_cache.gml index d166a937a..65a910a95 100644 --- a/scripts/node_cache/node_cache.gml +++ b/scripts/node_cache/node_cache.gml @@ -7,7 +7,7 @@ function Node_Cache(_x, _y, _group = noone) : __Node_Cache(_x, _y, _group) const outputs[| 0] = nodeValue("Cache surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, 0); input_display_list = [ - ["Output", true], 0, + ["Surfaces", true], 0, ]; cache_loading = false; diff --git a/scripts/node_cache_array/node_cache_array.gml b/scripts/node_cache_array/node_cache_array.gml index 760e32dc2..2d35b2175 100644 --- a/scripts/node_cache_array/node_cache_array.gml +++ b/scripts/node_cache_array/node_cache_array.gml @@ -13,8 +13,8 @@ function Node_Cache_Array(_x, _y, _group = noone) : __Node_Cache(_x, _y, _group) outputs[| 0] = nodeValue("Cache array", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []); input_display_list = [ - ["Output", true], 0, - ["Range", false], 1, 2, 3, + ["Surfaces", true], 0, + ["Range", false], 1, 2, 3, ]; cache_loading = false; diff --git a/scripts/node_canvas/node_canvas.gml b/scripts/node_canvas/node_canvas.gml index 48a5c0653..d24793344 100644 --- a/scripts/node_canvas/node_canvas.gml +++ b/scripts/node_canvas/node_canvas.gml @@ -216,8 +216,6 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor brush_direction = 0; brush_rand_dir = [ 0, 0, 0, 0, 0 ]; brush_seed = irandom_range(100000, 999999); - - brush_drag_dist = 0; brush_next_dist = 0; tool_channel_edit = new checkBoxGroup(THEME.tools_canvas_channel, function(ind, val) { tool_attribute.channel[ind] = val; }); diff --git a/scripts/node_color_palette_replacement/node_color_palette_replacement.gml b/scripts/node_color_palette_replacement/node_color_palette_replacement.gml index d7c6f31a4..4a2b558d4 100644 --- a/scripts/node_color_palette_replacement/node_color_palette_replacement.gml +++ b/scripts/node_color_palette_replacement/node_color_palette_replacement.gml @@ -38,7 +38,7 @@ function Node_Color_replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr active_index = 9; input_display_list = [ 9, - ["Output", true], 0, 7, 8, + ["Surfaces", true], 0, 7, 8, ["Palette", false], 1, 2, ["Comparison", false], 3, 5, ["Render", false], 4, 6 diff --git a/scripts/node_color_remove/node_color_remove.gml b/scripts/node_color_remove/node_color_remove.gml index 745e4bbcf..50f636940 100644 --- a/scripts/node_color_remove/node_color_remove.gml +++ b/scripts/node_color_remove/node_color_remove.gml @@ -27,7 +27,7 @@ function Node_Color_Remove(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 6] = nodeValue("Invert", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Keep the selected colors and remove the rest."); input_display_list = [ 5, - ["Output", true], 0, 3, 4, + ["Surfaces", true], 0, 3, 4, ["Remove", false], 1, 2, 6, ] diff --git a/scripts/node_color_replacement/node_color_replacement.gml b/scripts/node_color_replacement/node_color_replacement.gml index dfe15dc10..9b5479bae 100644 --- a/scripts/node_color_replacement/node_color_replacement.gml +++ b/scripts/node_color_replacement/node_color_replacement.gml @@ -118,7 +118,7 @@ function Node_Colors_Replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _g }); #endregion input_display_list = [ 6, - ["Output", true], 0, 4, 5, + ["Surfaces", true], 0, 4, 5, ["Replace", false], render_palette, 2, ["Comparison", false], 3, ]; diff --git a/scripts/node_colorize/node_colorize.gml b/scripts/node_colorize/node_colorize.gml index af575c59a..05003f27c 100644 --- a/scripts/node_colorize/node_colorize.gml +++ b/scripts/node_colorize/node_colorize.gml @@ -27,7 +27,7 @@ function Node_Colorize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 6] = nodeValue("Multiply alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); input_display_list = [ 5, - ["Output", true], 0, 3, 4, + ["Surfaces", true], 0, 3, 4, ["Colorize", false], 1, 2, 6, ] diff --git a/scripts/node_combine_rgb/node_combine_rgb.gml b/scripts/node_combine_rgb/node_combine_rgb.gml index 3bce34ef0..0c478e5ee 100644 --- a/scripts/node_combine_rgb/node_combine_rgb.gml +++ b/scripts/node_combine_rgb/node_combine_rgb.gml @@ -13,7 +13,7 @@ function Node_Combine_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou input_display_list = [ ["Sampling", false], 4, - ["Output", true], 0, 1, 2, 3, + ["Surfaces", true], 0, 1, 2, 3, ] attribute_surface_depth(); diff --git a/scripts/node_convolution/node_convolution.gml b/scripts/node_convolution/node_convolution.gml index ae4c6656f..b55859563 100644 --- a/scripts/node_convolution/node_convolution.gml +++ b/scripts/node_convolution/node_convolution.gml @@ -25,7 +25,7 @@ function Node_Convolution(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 5, - ["Output", true], 0, 3, 4, + ["Surfaces", true], 0, 3, 4, ["Kernel", false], 1, ]; diff --git a/scripts/node_corner/node_corner.gml b/scripts/node_corner/node_corner.gml index f69616057..bbc37f28c 100644 --- a/scripts/node_corner/node_corner.gml +++ b/scripts/node_corner/node_corner.gml @@ -21,7 +21,7 @@ function Node_Corner(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co active_index = 4; input_display_list = [ 4, - ["Output", true], 0, 2, 3, + ["Surfaces", true], 0, 2, 3, ["Corner", false], 1, ] diff --git a/scripts/node_crop/node_crop.gml b/scripts/node_crop/node_crop.gml index 3e90ff55c..4ab6e982b 100644 --- a/scripts/node_crop/node_crop.gml +++ b/scripts/node_crop/node_crop.gml @@ -14,7 +14,7 @@ function Node_Crop(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 2, - ["Output", false], 0, 1, + ["Effect", false], 0, 1, ] attribute_surface_depth(); diff --git a/scripts/node_crop_content/node_crop_content.gml b/scripts/node_crop_content/node_crop_content.gml index 834e980a4..42e63990d 100644 --- a/scripts/node_crop_content/node_crop_content.gml +++ b/scripts/node_crop_content/node_crop_content.gml @@ -14,7 +14,7 @@ function Node_Crop_Content(_x, _y, _group = noone) : Node(_x, _y, _group) constr outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 1, - ["Output", false], 0, 2, + ["Surfaces", false], 0, 2, ["Padding", false], 3, ] diff --git a/scripts/node_curve/node_curve.gml b/scripts/node_curve/node_curve.gml index 1a1fdec14..7dd05ed64 100644 --- a/scripts/node_curve/node_curve.gml +++ b/scripts/node_curve/node_curve.gml @@ -35,7 +35,7 @@ function Node_Curve(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 7, - ["Output", true], 0, 5, 6, + ["Surfaces", true], 0, 5, 6, ["Curve", false], 1, 2, 3, 4, ]; diff --git a/scripts/node_de_corner/node_de_corner.gml b/scripts/node_de_corner/node_de_corner.gml index 9ac399687..4556146e5 100644 --- a/scripts/node_de_corner/node_de_corner.gml +++ b/scripts/node_de_corner/node_de_corner.gml @@ -12,7 +12,7 @@ function Node_De_Corner(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 1, - ["Output", false], 0, 2, + ["Effect", false], 0, 2, ] attribute_surface_depth(); diff --git a/scripts/node_de_stray/node_de_stray.gml b/scripts/node_de_stray/node_de_stray.gml index 96edb4da5..223efb7f8 100644 --- a/scripts/node_de_stray/node_de_stray.gml +++ b/scripts/node_de_stray/node_de_stray.gml @@ -12,7 +12,7 @@ function Node_De_Stray(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 2, - ["Output", false], 0, 1, + ["Effect", false], 0, 1, ] attribute_surface_depth(); diff --git a/scripts/node_dilate/node_dilate.gml b/scripts/node_dilate/node_dilate.gml index af23b41f4..283479699 100644 --- a/scripts/node_dilate/node_dilate.gml +++ b/scripts/node_dilate/node_dilate.gml @@ -33,7 +33,7 @@ function Node_Dilate(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 7, - ["Output", true], 0, 5, 6, + ["Surfaces", true], 0, 5, 6, ["Dilate", false], 1, 2, 3, ]; diff --git a/scripts/node_displacement/node_displacement.gml b/scripts/node_displacement/node_displacement.gml index d2264592a..841586cde 100644 --- a/scripts/node_displacement/node_displacement.gml +++ b/scripts/node_displacement/node_displacement.gml @@ -38,7 +38,7 @@ If set, then strength value control how many times the effect applies on itself. .setDisplay(VALUE_DISPLAY.enum_scroll, [ "Overwrite", "Min", "Max" ]); input_display_list = [ 10, - ["Output", true], 0, 8, 9, + ["Surfaces", true], 0, 8, 9, ["Displace", false], 1, 3, 4, ["Color", false], 5, 2, ["Algorithm", true], 6, 11, diff --git a/scripts/node_dither/node_dither.gml b/scripts/node_dither/node_dither.gml index 3146f35c9..dc8c18c52 100644 --- a/scripts/node_dither/node_dither.gml +++ b/scripts/node_dither/node_dither.gml @@ -45,7 +45,7 @@ function Node_Dither(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 9, - ["Output", true], 0, 7, 8, + ["Surfaces", true], 0, 7, 8, ["Pattern", false], 2, 3, ["Dither", false], 6, 1, 4, 5 ] diff --git a/scripts/node_edge_detect/node_edge_detect.gml b/scripts/node_edge_detect/node_edge_detect.gml index d388b9c62..54c330aa2 100644 --- a/scripts/node_edge_detect/node_edge_detect.gml +++ b/scripts/node_edge_detect/node_edge_detect.gml @@ -25,7 +25,7 @@ function Node_Edge_Detect(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 5, - ["Output", true], 0, 3, 4, + ["Surfaces", true], 0, 3, 4, ["Edge detect", false], 1, ]; diff --git a/scripts/node_erode/node_erode.gml b/scripts/node_erode/node_erode.gml index 7172268ff..bb10f8999 100644 --- a/scripts/node_erode/node_erode.gml +++ b/scripts/node_erode/node_erode.gml @@ -24,7 +24,7 @@ function Node_Erode(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con active_index = 6; input_display_list = [ 6, - ["Output", true], 0, 4, 5, + ["Surfaces", true], 0, 4, 5, ["Erode", false], 1, 2, 3, ] diff --git a/scripts/node_flip/node_flip.gml b/scripts/node_flip/node_flip.gml index 974f69465..6ad800322 100644 --- a/scripts/node_flip/node_flip.gml +++ b/scripts/node_flip/node_flip.gml @@ -13,7 +13,7 @@ function Node_Flip(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons active_index = 2; input_display_list = [ 2, - ["Output", true], 0, + ["Surfaces", true], 0, ["Flip", false], 1, ] diff --git a/scripts/node_flood_fill/node_flood_fill.gml b/scripts/node_flood_fill/node_flood_fill.gml index 35c51f19d..64417c04e 100644 --- a/scripts/node_flood_fill/node_flood_fill.gml +++ b/scripts/node_flood_fill/node_flood_fill.gml @@ -25,7 +25,7 @@ function Node_Flood_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _group outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 3, - ["Output", false], 0, 1, 2, + ["Surfaces", false], 0, 1, 2, ["Fill", false], 4, 6, 5, 7, ] diff --git a/scripts/node_glow/node_glow.gml b/scripts/node_glow/node_glow.gml index 34b10c2db..21b00c5e7 100644 --- a/scripts/node_glow/node_glow.gml +++ b/scripts/node_glow/node_glow.gml @@ -28,7 +28,7 @@ function Node_Glow(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons active_index = 7; input_display_list = [ 7, - ["Output", true], 0, 5, 6, + ["Surfaces", true], 0, 5, 6, ["Glow", false], 1, 2, 3, 4, ] diff --git a/scripts/node_grey_to_alpha/node_grey_to_alpha.gml b/scripts/node_grey_to_alpha/node_grey_to_alpha.gml index 77d6b650b..00af15297 100644 --- a/scripts/node_grey_to_alpha/node_grey_to_alpha.gml +++ b/scripts/node_grey_to_alpha/node_grey_to_alpha.gml @@ -17,7 +17,7 @@ function Node_Grey_Alpha(_x, _y, _group = noone) : Node_Processor(_x, _y, _group outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 3, - ["Output", false], 0, 1, 2, + ["Effect", false], 0, 1, 2, ] attribute_surface_depth(); diff --git a/scripts/node_greyscale/node_greyscale.gml b/scripts/node_greyscale/node_greyscale.gml index 07cf8db7c..02ffc31be 100644 --- a/scripts/node_greyscale/node_greyscale.gml +++ b/scripts/node_greyscale/node_greyscale.gml @@ -22,7 +22,7 @@ function Node_Greyscale(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) active_index = 5; input_display_list = [ 5, - ["Output", true], 0, 3, 4, + ["Surfaces", true], 0, 3, 4, ["Greyscale", false], 1, 2, ] diff --git a/scripts/node_invert/node_invert.gml b/scripts/node_invert/node_invert.gml index 73291ef52..57b650ad2 100644 --- a/scripts/node_invert/node_invert.gml +++ b/scripts/node_invert/node_invert.gml @@ -12,7 +12,7 @@ function Node_Invert(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co active_index = 3; input_display_list = [ 3, - ["Output", true], 0, 1, 2, + ["Surfaces", true], 0, 1, 2, ] outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); diff --git a/scripts/node_level/node_level.gml b/scripts/node_level/node_level.gml index 51fe32721..7c216b1a4 100644 --- a/scripts/node_level/node_level.gml +++ b/scripts/node_level/node_level.gml @@ -77,7 +77,7 @@ function Node_Level(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con input_display_list = [ 8, level_renderer, - ["Output", true], 0, 6, 7, + ["Surfaces", true], 0, 6, 7, ["Level", false], 1, ["Channel", true], 2, 3, 4, 5 ]; diff --git a/scripts/node_level_selector/node_level_selector.gml b/scripts/node_level_selector/node_level_selector.gml index abdbbf975..e846487ab 100644 --- a/scripts/node_level_selector/node_level_selector.gml +++ b/scripts/node_level_selector/node_level_selector.gml @@ -62,7 +62,7 @@ function Node_Level_Selector(_x, _y, _group = noone) : Node_Processor(_x, _y, _g input_display_list = [ 5, level_renderer, - ["Output", true], 0, 3, 4, + ["Surfaces", true], 0, 3, 4, ["Level", false], 1, 2, ]; histogramInit(); diff --git a/scripts/node_local_analyze/node_local_analyze.gml b/scripts/node_local_analyze/node_local_analyze.gml index 1ec8b2116..cbcfcc326 100644 --- a/scripts/node_local_analyze/node_local_analyze.gml +++ b/scripts/node_local_analyze/node_local_analyze.gml @@ -33,7 +33,7 @@ function Node_Local_Analyze(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 7, - ["Output", true], 0, 5, 6, + ["Surfaces", true], 0, 5, 6, ["Effect", false], 1, 2, 4, ]; diff --git a/scripts/node_mirror/node_mirror.gml b/scripts/node_mirror/node_mirror.gml index da5215b1e..93b40d18e 100644 --- a/scripts/node_mirror/node_mirror.gml +++ b/scripts/node_mirror/node_mirror.gml @@ -18,7 +18,7 @@ function Node_Mirror(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co outputs[| 1] = nodeValue("Mirror mask", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 3, - ["Output", false], 0, + ["Surfaces", false], 0, ["Mirror", false], 1, 2, ] diff --git a/scripts/node_morph_surface/node_morph_surface.gml b/scripts/node_morph_surface/node_morph_surface.gml index d25ed7b67..8a333d3e7 100644 --- a/scripts/node_morph_surface/node_morph_surface.gml +++ b/scripts/node_morph_surface/node_morph_surface.gml @@ -14,7 +14,7 @@ function Node_Morph_Surface(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ - ["Output", true], 0, 1, + ["Surfaces", true], 0, 1, ["Morph", false], 2, 3, ]; diff --git a/scripts/node_normal/node_normal.gml b/scripts/node_normal/node_normal.gml index c21939a6f..04e9c3941 100644 --- a/scripts/node_normal/node_normal.gml +++ b/scripts/node_normal/node_normal.gml @@ -15,7 +15,7 @@ function Node_Normal(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co active_index = 3; input_display_list = [ 3, - ["Output", false], 0, + ["Surfaces", false], 0, ["Normal", false], 1, 2, ] diff --git a/scripts/node_outline/node_outline.gml b/scripts/node_outline/node_outline.gml index f7c2aeea3..5f55666dd 100644 --- a/scripts/node_outline/node_outline.gml +++ b/scripts/node_outline/node_outline.gml @@ -35,7 +35,7 @@ function Node_Outline(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c outputs[| 1] = nodeValue("Outline", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 11, - ["Output", true], 0, 9, 10, + ["Surfaces", true], 0, 9, 10, ["Outline", false], 1, 5, 8, 12, ["Render", false], 2, 3, 4, 6, ]; diff --git a/scripts/node_padding/node_padding.gml b/scripts/node_padding/node_padding.gml index a22aa3977..01af655e9 100644 --- a/scripts/node_padding/node_padding.gml +++ b/scripts/node_padding/node_padding.gml @@ -31,7 +31,7 @@ function Node_Padding(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 4, - ["Output", true], 0, + ["Surfaces", true], 0, ["Padding", false], 5, 1, 6, 7, 8, ["Filling", false], 2, 3, ]; diff --git a/scripts/node_palette_extract/node_palette_extract.gml b/scripts/node_palette_extract/node_palette_extract.gml index c6334d94a..b3b18df14 100644 --- a/scripts/node_palette_extract/node_palette_extract.gml +++ b/scripts/node_palette_extract/node_palette_extract.gml @@ -20,7 +20,7 @@ function Node_Palette_Extract(_x, _y, _group = noone) : Node(_x, _y, _group) con static getPreviewValues = function() { return getInputData(0); } input_display_list = [ - ["Output", true], 0, + ["Surfaces", true], 0, ["Palette", false], 3, 1, 2, ] diff --git a/scripts/node_palette_shift/node_palette_shift.gml b/scripts/node_palette_shift/node_palette_shift.gml index 684346fb1..1bd597bbf 100644 --- a/scripts/node_palette_shift/node_palette_shift.gml +++ b/scripts/node_palette_shift/node_palette_shift.gml @@ -18,8 +18,8 @@ function Node_Palette_Shift(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr active_index = 5; input_display_list = [ 5, - ["Output", true], 0, 3, 4, - ["Palette", false], 1, 2 + ["Surfaces", true], 0, 3, 4, + ["Palette", false], 1, 2 ] outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); diff --git a/scripts/node_pixel_sort/node_pixel_sort.gml b/scripts/node_pixel_sort/node_pixel_sort.gml index ebd11070f..cb6539760 100644 --- a/scripts/node_pixel_sort/node_pixel_sort.gml +++ b/scripts/node_pixel_sort/node_pixel_sort.gml @@ -26,7 +26,7 @@ function Node_Pixel_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _group active_index = 6; input_display_list = [ 6, - ["Output", true], 0, 4, 5, + ["Surfaces", true], 0, 4, 5, ["Pixel sort", false], 1, 2, 3, ] diff --git a/scripts/node_polar/node_polar.gml b/scripts/node_polar/node_polar.gml index 45d7f9f2d..4d73a1e25 100644 --- a/scripts/node_polar/node_polar.gml +++ b/scripts/node_polar/node_polar.gml @@ -14,7 +14,7 @@ function Node_Polar(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 3, - ["Output", false], 0, 1, 2, + ["Surfaces", false], 0, 1, 2, ] attribute_surface_depth(); diff --git a/scripts/node_region_fill/node_region_fill.gml b/scripts/node_region_fill/node_region_fill.gml index 53331ac6c..84a4a94a9 100644 --- a/scripts/node_region_fill/node_region_fill.gml +++ b/scripts/node_region_fill/node_region_fill.gml @@ -15,8 +15,8 @@ function Node_Region_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ - ["Output", false], 0, 1, - ["Fill", false], 3, 4, 2, + ["Surfaces", false], 0, 1, + ["Fill", false], 3, 4, 2, ]; temp_surface = [ surface_create(1, 1), surface_create(1, 1) ]; diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index 548e2f7aa..f38de9510 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -265,7 +265,8 @@ function NodeObject(_name, _spr, _node, _create, tags = []) constructor { #regio var input = ds_list_create(); #region addNodeCatagory("IO", input); ds_list_add(input, "Images"); - addNodeObject(input, "Canvas", s_node_canvas, "Node_Canvas", [1, Node_Canvas], ["draw"], "Draw on surface using brush, eraser, etc.") + addNodeObject(input, "Canvas", s_node_canvas, "Node_Canvas", [1, Node_Canvas], ["draw"], "Draw on surface using brush, eraser, etc."); + addNodeObject(input, "Active Canvas", s_node_active_canvas, "Node_Active_Canvas", [1, Node_Active_Canvas], ["draw"], "Draw using parameterized brush.").setVersion(11570); addNodeObject(input, "Image", s_node_image, "Node_Image", [0, Node_create_Image],, "Load a single image from your computer."); addNodeObject(input, "Image GIF", s_node_image_gif, "Node_Image_gif", [0, Node_create_Image_gif],, "Load animated .gif from your computer."); addNodeObject(input, "Splice Spritesheet", s_node_image_sheet, "Node_Image_Sheet", [1, Node_Image_Sheet],, "Cut up spritesheet into animation or image array."); diff --git a/scripts/node_render_sprite_sheet/node_render_sprite_sheet.gml b/scripts/node_render_sprite_sheet/node_render_sprite_sheet.gml index 6ebd1bf07..5776de249 100644 --- a/scripts/node_render_sprite_sheet/node_render_sprite_sheet.gml +++ b/scripts/node_render_sprite_sheet/node_render_sprite_sheet.gml @@ -49,7 +49,7 @@ function Node_Render_Sprite_Sheet(_x, _y, _group = noone) : Node(_x, _y, _group) refreshSurface = false; input_display_list = [ - ["Output", false], 0, 1, 2, + ["Surfaces", false], 0, 1, 2, ["Sprite", false], 3, 8, ["Packing", false], 4, 5, 6, 7, ] diff --git a/scripts/node_repeat/node_repeat.gml b/scripts/node_repeat/node_repeat.gml index 244190468..0964c3e8b 100644 --- a/scripts/node_repeat/node_repeat.gml +++ b/scripts/node_repeat/node_repeat.gml @@ -82,7 +82,7 @@ function Node_Repeat(_x, _y, _group = noone) : Node(_x, _y, _group) constructor outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ - ["Output", true], 0, 1, 16, 17, + ["Surfaces", true], 0, 1, 16, 17, ["Pattern", false], 3, 9, 2, 18, 7, 8, ["Path", true], 11, 12, 13, ["Transform", false], 4, 26, 19, 5, 6, 10, diff --git a/scripts/node_scale/node_scale.gml b/scripts/node_scale/node_scale.gml index 37550ed36..1d05492bb 100644 --- a/scripts/node_scale/node_scale.gml +++ b/scripts/node_scale/node_scale.gml @@ -23,7 +23,7 @@ function Node_Scale(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 4, - ["Output", true], 0, + ["Surfaces", true], 0, ["Scale", false], 2, 1, 3, 5, ]; diff --git a/scripts/node_scale_algo/node_scale_algo.gml b/scripts/node_scale_algo/node_scale_algo.gml index cfe36ddb2..c21a46720 100644 --- a/scripts/node_scale_algo/node_scale_algo.gml +++ b/scripts/node_scale_algo/node_scale_algo.gml @@ -31,7 +31,7 @@ function Node_Scale_Algo(_x, _y, _group = noone) : Node_Processor(_x, _y, _group outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 3, - ["Output", false], 0, + ["Surfaces", false], 0, ["Scale", false], 1, 2, 4, ] diff --git a/scripts/node_scatter/node_scatter.gml b/scripts/node_scatter/node_scatter.gml index dae83af81..b991e19cc 100644 --- a/scripts/node_scatter/node_scatter.gml +++ b/scripts/node_scatter/node_scatter.gml @@ -70,7 +70,7 @@ function Node_Scatter(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c .rejectArrayProcess(); input_display_list = [ - ["Output", true], 0, 1, 15, 10, + ["Surfaces", true], 0, 1, 15, 10, ["Scatter", false], 5, 6, 13, 14, 17, 9, 2, ["Path", false], 19, 20, 21, 22, ["Transform", false], 3, 8, 7, 4, diff --git a/scripts/node_sdf/node_sdf.gml b/scripts/node_sdf/node_sdf.gml index dd42c2a04..cce076aa9 100644 --- a/scripts/node_sdf/node_sdf.gml +++ b/scripts/node_sdf/node_sdf.gml @@ -22,8 +22,8 @@ function Node_SDF(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) const outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 1, - ["Output", false], 0, - ["SDF", false], 2, 3, + ["Surfaces", false], 0, + ["SDF", false], 2, 3, ] attribute_surface_depth(); diff --git a/scripts/node_shadow/node_shadow.gml b/scripts/node_shadow/node_shadow.gml index 7d9d34330..8d97f5fc2 100644 --- a/scripts/node_shadow/node_shadow.gml +++ b/scripts/node_shadow/node_shadow.gml @@ -33,8 +33,8 @@ function Node_Shadow(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 8, - ["Output", true], 0, 6, 7, - ["Shadow", false], 1, 2, 3, 4, 5, + ["Surfaces", true], 0, 6, 7, + ["Shadow", false], 1, 2, 3, 4, 5, ]; surface_blur_init(); diff --git a/scripts/node_shadow_cast/node_shadow_cast.gml b/scripts/node_shadow_cast/node_shadow_cast.gml index ffcaf1540..68ea902e4 100644 --- a/scripts/node_shadow_cast/node_shadow_cast.gml +++ b/scripts/node_shadow_cast/node_shadow_cast.gml @@ -91,7 +91,7 @@ function Node_Shadow_Cast(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou outputs[| 1] = nodeValue("Light mask", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 17, - ["Output", true], 0, 1, + ["Surfaces", true], 0, 1, ["Light", false], 5, 12, 8, 2, 3, 4, ["Shadow caster", false], 10, 11, ["Render", false], 13, 14, 7, 6, 9, 15, 16, diff --git a/scripts/node_skew/node_skew.gml b/scripts/node_skew/node_skew.gml index c07b26f46..676c2d77b 100644 --- a/scripts/node_skew/node_skew.gml +++ b/scripts/node_skew/node_skew.gml @@ -27,7 +27,7 @@ function Node_Skew(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons active_index = 8; input_display_list = [ 8, - ["Output", true], 0, 6, 7, + ["Surfaces", true], 0, 6, 7, ["Skew", false], 1, 2, 4, ] diff --git a/scripts/node_solid/node_solid.gml b/scripts/node_solid/node_solid.gml index 77f8fcc77..63024a122 100644 --- a/scripts/node_solid/node_solid.gml +++ b/scripts/node_solid/node_solid.gml @@ -15,8 +15,8 @@ function Node_Solid(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ - ["Output", false], 0, 3, 4, - ["Solid", false], 1, 2, + ["Surfaces", false], 0, 3, 4, + ["Solid", false], 1, 2, ]; attribute_surface_depth(); diff --git a/scripts/node_surface_replace/node_surface_replace.gml b/scripts/node_surface_replace/node_surface_replace.gml index c2cbbf2a0..8404b0000 100644 --- a/scripts/node_surface_replace/node_surface_replace.gml +++ b/scripts/node_surface_replace/node_surface_replace.gml @@ -28,7 +28,7 @@ function Node_Surface_Replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _ outputs[| 0] = nodeValue("Surface Out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ - ["Output", true], 0, 1, 2, 7, 8, + ["Surfaces", true], 0, 1, 2, 7, 8, ["Searching", false], 5, 3, 6, ["Render", false], 4, ]; diff --git a/scripts/node_texture_remap/node_texture_remap.gml b/scripts/node_texture_remap/node_texture_remap.gml index 5734da572..a201ef4e6 100644 --- a/scripts/node_texture_remap/node_texture_remap.gml +++ b/scripts/node_texture_remap/node_texture_remap.gml @@ -17,7 +17,7 @@ function Node_Texture_Remap(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 2, - ["Output", false], 0, 1, 3, + ["Surfaces", false], 0, 1, 3, ] attribute_surface_depth(); diff --git a/scripts/node_threshold/node_threshold.gml b/scripts/node_threshold/node_threshold.gml index 12dc58323..e2892f8ae 100644 --- a/scripts/node_threshold/node_threshold.gml +++ b/scripts/node_threshold/node_threshold.gml @@ -30,7 +30,7 @@ function Node_Threshold(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 6, - ["Output", true], 0, 4, 5, + ["Surfaces", true], 0, 4, 5, ["Threshold", false], 1, 2, 3, 7, 8, 9, ]; diff --git a/scripts/node_time_remap/node_time_remap.gml b/scripts/node_time_remap/node_time_remap.gml index 1b42b4bfa..a45eb2906 100644 --- a/scripts/node_time_remap/node_time_remap.gml +++ b/scripts/node_time_remap/node_time_remap.gml @@ -21,7 +21,7 @@ function Node_Time_Remap(_x, _y, _group = noone) : Node(_x, _y, _group) construc outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ - ["Output", false], 0, 1, + ["Surfaces", false], 0, 1, ["Remap", false], 2, 3, ] diff --git a/scripts/node_trail/node_trail.gml b/scripts/node_trail/node_trail.gml index 661a66685..c4af89704 100644 --- a/scripts/node_trail/node_trail.gml +++ b/scripts/node_trail/node_trail.gml @@ -22,7 +22,7 @@ function Node_Trail(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { outputs[| 1] = nodeValue("Trail UV", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ - ["Output", true], 0, + ["Surfaces", true], 0, ["Trail settings", false], 1, 2, ["Tracking", false], 3, 4, 5, ["Modification", false], 6, diff --git a/scripts/node_twirl/node_twirl.gml b/scripts/node_twirl/node_twirl.gml index b0773e506..1ed325f29 100644 --- a/scripts/node_twirl/node_twirl.gml +++ b/scripts/node_twirl/node_twirl.gml @@ -33,7 +33,7 @@ function Node_Twirl(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 7, - ["Output", true], 0, 5, 6, + ["Surfaces", true], 0, 5, 6, ["Twirl", false], 1, 2, 3, ]; diff --git a/scripts/node_wrap/node_wrap.gml b/scripts/node_wrap/node_wrap.gml index ede937af0..c9f894dee 100644 --- a/scripts/node_wrap/node_wrap.gml +++ b/scripts/node_wrap/node_wrap.gml @@ -25,7 +25,7 @@ function Node_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 5, - ["Output", false], 0, + ["Surfaces", false], 0, ["Wrap", false], 1, 2, 3, 4 ] diff --git a/scripts/node_wrap_area/node_wrap_area.gml b/scripts/node_wrap_area/node_wrap_area.gml index 37db7748e..18e2f5a2e 100644 --- a/scripts/node_wrap_area/node_wrap_area.gml +++ b/scripts/node_wrap_area/node_wrap_area.gml @@ -13,7 +13,7 @@ function Node_Wrap_Area(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 2, - ["Output", false], 0, + ["Surfaces", false], 0, ["Area", false], 1, ] diff --git a/scripts/node_wrap_perspective/node_wrap_perspective.gml b/scripts/node_wrap_perspective/node_wrap_perspective.gml index 5722a1383..3402475a3 100644 --- a/scripts/node_wrap_perspective/node_wrap_perspective.gml +++ b/scripts/node_wrap_perspective/node_wrap_perspective.gml @@ -41,7 +41,7 @@ function Node_Warp_Perspective(_x, _y, _group = noone) : Node_Processor(_x, _y, outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); input_display_list = [ 1, - ["Output", false], 0, + ["Surfaces", false], 0, ["Origin", false], 2, 3, 4, 5, ["Warp", false], 6, 7, 8, 9, ] diff --git a/sprites/s_node_active_canvas/b47d3b75-ee7d-4349-bd91-d6c3b29f9b49.png b/sprites/s_node_active_canvas/b47d3b75-ee7d-4349-bd91-d6c3b29f9b49.png new file mode 100644 index 000000000..da67a71d4 Binary files /dev/null and b/sprites/s_node_active_canvas/b47d3b75-ee7d-4349-bd91-d6c3b29f9b49.png differ diff --git a/sprites/s_node_active_canvas/layers/b47d3b75-ee7d-4349-bd91-d6c3b29f9b49/9c99cfe2-7401-4deb-a04c-3e436a846341.png b/sprites/s_node_active_canvas/layers/b47d3b75-ee7d-4349-bd91-d6c3b29f9b49/9c99cfe2-7401-4deb-a04c-3e436a846341.png new file mode 100644 index 000000000..da67a71d4 Binary files /dev/null and b/sprites/s_node_active_canvas/layers/b47d3b75-ee7d-4349-bd91-d6c3b29f9b49/9c99cfe2-7401-4deb-a04c-3e436a846341.png differ diff --git a/sprites/s_node_active_canvas/s_node_active_canvas.yy b/sprites/s_node_active_canvas/s_node_active_canvas.yy new file mode 100644 index 000000000..37c134ef6 --- /dev/null +++ b/sprites/s_node_active_canvas/s_node_active_canvas.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "s_node_active_canvas", + "bbox_bottom": 62, + "bbox_left": 2, + "bbox_right": 63, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b47d3b75-ee7d-4349-bd91-d6c3b29f9b49",}, + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9c99cfe2-7401-4deb-a04c-3e436a846341","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 4, + "parent": { + "name": "IO", + "path": "folders/nodes/icons/IO.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "s_node_active_canvas", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b47d3b75-ee7d-4349-bd91-d6c3b29f9b49","path":"sprites/s_node_active_canvas/s_node_active_canvas.yy",},},},"Disabled":false,"id":"4b9632e7-8a75-4746-9c8b-7c3c88f7aefa","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 32, + "yorigin": 32, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 64, +} \ No newline at end of file