diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 2ff37ec35..53670a455 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -222,6 +222,9 @@ {"name":"biterator","order":2,"path":"folders/VCT/biterator.yy",}, {"name":"widget","order":3,"path":"folders/VCT/widget.yy",}, {"name":"widgets","order":5,"path":"folders/widgets.yy",}, + {"name":"button","order":34,"path":"folders/widgets/button.yy",}, + {"name":"rotator","order":35,"path":"folders/widgets/rotator.yy",}, + {"name":"text","order":36,"path":"folders/widgets/text.yy",}, ], "ResourceOrderSettings": [ {"name":"s_node_corner","order":16,"path":"sprites/s_node_corner/s_node_corner.yy",}, @@ -282,7 +285,7 @@ {"name":"ds_list_queue","order":6,"path":"scripts/ds_list_queue/ds_list_queue.yy",}, {"name":"s_node_scale","order":6,"path":"sprites/s_node_scale/s_node_scale.yy",}, {"name":"sh_color_picker_value","order":1,"path":"shaders/sh_color_picker_value/sh_color_picker_value.yy",}, - {"name":"textInput","order":24,"path":"scripts/textInput/textInput.yy",}, + {"name":"textInput","order":3,"path":"scripts/textInput/textInput.yy",}, {"name":"node_dither","order":7,"path":"scripts/node_dither/node_dither.yy",}, {"name":"sh_perlin_smear","order":5,"path":"shaders/sh_perlin_smear/sh_perlin_smear.yy",}, {"name":"node_array_remove","order":4,"path":"scripts/node_array_remove/node_array_remove.yy",}, @@ -493,8 +496,9 @@ {"name":"__VFX","order":1,"path":"scripts/__VFX/__VFX.yy",}, {"name":"s_menu_black","order":2,"path":"sprites/s_menu_black/s_menu_black.yy",}, {"name":"__node_3d_export","order":2,"path":"scripts/__node_3d_export/__node_3d_export.yy",}, + {"name":"buttonAnchor","order":5,"path":"scripts/buttonAnchor/buttonAnchor.yy",}, {"name":"s_node_vfx_override","order":11,"path":"sprites/s_node_vfx_override/s_node_vfx_override.yy",}, - {"name":"rotatorRange","order":12,"path":"scripts/rotatorRange/rotatorRange.yy",}, + {"name":"rotatorRange","order":2,"path":"scripts/rotatorRange/rotatorRange.yy",}, {"name":"node_3d_mesh_cone","order":6,"path":"scripts/node_3d_mesh_cone/node_3d_mesh_cone.yy",}, {"name":"font_loader","order":8,"path":"scripts/font_loader/font_loader.yy",}, {"name":"node_iterator_filter_input","order":1,"path":"scripts/node_iterator_filter_input/node_iterator_filter_input.yy",}, @@ -516,7 +520,7 @@ {"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",}, - {"name":"buttonGroup","order":5,"path":"scripts/buttonGroup/buttonGroup.yy",}, + {"name":"buttonGroup","order":3,"path":"scripts/buttonGroup/buttonGroup.yy",}, {"name":"s_node_image_sheet","order":7,"path":"sprites/s_node_image_sheet/s_node_image_sheet.yy",}, {"name":"locale_data","order":1,"path":"scripts/locale_data/locale_data.yy",}, {"name":"o_dialog_scrollbox","order":3,"path":"objects/o_dialog_scrollbox/o_dialog_scrollbox.yy",}, @@ -550,8 +554,8 @@ {"name":"_addon_custom","order":4,"path":"objects/_addon_custom/_addon_custom.yy",}, {"name":"s_node_3d_export","order":10,"path":"sprites/s_node_3d_export/s_node_3d_export.yy",}, {"name":"s_node_curve_edit","order":1,"path":"sprites/s_node_curve_edit/s_node_curve_edit.yy",}, - {"name":"textBox","order":17,"path":"scripts/textBox/textBox.yy",}, - {"name":"pathArrayBox","order":27,"path":"scripts/pathArrayBox/pathArrayBox.yy",}, + {"name":"textBox","order":2,"path":"scripts/textBox/textBox.yy",}, + {"name":"pathArrayBox","order":12,"path":"scripts/pathArrayBox/pathArrayBox.yy",}, {"name":"node_statistic","order":3,"path":"scripts/node_statistic/node_statistic.yy",}, {"name":"node_pb_box_inset","order":4,"path":"scripts/node_pb_box_inset/node_pb_box_inset.yy",}, {"name":"sh_draw_surface_part_tiled","order":1,"path":"shaders/sh_draw_surface_part_tiled/sh_draw_surface_part_tiled.yy",}, @@ -577,7 +581,6 @@ {"name":"o_dialog_migration","order":11,"path":"objects/o_dialog_migration/o_dialog_migration.yy",}, {"name":"s_node_color_mix","order":19,"path":"sprites/s_node_color_mix/s_node_color_mix.yy",}, {"name":"s_node_blur","order":9,"path":"sprites/s_node_blur/s_node_blur.yy",}, - {"name":"textArea","order":20,"path":"scripts/textArea/textArea.yy",}, {"name":"s_node_gradient_4points","order":2,"path":"sprites/s_node_gradient_4points/s_node_gradient_4points.yy",}, {"name":"s_node_gradient_out","order":9,"path":"sprites/s_node_gradient_out/s_node_gradient_out.yy",}, {"name":"s_node_pb_box_split","order":20,"path":"sprites/s_node_pb_box_split/s_node_pb_box_split.yy",}, @@ -649,7 +652,7 @@ {"name":"node_random_shape","order":17,"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":32,"path":"scripts/quarternionBox/quarternionBox.yy",}, + {"name":"quarternionBox","order":8,"path":"scripts/quarternionBox/quarternionBox.yy",}, {"name":"s_window_exit","order":2,"path":"sprites/s_window_exit/s_window_exit.yy",}, {"name":"s_node_color_remove","order":7,"path":"sprites/s_node_color_remove/s_node_color_remove.yy",}, {"name":"sh_average","order":7,"path":"shaders/sh_average/sh_average.yy",}, @@ -707,14 +710,14 @@ {"name":"s_node_lua_global","order":19,"path":"sprites/s_node_lua_global/s_node_lua_global.yy",}, {"name":"node_pb_draw_diamond","order":10,"path":"scripts/node_pb_draw_diamond/node_pb_draw_diamond.yy",}, {"name":"polygon_points","order":2,"path":"scripts/polygon_points/polygon_points.yy",}, - {"name":"transformBox","order":29,"path":"scripts/transformBox/transformBox.yy",}, + {"name":"transformBox","order":15,"path":"scripts/transformBox/transformBox.yy",}, {"name":"sh_grey_alpha","order":12,"path":"shaders/sh_grey_alpha/sh_grey_alpha.yy",}, {"name":"s_node_time_map","order":39,"path":"sprites/s_node_time_map/s_node_time_map.yy",}, {"name":"node_crop","order":7,"path":"scripts/node_crop/node_crop.yy",}, {"name":"s_biterator_tab_content","order":14,"path":"sprites/s_biterator_tab_content/s_biterator_tab_content.yy",}, {"name":"fd_rectangle_get_material_maccormack_weight","order":11,"path":"scripts/fd_rectangle_get_material_maccormack_weight/fd_rectangle_get_material_maccormack_weight.yy",}, {"name":"s_node_lua_compute","order":17,"path":"sprites/s_node_lua_compute/s_node_lua_compute.yy",}, - {"name":"buttonPalette","order":6,"path":"scripts/buttonPalette/buttonPalette.yy",}, + {"name":"buttonPalette","order":4,"path":"scripts/buttonPalette/buttonPalette.yy",}, {"name":"draw_line_width_vertex","order":23,"path":"scripts/draw_line_width_vertex/draw_line_width_vertex.yy",}, {"name":"fd_rectangle_draw_stretched","order":11,"path":"scripts/fd_rectangle_draw_stretched/fd_rectangle_draw_stretched.yy",}, {"name":"s_node_wiggler","order":2,"path":"sprites/s_node_wiggler/s_node_wiggler.yy",}, @@ -764,7 +767,7 @@ {"name":"ds_priority","order":3,"path":"scripts/ds_priority/ds_priority.yy",}, {"name":"node_to_text","order":11,"path":"scripts/node_to_text/node_to_text.yy",}, {"name":"node_palette","order":4,"path":"scripts/node_palette/node_palette.yy",}, - {"name":"buttonColor","order":3,"path":"scripts/buttonColor/buttonColor.yy",}, + {"name":"buttonColor","order":1,"path":"scripts/buttonColor/buttonColor.yy",}, {"name":"notification_system","order":7,"path":"scripts/notification_system/notification_system.yy",}, {"name":"buffer_object","order":1,"path":"scripts/buffer_object/buffer_object.yy",}, {"name":"node_3d_mesh_uvsphere","order":4,"path":"scripts/node_3d_mesh_uvsphere/node_3d_mesh_uvsphere.yy",}, @@ -872,12 +875,11 @@ {"name":"__surface","order":8,"path":"scripts/__surface/__surface.yy",}, {"name":"clipboard","order":9,"path":"extensions/clipboard/clipboard.yy",}, {"name":"__node_3d_light","order":1,"path":"scripts/__node_3d_light/__node_3d_light.yy",}, - {"name":"rotator","order":11,"path":"scripts/rotator/rotator.yy",}, {"name":"d3d_icosphere","order":4,"path":"scripts/d3d_icosphere/d3d_icosphere.yy",}, {"name":"s_node_edge_detect","order":22,"path":"sprites/s_node_edge_detect/s_node_edge_detect.yy",}, {"name":"node_fluid_add_collider","order":6,"path":"scripts/node_fluid_add_collider/node_fluid_add_collider.yy",}, {"name":"node_atlas_get","order":1,"path":"scripts/node_atlas_get/node_atlas_get.yy",}, - {"name":"fontScrollBox","order":26,"path":"scripts/fontScrollBox/fontScrollBox.yy",}, + {"name":"fontScrollBox","order":14,"path":"scripts/fontScrollBox/fontScrollBox.yy",}, {"name":"node_grid_hex","order":2,"path":"scripts/node_grid_hex/node_grid_hex.yy",}, {"name":"node_pb_draw_blob","order":5,"path":"scripts/node_pb_draw_blob/node_pb_draw_blob.yy",}, {"name":"credit_badge_value","order":1,"path":"sprites/credit_badge_value/credit_badge_value.yy",}, @@ -896,14 +898,14 @@ {"name":"__strandSim","order":2,"path":"scripts/__strandSim/__strandSim.yy",}, {"name":"sh_shape","order":3,"path":"shaders/sh_shape/sh_shape.yy",}, {"name":"draw_line_width2","order":2,"path":"scripts/draw_line_width2/draw_line_width2.yy",}, - {"name":"matrixGrid","order":23,"path":"scripts/matrixGrid/matrixGrid.yy",}, + {"name":"matrixGrid","order":6,"path":"scripts/matrixGrid/matrixGrid.yy",}, {"name":"node_VFX_override","order":7,"path":"scripts/node_VFX_override/node_VFX_override.yy",}, {"name":"fd_README","order":6,"path":"scripts/fd_README/fd_README.yy",}, {"name":"ase_object","order":7,"path":"scripts/ase_object/ase_object.yy",}, {"name":"node_rigid_object","order":1,"path":"scripts/node_rigid_object/node_rigid_object.yy",}, {"name":"__node_template","order":17,"path":"scripts/__node_template/__node_template.yy",}, {"name":"node_pb_box_transform","order":9,"path":"scripts/node_pb_box_transform/node_pb_box_transform.yy",}, - {"name":"areaBox","order":1,"path":"scripts/areaBox/areaBox.yy",}, + {"name":"areaBox","order":13,"path":"scripts/areaBox/areaBox.yy",}, {"name":"__global_object_depths","order":7,"path":"scripts/__global_object_depths/__global_object_depths.yy",}, {"name":"s_node_filter_array","order":28,"path":"sprites/s_node_filter_array/s_node_filter_array.yy",}, {"name":"node_noise_grid_hex","order":5,"path":"scripts/node_noise_grid_hex/node_noise_grid_hex.yy",}, @@ -1135,7 +1137,7 @@ {"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",}, {"name":"lerp_float","order":1,"path":"scripts/lerp_float/lerp_float.yy",}, - {"name":"vectorRangeBox","order":19,"path":"scripts/vectorRangeBox/vectorRangeBox.yy",}, + {"name":"vectorRangeBox","order":11,"path":"scripts/vectorRangeBox/vectorRangeBox.yy",}, {"name":"sh_draw_r8","order":9,"path":"shaders/sh_draw_r8/sh_draw_r8.yy",}, {"name":"s_node_pb_fx_outline","order":5,"path":"sprites/s_node_pb_fx_outline/s_node_pb_fx_outline.yy",}, {"name":"fd_rectangle_get_velocity_width","order":26,"path":"scripts/fd_rectangle_get_velocity_width/fd_rectangle_get_velocity_width.yy",}, @@ -1211,7 +1213,7 @@ {"name":"s_node_pb_draw_angle","order":17,"path":"sprites/s_node_pb_draw_angle/s_node_pb_draw_angle.yy",}, {"name":"node_PCX_var","order":1,"path":"scripts/node_PCX_var/node_PCX_var.yy",}, {"name":"_f_p3","order":7,"path":"fonts/_f_p3/_f_p3.yy",}, - {"name":"cornerBox","order":30,"path":"scripts/cornerBox/cornerBox.yy",}, + {"name":"cornerBox","order":5,"path":"scripts/cornerBox/cornerBox.yy",}, {"name":"node_group_input","order":1,"path":"scripts/node_group_input/node_group_input.yy",}, {"name":"fd_rectangle_set_material_dissipation_type","order":4,"path":"scripts/fd_rectangle_set_material_dissipation_type/fd_rectangle_set_material_dissipation_type.yy",}, {"name":"s_node_gradient_shift","order":15,"path":"sprites/s_node_gradient_shift/s_node_gradient_shift.yy",}, @@ -1257,12 +1259,13 @@ {"name":"panel_node_align","order":3,"path":"scripts/panel_node_align/panel_node_align.yy",}, {"name":"sh_blur_alpha","order":1,"path":"shaders/sh_blur_alpha/sh_blur_alpha.yy",}, {"name":"d3d_light_directional","order":1,"path":"scripts/d3d_light_directional/d3d_light_directional.yy",}, + {"name":"textArrayBox","order":1,"path":"scripts/textArrayBox/textArrayBox.yy",}, {"name":"value_snap","order":10,"path":"scripts/value_snap/value_snap.yy",}, {"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":"controlPointBox","order":21,"path":"scripts/controlPointBox/controlPointBox.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",}, {"name":"fd_rectangle_set_velocity_dissipation_type","order":13,"path":"scripts/fd_rectangle_set_velocity_dissipation_type/fd_rectangle_set_velocity_dissipation_type.yy",}, @@ -1373,7 +1376,7 @@ {"name":"s_biterator_tab_active","order":12,"path":"sprites/s_biterator_tab_active/s_biterator_tab_active.yy",}, {"name":"dynaSurf_3d","order":2,"path":"scripts/dynaSurf_3d/dynaSurf_3d.yy",}, {"name":"s_node_3d_extrude","order":2,"path":"sprites/s_node_3d_extrude/s_node_3d_extrude.yy",}, - {"name":"buttonGradient","order":4,"path":"scripts/buttonGradient/buttonGradient.yy",}, + {"name":"buttonGradient","order":2,"path":"scripts/buttonGradient/buttonGradient.yy",}, {"name":"sh_draw_downsample","order":2,"path":"shaders/sh_draw_downsample/sh_draw_downsample.yy",}, {"name":"__view_get","order":1,"path":"scripts/__view_get/__view_get.yy",}, {"name":"export_portable","order":3,"path":"scripts/export_portable/export_portable.yy",}, @@ -1403,7 +1406,7 @@ {"name":"panel_menu","order":6,"path":"scripts/panel_menu/panel_menu.yy",}, {"name":"s_node_ase_file","order":15,"path":"sprites/s_node_ase_file/s_node_ase_file.yy",}, {"name":"draw_line_round","order":4,"path":"scripts/draw_line_round/draw_line_round.yy",}, - {"name":"vectorBox","order":18,"path":"scripts/vectorBox/vectorBox.yy",}, + {"name":"vectorBox","order":10,"path":"scripts/vectorBox/vectorBox.yy",}, {"name":"sh_3d_extrude_corner","order":7,"path":"shaders/sh_3d_extrude_corner/sh_3d_extrude_corner.yy",}, {"name":"sh_blend_normal_dim","order":10,"path":"shaders/sh_blend_normal_dim/sh_blend_normal_dim.yy",}, {"name":"__d3d11_cbuffer","order":1,"path":"scripts/__d3d11_cbuffer/__d3d11_cbuffer.yy",}, @@ -1439,7 +1442,7 @@ {"name":"fd_rectangle_set_velocity_dissipation_value","order":14,"path":"scripts/fd_rectangle_set_velocity_dissipation_value/fd_rectangle_set_velocity_dissipation_value.yy",}, {"name":"panel_history","order":7,"path":"scripts/panel_history/panel_history.yy",}, {"name":"sh_channel_H","order":3,"path":"shaders/sh_channel_H/sh_channel_H.yy",}, - {"name":"rotatorRandom","order":33,"path":"scripts/rotatorRandom/rotatorRandom.yy",}, + {"name":"rotatorRandom","order":1,"path":"scripts/rotatorRandom/rotatorRandom.yy",}, {"name":"s_node_RGB","order":34,"path":"sprites/s_node_RGB/s_node_RGB.yy",}, {"name":"fd_rectangle_draw","order":9,"path":"scripts/fd_rectangle_draw/fd_rectangle_draw.yy",}, {"name":"node_color_palette_replacement","order":14,"path":"scripts/node_color_palette_replacement/node_color_palette_replacement.yy",}, @@ -1471,7 +1474,6 @@ {"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":"sh_lum2alpha","order":16,"path":"shaders/sh_lum2alpha/sh_lum2alpha.yy",}, - {"name":"button","order":2,"path":"scripts/button/button.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",}, {"name":"s_node_group_thumbnail","order":34,"path":"sprites/s_node_group_thumbnail/s_node_group_thumbnail.yy",}, @@ -1487,7 +1489,7 @@ {"name":"s_node_regex_replace","order":10,"path":"sprites/s_node_regex_replace/s_node_regex_replace.yy",}, {"name":"sh_pb_hash","order":4,"path":"shaders/sh_pb_hash/sh_pb_hash.yy",}, {"name":"node_dynamic_surface_out_height","order":3,"path":"scripts/node_dynamic_surface_out_height/node_dynamic_surface_out_height.yy",}, - {"name":"paddingBox","order":9,"path":"scripts/paddingBox/paddingBox.yy",}, + {"name":"paddingBox","order":7,"path":"scripts/paddingBox/paddingBox.yy",}, {"name":"fd_rectangle_set_visualization_shader","order":18,"path":"scripts/fd_rectangle_set_visualization_shader/fd_rectangle_set_visualization_shader.yy",}, {"name":"s_biterator_bg","order":2,"path":"sprites/s_biterator_bg/s_biterator_bg.yy",}, {"name":"s_node_ase_layer","order":14,"path":"sprites/s_node_ase_layer/s_node_ase_layer.yy",}, @@ -1559,7 +1561,7 @@ {"name":"panel_array_sequence","order":3,"path":"scripts/panel_array_sequence/panel_array_sequence.yy",}, {"name":"sh_displace","order":5,"path":"shaders/sh_displace/sh_displace.yy",}, {"name":"fd_rectangle_get_material_height","order":10,"path":"scripts/fd_rectangle_get_material_height/fd_rectangle_get_material_height.yy",}, - {"name":"rangeBox","order":10,"path":"scripts/rangeBox/rangeBox.yy",}, + {"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",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index 27be16ad3..1770bdc7f 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -255,6 +255,9 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"biterator","folderPath":"folders/VCT/biterator.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"widget","folderPath":"folders/VCT/widget.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"widgets","folderPath":"folders/widgets.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"button","folderPath":"folders/widgets/button.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"rotator","folderPath":"folders/widgets/rotator.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"text","folderPath":"folders/widgets/text.yy",}, ], "IncludedFiles": [ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ApolloHelp.html","ConfigValues":{"Itch":{"CopyToMask":"0",},},"CopyToMask":-1,"filePath":"datafiles",}, @@ -505,6 +508,7 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_inspector_text_valign_strip3.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/inspector",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_obj_distribute_h.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/inspector",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_obj_distribute_v.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/inspector",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_prop_anchor.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/inspector",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_prop_area_type.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/inspector",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_prop_gradient_strip2.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/inspector",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_prop_keyframe_strip3.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/inspector",}, @@ -1087,6 +1091,7 @@ {"id":{"name":"__VFX","path":"scripts/__VFX/__VFX.yy",},}, {"id":{"name":"s_menu_black","path":"sprites/s_menu_black/s_menu_black.yy",},}, {"id":{"name":"__node_3d_export","path":"scripts/__node_3d_export/__node_3d_export.yy",},}, + {"id":{"name":"buttonAnchor","path":"scripts/buttonAnchor/buttonAnchor.yy",},}, {"id":{"name":"sh_blend_multiply","path":"shaders/sh_blend_multiply/sh_blend_multiply.yy",},}, {"id":{"name":"node_bevel","path":"scripts/node_bevel/node_bevel.yy",},}, {"id":{"name":"s_node_vfx_override","path":"sprites/s_node_vfx_override/s_node_vfx_override.yy",},}, diff --git a/datafiles/data/themes/default.zip b/datafiles/data/themes/default.zip index ddd4a0a58..26c999e1a 100644 Binary files a/datafiles/data/themes/default.zip and b/datafiles/data/themes/default.zip differ diff --git a/objects/o_dialog_textbox_slider/Draw_64.gml b/objects/o_dialog_textbox_slider/Draw_64.gml index 8f299936c..1a1264fe2 100644 --- a/objects/o_dialog_textbox_slider/Draw_64.gml +++ b/objects/o_dialog_textbox_slider/Draw_64.gml @@ -25,7 +25,7 @@ if(!MOUSE_WRAPPING) { var _tw = 48; for( var i = -2; i <= 2; i++ ) { var _v = _stp_fl + i * _stp_sz; - _tw = max(_tw, string_width(_v) + 16); + _tw = max(_tw, string_width(_v) + 24); } var _snp_s = 50 * _s; @@ -44,10 +44,12 @@ if(!MOUSE_WRAPPING) { for( var i = -2; i <= 2; i++ ) { var _v = _stp_fl + i * _stp_sz; + draw_set_color(_v == tb.slide_sv? COLORS._main_accent : COLORS._main_text); draw_set_alpha(0.4 - abs(i) * 0.1); draw_text(slide_dx, slide_dy - (_v - tb.slide_sv) / _s, _v); } + draw_set_color(_val == tb.slide_sv? COLORS._main_accent : COLORS._main_text); draw_set_alpha(1); draw_text(slide_dx, slide_dy - (_val - tb.slide_sv) / _s, _val); } else { @@ -61,10 +63,12 @@ if(!MOUSE_WRAPPING) { for( var i = -2; i <= 2; i++ ) { var _v = _stp_fl + i * _stp_sz; + draw_set_color(_v == tb.slide_sv? COLORS._main_accent : COLORS._main_text); draw_set_alpha(0.4 - abs(i) * 0.1); draw_text(slide_dx + (_v - tb.slide_sv) / _s, slide_dy, _v); } + draw_set_color(_val == tb.slide_sv? COLORS._main_accent : COLORS._main_text); draw_set_alpha(1); draw_text(slide_dx + (_val - tb.slide_sv) / _s, slide_dy, _val); } diff --git a/scripts/append_function/append_function.gml b/scripts/append_function/append_function.gml index 249b35289..e85d62db6 100644 --- a/scripts/append_function/append_function.gml +++ b/scripts/append_function/append_function.gml @@ -130,8 +130,6 @@ function __APPEND_MAP(_map, context = PANEL_GRAPH.getCurrentContext()) { APPENDING = false; - RENDER_ALL_REORDER - if(struct_has(_map, "metadata")) { var meta = _map.metadata; for( var i = 0; i < ds_list_size(node_create); i++ ) { @@ -143,6 +141,7 @@ function __APPEND_MAP(_map, context = PANEL_GRAPH.getCurrentContext()) { } refreshNodeMap(); + RENDER_ALL_REORDER if(struct_has(_map, "timelines")) { var _time = new timelineItemGroup().deserialize(_map.timelines); diff --git a/scripts/areaBox/areaBox.yy b/scripts/areaBox/areaBox.yy index d90ddc45f..9ab20873e 100644 --- a/scripts/areaBox/areaBox.yy +++ b/scripts/areaBox/areaBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/button/button.yy b/scripts/button/button.yy index 33a81df05..d2994922c 100644 --- a/scripts/button/button.yy +++ b/scripts/button/button.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "button", + "path": "folders/widgets/button.yy", }, } \ No newline at end of file diff --git a/scripts/buttonAnchor/buttonAnchor.gml b/scripts/buttonAnchor/buttonAnchor.gml new file mode 100644 index 000000000..ec0283389 --- /dev/null +++ b/scripts/buttonAnchor/buttonAnchor.gml @@ -0,0 +1,37 @@ +function buttonAnchor(_onClick) : widget() constructor { + onClick = _onClick; + index = 4; + + static drawParam = function(params) { + return draw(params.x, params.y, params.w, params.h, params.m); + } + + static draw = function(_x, _y, _w, _h, _m, spr = THEME.button, blend = c_white) { + x = _x; + y = _y; + w = _w; + h = _h; + + var cx = x + w / 2; + var cy = y + h / 2; + + for( var i = -1; i <= 1; i++ ) + for( var j = -1; j <= 1; j++ ) { + var _bx = cx + j * 9; + var _by = cy + i * 9; + var _in = (i + 1) * 3 + (j + 1); + + var hov = hover && point_in_rectangle(_m[0], _m[1], _bx - 4, _by - 4, _bx + 4, _by + 4); + var cc = hov? COLORS._main_accent : COLORS._main_icon; + var aa = 0.75 + (_in == index || hov) * 0.25; + + draw_sprite_ext(THEME.prop_anchor, _in == index, _bx, _by, 1, 1, 0, cc, aa); + + if(hov && mouse_click(mb_left, active)) onClick(_in); + } + + resetFocus(); + + return _h; + } +} \ No newline at end of file diff --git a/scripts/buttonAnchor/buttonAnchor.yy b/scripts/buttonAnchor/buttonAnchor.yy new file mode 100644 index 000000000..900173ba0 --- /dev/null +++ b/scripts/buttonAnchor/buttonAnchor.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "buttonAnchor", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "button", + "path": "folders/widgets/button.yy", + }, +} \ No newline at end of file diff --git a/scripts/buttonColor/buttonColor.yy b/scripts/buttonColor/buttonColor.yy index 7f3818502..fb1a1e7ec 100644 --- a/scripts/buttonColor/buttonColor.yy +++ b/scripts/buttonColor/buttonColor.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "button", + "path": "folders/widgets/button.yy", }, } \ No newline at end of file diff --git a/scripts/buttonGradient/buttonGradient.yy b/scripts/buttonGradient/buttonGradient.yy index 6de297e5d..0429b23d6 100644 --- a/scripts/buttonGradient/buttonGradient.yy +++ b/scripts/buttonGradient/buttonGradient.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "button", + "path": "folders/widgets/button.yy", }, } \ No newline at end of file diff --git a/scripts/buttonGroup/buttonGroup.yy b/scripts/buttonGroup/buttonGroup.yy index 14ddcf602..7c32e7c06 100644 --- a/scripts/buttonGroup/buttonGroup.yy +++ b/scripts/buttonGroup/buttonGroup.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "button", + "path": "folders/widgets/button.yy", }, } \ No newline at end of file diff --git a/scripts/buttonPalette/buttonPalette.yy b/scripts/buttonPalette/buttonPalette.yy index b4559b980..3c2059b78 100644 --- a/scripts/buttonPalette/buttonPalette.yy +++ b/scripts/buttonPalette/buttonPalette.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "button", + "path": "folders/widgets/button.yy", }, } \ No newline at end of file diff --git a/scripts/controlPointBox/controlPointBox.yy b/scripts/controlPointBox/controlPointBox.yy index dc6f6ed54..6c831bbe4 100644 --- a/scripts/controlPointBox/controlPointBox.yy +++ b/scripts/controlPointBox/controlPointBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/cornerBox/cornerBox.yy b/scripts/cornerBox/cornerBox.yy index 0c5e99789..52c0262a1 100644 --- a/scripts/cornerBox/cornerBox.yy +++ b/scripts/cornerBox/cornerBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/draw_sprite_ext_override/draw_sprite_ext_override.gml b/scripts/draw_sprite_ext_override/draw_sprite_ext_override.gml index 6f6e37197..81d3bac33 100644 --- a/scripts/draw_sprite_ext_override/draw_sprite_ext_override.gml +++ b/scripts/draw_sprite_ext_override/draw_sprite_ext_override.gml @@ -71,7 +71,5 @@ function draw_sprite_colored(spr, ind, _x, _y, scale = 1, rot = 0) { var num = sprite_get_number(spr); draw_sprite_ui(spr, ind, _x, _y, scale, scale, rot, c_white); - - if(num % 2 == 0) - draw_sprite_ui(spr, num / 2 + ind, _x, _y, scale, scale, rot, COLORS._main_accent); + if(num % 2 == 0) draw_sprite_ui(spr, num / 2 + ind, _x, _y, scale, scale, rot, COLORS._main_accent); } \ No newline at end of file diff --git a/scripts/fontScrollBox/fontScrollBox.yy b/scripts/fontScrollBox/fontScrollBox.yy index add525bdb..0cc7186a1 100644 --- a/scripts/fontScrollBox/fontScrollBox.yy +++ b/scripts/fontScrollBox/fontScrollBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 4d64b2de2..4cdf68662 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -25,10 +25,10 @@ globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER; - VERSION = 11560; + VERSION = 11561; SAVE_VERSION = 11560; - VERSION_STRING = "1.15.6"; - BUILD_NUMBER = 11560; + VERSION_STRING = "1.15.6.1"; + BUILD_NUMBER = 11561; globalvar APPEND_MAP; APPEND_MAP = ds_map_create(); diff --git a/scripts/matrixGrid/matrixGrid.yy b/scripts/matrixGrid/matrixGrid.yy index 99ee92479..7920d1273 100644 --- a/scripts/matrixGrid/matrixGrid.yy +++ b/scripts/matrixGrid/matrixGrid.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/node_cache/node_cache.gml b/scripts/node_cache/node_cache.gml index 7fe731984..d166a937a 100644 --- a/scripts/node_cache/node_cache.gml +++ b/scripts/node_cache/node_cache.gml @@ -38,6 +38,7 @@ function Node_Cache(_x, _y, _group = noone) : __Node_Cache(_x, _y, _group) const static update = function() { #region if(recoverCache()) return; if(!inputs[| 0].value_from) return; + if(!inputs[| 0].value_from.node.renderActive) return; var _surf = getInputData(0); cacheCurrentFrame(_surf); diff --git a/scripts/node_cache_array/node_cache_array.gml b/scripts/node_cache_array/node_cache_array.gml index 89d5b10b8..760e32dc2 100644 --- a/scripts/node_cache_array/node_cache_array.gml +++ b/scripts/node_cache_array/node_cache_array.gml @@ -45,6 +45,9 @@ function Node_Cache_Array(_x, _y, _group = noone) : __Node_Cache(_x, _y, _group) } #endregion static update = function() { #region + if(!inputs[| 0].value_from) return; + if(!inputs[| 0].value_from.node.renderActive) return; + var ss = []; var str = getInputData(1); var lst = getInputData(2); diff --git a/scripts/node_cache_base/node_cache_base.gml b/scripts/node_cache_base/node_cache_base.gml index 956a43437..a7e485b48 100644 --- a/scripts/node_cache_base/node_cache_base.gml +++ b/scripts/node_cache_base/node_cache_base.gml @@ -17,16 +17,23 @@ function __Node_Cache(_x, _y, _group = noone) : Node(_x, _y, _group) constructor if(NOT_LOAD) run_in(1, function() { onInspector1Update(); }); static removeNode = function(node) { #region - if(node.cache_group == noone) return; + if(node.cache_group != self) return; array_remove(attributes.cache_group, node.node_id); + array_remove(cache_group_members, node); + node.cache_group = noone; - refreshCacheGroup(); } #endregion static addNode = function(node) { #region - array_push_unique(attributes.cache_group, node.node_id); - refreshCacheGroup(); + if(node.cache_group == self) return; + if(node.cache_group != noone) + node.cache_group.removeNode(node); + + array_push(attributes.cache_group, node.node_id); + array_push(cache_group_members, node); + + node.cache_group = self; } #endregion static enableNodeGroup = function() { #region @@ -61,7 +68,7 @@ function __Node_Cache(_x, _y, _group = noone) : Node(_x, _y, _group) constructor } #endregion static getCacheGroup = function(node) { #region - if(node != self) array_push(attributes.cache_group, node.node_id); + if(node != self) addNode(node); for( var i = 0, n = ds_list_size(node.inputs); i < n; i++ ) { var _from = node.inputs[| i].value_from; diff --git a/scripts/node_number/node_number.gml b/scripts/node_number/node_number.gml index 74792f861..0c2728ff9 100644 --- a/scripts/node_number/node_number.gml +++ b/scripts/node_number/node_number.gml @@ -1,4 +1,4 @@ -function Node_Number(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { +function Node_Number(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { #region name = "Number"; color = COLORS.node_blend_number; previewable = false; @@ -224,9 +224,9 @@ function Node_Number(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co break; #endregion } } #endregion -} +} #endregion -function Node_Vector2(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { +function Node_Vector2(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { #region name = "Vector2"; color = COLORS.node_blend_number; previewable = false; @@ -486,9 +486,9 @@ function Node_Vector2(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c var str = $"[{v0}, {v1}]"; draw_text(bbox.xc, bbox.y1 - 4, str); } #endregion -} +} #endregion -function Node_Vector3(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { +function Node_Vector3(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { #region name = "Vector3"; color = COLORS.node_blend_number; previewable = false; @@ -542,9 +542,9 @@ function Node_Vector3(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c var ss = string_scale(str, bbox.w, bbox.h); draw_text_transformed(bbox.xc, bbox.yc, str, ss, ss, 0); } #endregion -} +} #endregion -function Node_Vector4(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { +function Node_Vector4(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { #region name = "Vector4"; color = COLORS.node_blend_number; previewable = false; @@ -602,9 +602,9 @@ function Node_Vector4(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c var ss = string_scale(str, bbox.w, bbox.h); draw_text_transformed(bbox.xc, bbox.yc, str, ss, ss, 0); } #endregion -} +} #endregion -function Node_Vector_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { +function Node_Vector_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { #region name = "Vector Split"; color = COLORS.node_blend_number; previewable = false; @@ -648,4 +648,4 @@ function Node_Vector_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro var ss = string_scale(str, bbox.w, bbox.h); draw_text_transformed(bbox.xc, bbox.yc, str, ss, ss, 0); } #endregion -} \ No newline at end of file +} #endregion \ No newline at end of file diff --git a/scripts/node_transform/node_transform.gml b/scripts/node_transform/node_transform.gml index 7e88acd60..d0708bfd3 100644 --- a/scripts/node_transform/node_transform.gml +++ b/scripts/node_transform/node_transform.gml @@ -19,9 +19,27 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); inputs[| 3] = nodeValue("Anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector, { side_button : button(function() { centerAnchor(); }) - .setIcon(THEME.anchor) - .setTooltip("Set to center") }); + .setDisplay(VALUE_DISPLAY.vector, { #region + side_button : new buttonAnchor(function(ind) { + //var _dim = getDimension(); + //var _pos = getSingleValue(2); + //var _anc = getSingleValue(3); + + switch(ind) { + case 0 : inputs[| 3].setValue([ 0.0, 0.0 ]); break; + case 1 : inputs[| 3].setValue([ 0.5, 0.0 ]); break; + case 2 : inputs[| 3].setValue([ 1.0, 0.0 ]); break; + + case 3 : inputs[| 3].setValue([ 0.0, 0.5 ]); break; + case 4 : inputs[| 3].setValue([ 0.5, 0.5 ]); break; + case 5 : inputs[| 3].setValue([ 1.0, 0.5 ]); break; + + case 6 : inputs[| 3].setValue([ 0.0, 1.0 ]); break; + case 7 : inputs[| 3].setValue([ 0.5, 1.0 ]); break; + case 8 : inputs[| 3].setValue([ 1.0, 1.0 ]); break; + } + }) + }); #endregion inputs[| 4] = nodeValue("Relative anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); @@ -60,7 +78,7 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) vel = 0; prev_pos = [ 0, 0 ]; - static getDimension = function(arr) { #region + static getDimension = function(arr = 0) { #region var _surf = getSingleValue(0, arr); var _out_type = getSingleValue(9, arr); var _out = getSingleValue(1, arr); @@ -124,6 +142,22 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) static step = function() { #region var pos = getInputData(2); + var anc = getInputData(3); + + var _b = inputs[| 3].editWidget.side_button; + var _a = anc[0] * 2 + anc[1] * 20; + switch(_a) { + case 0 : _b.index = 0; break; + case 1 : _b.index = 1; break; + case 2 : _b.index = 2; break; + case 10 : _b.index = 3; break; + case 11 : _b.index = 4; break; + case 12 : _b.index = 5; break; + case 20 : _b.index = 6; break; + case 21 : _b.index = 7; break; + case 22 : _b.index = 8; break; + default : _b.index = -1; + } if(!PROJECT.animator.frame_progress) return; @@ -301,7 +335,7 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) _surf_out = _surf_out[preview_index]; } - var __pos = getInputData(2) + var __pos = getInputData(2); var pos = [ __pos[0], __pos[1] ]; var _pos = [ __pos[0], __pos[1] ]; @@ -329,9 +363,13 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) #region bounding box var bx0 = _x + pos[0] * _s; - var bx1 = _x + (ww + pos[0]) * _s; var by0 = _y + pos[1] * _s; - var by1 = _y + (hh + pos[1]) * _s; + + var bx1 = _x + (pos[0] + ww) * _s; + var by1 = _y + (pos[1] + hh) * _s; + + var bx2 = _x + (pos[0] + ww) * _s + 18; + var by2 = _y + (pos[1] + hh) * _s + 18; var bax = _x + (pos[0] + anc[0]) * _s; var bay = _y + (pos[1] + anc[1]) * _s; @@ -340,32 +378,39 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) var tr = point_rotate(bx1, by0, bax, bay, rot); var bl = point_rotate(bx0, by1, bax, bay, rot); var br = point_rotate(bx1, by1, bax, bay, rot); + var sz = point_rotate(bx2, by2, bax, bay, rot); var rth = point_rotate((bx0 + bx1) / 2, by0 - 16, bax, bay, rot); - + + var a_index = 0; + var r_index = 0; + var tl_index = 0; + var tr_index = 0; + var bl_index = 0; + var br_index = 0; + var sz_index = 0; + draw_set_color(COLORS._main_accent); - draw_sprite_colored(THEME.anchor, 0, bax, bay); - - var r_index = 0; - - draw_sprite_colored(THEME.anchor_selector, 0, tl[0], tl[1]); - draw_sprite_colored(THEME.anchor_selector, 0, tr[0], tr[1]); - draw_sprite_colored(THEME.anchor_selector, 0, bl[0], bl[1]); - draw_sprite_colored(THEME.anchor_selector, 0, br[0], br[1]); - - if(point_in_circle(_mx, _my, bax, bay, 8)) draw_sprite_colored(THEME.anchor, 0, bax, bay, 1.25); - else if(point_in_circle(_mx, _my, rth[0], rth[1], 8)) r_index = 1; - else if(point_in_circle(_mx, _my, tl[0], tl[1], 8)) draw_sprite_colored(THEME.anchor_selector, 1, tl[0], tl[1]); - else if(point_in_circle(_mx, _my, tr[0], tr[1], 8)) draw_sprite_colored(THEME.anchor_selector, 1, tr[0], tr[1]); - else if(point_in_circle(_mx, _my, bl[0], bl[1], 8)) draw_sprite_colored(THEME.anchor_selector, 1, bl[0], bl[1]); - else if(point_in_circle(_mx, _my, br[0], br[1], 8)) draw_sprite_colored(THEME.anchor_selector, 1, br[0], br[1]); - - draw_sprite_colored(THEME.anchor_rotate, r_index, rth[0], rth[1], 1, rot); - draw_line(tl[0], tl[1], tr[0], tr[1]); draw_line(tl[0], tl[1], bl[0], bl[1]); draw_line(tr[0], tr[1], br[0], br[1]); draw_line(bl[0], bl[1], br[0], br[1]); + + if(point_in_circle(_mx, _my, bax, bay, 8)) a_index = 1; + else if(point_in_circle(_mx, _my, rth[0], rth[1], 8)) r_index = 1; + else if(point_in_circle(_mx, _my, tl[0], tl[1], 8)) tl_index = 1; + else if(point_in_circle(_mx, _my, tr[0], tr[1], 8)) tr_index = 1; + else if(point_in_circle(_mx, _my, bl[0], bl[1], 8)) bl_index = 1; + else if(point_in_circle(_mx, _my, br[0], br[1], 8)) br_index = 1; + else if(point_in_circle(_mx, _my, sz[0], sz[1], 8)) sz_index = 1; + + draw_sprite_colored(THEME.anchor, a_index, bax, bay); + draw_sprite_colored(THEME.anchor_selector, tl_index, tl[0], tl[1]); + draw_sprite_colored(THEME.anchor_selector, tr_index, tr[0], tr[1]); + draw_sprite_colored(THEME.anchor_selector, bl_index, bl[0], bl[1]); + draw_sprite_colored(THEME.anchor_selector, br_index, br[0], br[1]); + draw_sprite_colored(THEME.anchor_scale, sz_index, sz[0], sz[1], 1, rot); + draw_sprite_colored(THEME.anchor_rotate, r_index, rth[0], rth[1], 1, rot); #endregion if(overlay_dragging && overlay_dragging < 3) { //Transform @@ -416,10 +461,8 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) var da = angle_difference(overlay_drag_ma, aa); var sa; - if(key_mod_press(CTRL)) - sa = round((overlay_drag_sa - da) / 15) * 15; - else - sa = overlay_drag_sa - da; + if(key_mod_press(CTRL)) sa = round((overlay_drag_sa - da) / 15) * 15; + else sa = overlay_drag_sa - da; if(inputs[| 5].setValue(sa)) UNDO_HOLDING = true; @@ -429,10 +472,20 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) UNDO_HOLDING = false; } } else if(overlay_dragging == 4) { //Scale - var _p = point_rotate(_mx - overlay_drag_mx, _my - overlay_drag_my, 0, 0, -rot); + var ol_x = (overlay_drag_mx - _x) / _s; + var ol_y = (overlay_drag_my - _y) / _s; + var ml_x = (_mx - _x) / _s; + var ml_y = (_my - _y) / _s; - var _sw = _p[0] / _s / srw; - var _sh = _p[1] / _s / srh; + var os_x = value_snap(ol_x, _snx); + var os_y = value_snap(ol_y, _sny); + var ms_x = value_snap(ml_x, _snx); + var ms_y = value_snap(ml_y, _sny); + + var _p = point_rotate(ms_x - os_x, ms_y - os_y, 0, 0, -rot); + + var _sw = _p[0] / srw; + var _sh = _p[1] / srh; var sw, sh; if(corner_dragging == 0) { @@ -447,6 +500,9 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) } else if(corner_dragging == 3) { sw = _sw / (1 - _anc[0]); sh = _sh / (1 - _anc[1]); + } else if(corner_dragging == 4) { + sw = _sw / (1 - _anc[0]); + sh = _sh / (1 - _anc[1]); } var _sw = overlay_drag_sx + sw; @@ -475,13 +531,18 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) overlay_drag_sy = anc[1]; overlay_drag_px = pos[0]; overlay_drag_py = pos[1]; - } else if(point_in_circle(_mx, _my, tl[0], tl[1], 8) || point_in_circle(_mx, _my, tr[0], tr[1], 8) || point_in_circle(_mx, _my, bl[0], bl[1], 8) || point_in_circle(_mx, _my, br[0], br[1], 8)) { + } else if(point_in_circle(_mx, _my, tl[0], tl[1], 8) || + point_in_circle(_mx, _my, tr[0], tr[1], 8) || + point_in_circle(_mx, _my, bl[0], bl[1], 8) || + point_in_circle(_mx, _my, br[0], br[1], 8) || + point_in_circle(_mx, _my, sz[0], sz[1], 8)) { overlay_dragging = 4; if(point_in_circle(_mx, _my, tl[0], tl[1], 8)) corner_dragging = 0; else if(point_in_circle(_mx, _my, tr[0], tr[1], 8)) corner_dragging = 1; else if(point_in_circle(_mx, _my, bl[0], bl[1], 8)) corner_dragging = 2; else if(point_in_circle(_mx, _my, br[0], br[1], 8)) corner_dragging = 3; + else if(point_in_circle(_mx, _my, sz[0], sz[1], 8)) corner_dragging = 4; overlay_drag_mx = _mx; overlay_drag_my = _my; @@ -491,7 +552,8 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) overlay_dragging = 3; overlay_drag_ma = point_direction(bax, bay, _mx, _my); overlay_drag_sa = rot; - } else if(point_in_triangle(_mx, _my, tl[0], tl[1], tr[0], tr[1], bl[0], bl[1]) || point_in_triangle(_mx, _my, tr[0], tr[1], bl[0], bl[1], br[0], br[1])) { + } else if(point_in_triangle(_mx, _my, tl[0], tl[1], tr[0], tr[1], bl[0], bl[1]) || + point_in_triangle(_mx, _my, tr[0], tr[1], bl[0], bl[1], br[0], br[1])) { overlay_dragging = 1; overlay_drag_mx = _mx; overlay_drag_my = _my; diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index d6aee03f9..05489e65b 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -2457,8 +2457,6 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru struct_try_override(display_data, _map.display_data, DISPLAY_DATA_KEYS[i]); } - if(APPENDING) def_val = getValue(0); - if(connect_type == JUNCTION_CONNECT.input && index >= 0) { var _value = animator.getValue(0); node.inputs_data[index] = _value; diff --git a/scripts/paddingBox/paddingBox.yy b/scripts/paddingBox/paddingBox.yy index 773d9baa4..a60e38b12 100644 --- a/scripts/paddingBox/paddingBox.yy +++ b/scripts/paddingBox/paddingBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index 4154acef2..9d04306bd 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -1566,10 +1566,10 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { for(var i = 0; i < array_length(nodes_selecting); i++) SAVE_NODE(_node, nodes_selecting[i],,,, getCurrentContext()); _map.nodes = _node; - + APPENDING = true; CLONING = true; - var _app = __APPEND_MAP(_map); + var _app = __APPEND_MAP(_map); APPENDING = false; CLONING = false; diff --git a/scripts/pathArrayBox/pathArrayBox.yy b/scripts/pathArrayBox/pathArrayBox.yy index fd33f563f..bef324808 100644 --- a/scripts/pathArrayBox/pathArrayBox.yy +++ b/scripts/pathArrayBox/pathArrayBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/quarternionBox/quarternionBox.yy b/scripts/quarternionBox/quarternionBox.yy index f671c6cc3..908fd4c64 100644 --- a/scripts/quarternionBox/quarternionBox.yy +++ b/scripts/quarternionBox/quarternionBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/rangeBox/rangeBox.yy b/scripts/rangeBox/rangeBox.yy index c1e555197..9c5973c72 100644 --- a/scripts/rangeBox/rangeBox.yy +++ b/scripts/rangeBox/rangeBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/rotator/rotator.yy b/scripts/rotator/rotator.yy index 089d5025c..23156fa9e 100644 --- a/scripts/rotator/rotator.yy +++ b/scripts/rotator/rotator.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "rotator", + "path": "folders/widgets/rotator.yy", }, } \ No newline at end of file diff --git a/scripts/rotatorRandom/rotatorRandom.yy b/scripts/rotatorRandom/rotatorRandom.yy index 849787e9a..699ba5ed6 100644 --- a/scripts/rotatorRandom/rotatorRandom.yy +++ b/scripts/rotatorRandom/rotatorRandom.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "rotator", + "path": "folders/widgets/rotator.yy", }, } \ No newline at end of file diff --git a/scripts/rotatorRange/rotatorRange.yy b/scripts/rotatorRange/rotatorRange.yy index 99fa0f436..a27863f3b 100644 --- a/scripts/rotatorRange/rotatorRange.yy +++ b/scripts/rotatorRange/rotatorRange.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "rotator", + "path": "folders/widgets/rotator.yy", }, } \ No newline at end of file diff --git a/scripts/textArea/textArea.yy b/scripts/textArea/textArea.yy index 3afbc72ec..2328991cb 100644 --- a/scripts/textArea/textArea.yy +++ b/scripts/textArea/textArea.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/textArrayBox/textArrayBox.yy b/scripts/textArrayBox/textArrayBox.yy index 76878fc43..895771f42 100644 --- a/scripts/textArrayBox/textArrayBox.yy +++ b/scripts/textArrayBox/textArrayBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/textBox/textBox.gml b/scripts/textBox/textBox.gml index 8a074fc4b..b6b6adb32 100644 --- a/scripts/textBox/textBox.gml +++ b/scripts/textBox/textBox.gml @@ -106,11 +106,8 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor { var _input_text_current = _input_text; disp_x_to = 0; - switch(input) { - case TEXTBOX_INPUT.number : - _input_text_current = evaluateFunction(_input_text); - break; - } + if(input == TEXTBOX_INPUT.number) + _input_text_current = evaluateFunction(_input_text); if(no_empty && _input_text_current == "") _input_text_current = _last_text; diff --git a/scripts/textBox/textBox.yy b/scripts/textBox/textBox.yy index be1e7b24b..a693efff0 100644 --- a/scripts/textBox/textBox.yy +++ b/scripts/textBox/textBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/textInput/textInput.yy b/scripts/textInput/textInput.yy index ad5206d65..1088bc257 100644 --- a/scripts/textInput/textInput.yy +++ b/scripts/textInput/textInput.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/transformBox/transformBox.yy b/scripts/transformBox/transformBox.yy index e4baef90e..23d95346b 100644 --- a/scripts/transformBox/transformBox.yy +++ b/scripts/transformBox/transformBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/vectorBox/vectorBox.yy b/scripts/vectorBox/vectorBox.yy index a6822ecc5..63d6a08c9 100644 --- a/scripts/vectorBox/vectorBox.yy +++ b/scripts/vectorBox/vectorBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file diff --git a/scripts/vectorRangeBox/vectorRangeBox.yy b/scripts/vectorRangeBox/vectorRangeBox.yy index b428e5a60..ad82b662c 100644 --- a/scripts/vectorRangeBox/vectorRangeBox.yy +++ b/scripts/vectorRangeBox/vectorRangeBox.yy @@ -5,7 +5,7 @@ "isCompatibility": false, "isDnD": false, "parent": { - "name": "widgets", - "path": "folders/widgets.yy", + "name": "text", + "path": "folders/widgets/text.yy", }, } \ No newline at end of file