diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 0881f77c0..cc935da37 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -1,6 +1,6 @@ { "FolderOrderSettings":[ - {"name":"__extensions","order":339,"path":"folders/__extensions.yy",}, + {"name":"__extensions","order":12,"path":"folders/__extensions.yy",}, {"name":"FireBase","order":2,"path":"folders/__extensions/FireBase.yy",}, {"name":"Extensions","order":2,"path":"folders/__extensions/FireBase/Extensions.yy",}, {"name":"Listeners_Firestore","order":1,"path":"folders/__extensions/FireBase/Extensions/Firebase_API/Listeners_Firestore.yy",}, @@ -15,9 +15,8 @@ {"name":"Steamworks","order":8,"path":"folders/__extensions/Steamworks.yy",}, {"name":"VCT","order":1,"path":"folders/__extensions/VCT.yy",}, {"name":"WinMan","order":6,"path":"folders/__extensions/WinMan.yy",}, - {"name":"addons","order":337,"path":"folders/addons.yy",}, - {"name":"dialog","order":332,"path":"folders/dialog.yy",}, - {"name":"functions","order":329,"path":"folders/functions.yy",}, + {"name":"dialog","order":4,"path":"folders/dialog.yy",}, + {"name":"functions","order":1,"path":"folders/functions.yy",}, {"name":"camera","order":7,"path":"folders/functions/3d/camera.yy",}, {"name":"gizmo","order":8,"path":"folders/functions/3d/gizmo.yy",}, {"name":"light","order":9,"path":"folders/functions/3d/light.yy",}, @@ -62,13 +61,13 @@ {"name":"variables","order":36,"path":"folders/functions/variables.yy",}, {"name":"vector","order":37,"path":"folders/functions/vector.yy",}, {"name":"window","order":39,"path":"folders/functions/window.yy",}, - {"name":"game engines","order":335,"path":"folders/game engines.yy",}, - {"name":"main","order":328,"path":"folders/main.yy",}, + {"name":"game engines","order":7,"path":"folders/game engines.yy",}, {"name":"components","order":3,"path":"folders/main/components.yy",}, - {"name":"misc","order":338,"path":"folders/misc.yy",}, - {"name":"animation_curve","order":1,"path":"folders/misc/animation_curve.yy",}, - {"name":"debugging","order":2,"path":"folders/misc/debugging.yy",}, - {"name":"nodes","order":330,"path":"folders/nodes.yy",}, + {"name":"misc","order":10,"path":"folders/misc.yy",}, + {"name":"animation_curve","order":2,"path":"folders/misc/animation_curve.yy",}, + {"name":"debugging","order":3,"path":"folders/misc/debugging.yy",}, + {"name":"fx","order":1,"path":"folders/misc/fx.yy",}, + {"name":"nodes","order":2,"path":"folders/nodes.yy",}, {"name":"data","order":1,"path":"folders/nodes/data.yy",}, {"name":"2d_effects","order":2,"path":"folders/nodes/data/3D/2d_effects.yy",}, {"name":"d3d_camera","order":3,"path":"folders/nodes/data/3D/d3d_camera.yy",}, @@ -94,8 +93,8 @@ {"name":"filter","order":4,"path":"folders/nodes/data/filter.yy",}, {"name":"blur zoom","order":23,"path":"folders/nodes/data/filter/blur/blur zoom.yy",}, {"name":"colors","order":1,"path":"folders/nodes/data/filter/colors.yy",}, - {"name":"normalize","order":37,"path":"folders/nodes/data/filter/colors/normalize.yy",}, - {"name":"threshold","order":23,"path":"folders/nodes/data/filter/colors/threshold.yy",}, + {"name":"normalize","order":39,"path":"folders/nodes/data/filter/colors/normalize.yy",}, + {"name":"threshold","order":25,"path":"folders/nodes/data/filter/colors/threshold.yy",}, {"name":"combine","order":2,"path":"folders/nodes/data/filter/combine.yy",}, {"name":"conversion","order":3,"path":"folders/nodes/data/filter/conversion.yy",}, {"name":"hsv channel","order":5,"path":"folders/nodes/data/filter/conversion/hsv channel.yy",}, @@ -232,7 +231,7 @@ {"name":"3d","order":1,"path":"folders/nodes/values/types/3d.yy",}, {"name":"colors","order":2,"path":"folders/nodes/values/types/colors.yy",}, {"name":"object","order":3,"path":"folders/nodes/values/types/object.yy",}, - {"name":"panels","order":333,"path":"folders/panels.yy",}, + {"name":"panels","order":5,"path":"folders/panels.yy",}, {"name":"debug","order":2,"path":"folders/panels/_others/debug.yy",}, {"name":"what?","order":1,"path":"folders/panels/_others/what?.yy",}, {"name":"animation","order":1,"path":"folders/panels/animation.yy",}, @@ -244,7 +243,7 @@ {"name":"nodes","order":7,"path":"folders/panels/nodes.yy",}, {"name":"preview","order":8,"path":"folders/panels/preview.yy",}, {"name":"sprites","order":1,"path":"folders/panels/preview/sprites.yy",}, - {"name":"shader","order":331,"path":"folders/shader.yy",}, + {"name":"shader","order":3,"path":"folders/shader.yy",}, {"name":"draw","order":6,"path":"folders/shader/draw.yy",}, {"name":"filter","order":7,"path":"folders/shader/filter.yy",}, {"name":"mask","order":10,"path":"folders/shader/mask.yy",}, @@ -255,16 +254,16 @@ {"name":"histogram","order":3,"path":"folders/shader/UI/histogram.yy",}, {"name":"node","order":5,"path":"folders/shader/UI/node.yy",}, {"name":"palette mixer","order":2,"path":"folders/shader/UI/palette mixer.yy",}, - {"name":"sprites","order":336,"path":"folders/sprites.yy",}, + {"name":"sprites","order":8,"path":"folders/sprites.yy",}, {"name":"bs","order":3,"path":"folders/sprites/bs.yy",}, - {"name":"font","order":1,"path":"folders/sprites/font.yy",}, + {"name":"font","order":9,"path":"folders/font.yy",}, {"name":"gameframe","order":4,"path":"folders/sprites/gameframe.yy",}, {"name":"meta","order":2,"path":"folders/sprites/meta.yy",}, {"name":"misc","order":5,"path":"folders/sprites/misc.yy",}, {"name":"nodes","order":6,"path":"folders/sprites/nodes.yy",}, {"name":"profiler","order":8,"path":"folders/sprites/profiler.yy",}, {"name":"texture","order":7,"path":"folders/sprites/texture.yy",}, - {"name":"widgets","order":334,"path":"folders/widgets.yy",}, + {"name":"widgets","order":6,"path":"folders/widgets.yy",}, {"name":"object","order":4,"path":"folders/widgets/object.yy",}, {"name":"rotator","order":1,"path":"folders/widgets/rotator.yy",}, {"name":"sliders","order":2,"path":"folders/widgets/sliders.yy",}, @@ -716,9 +715,9 @@ {"name":"node_9slice","order":10,"path":"scripts/node_9slice/node_9slice.yy",}, {"name":"node_action_object","order":1,"path":"scripts/node_action_object/node_action_object.yy",}, {"name":"node_active_canvas","order":4,"path":"scripts/node_active_canvas/node_active_canvas.yy",}, - {"name":"node_alpha_cutoff","order":24,"path":"scripts/node_alpha_cutoff/node_alpha_cutoff.yy",}, + {"name":"node_alpha_cutoff","order":26,"path":"scripts/node_alpha_cutoff/node_alpha_cutoff.yy",}, {"name":"node_alpha_grey","order":6,"path":"scripts/node_alpha_grey/node_alpha_grey.yy",}, - {"name":"node_alpha_hash","order":26,"path":"scripts/node_alpha_hash/node_alpha_hash.yy",}, + {"name":"node_alpha_hash","order":28,"path":"scripts/node_alpha_hash/node_alpha_hash.yy",}, {"name":"node_ambient_occlusion","order":5,"path":"scripts/node_ambient_occlusion/node_ambient_occlusion.yy",}, {"name":"node_anim_curve","order":1,"path":"scripts/node_anim_curve/node_anim_curve.yy",}, {"name":"node_anim_loop","order":6,"path":"scripts/node_anim_loop/node_anim_loop.yy",}, @@ -802,19 +801,19 @@ {"name":"node_chromatic_aberration","order":6,"path":"scripts/node_chromatic_aberration/node_chromatic_aberration.yy",}, {"name":"node_collection_inline","order":1,"path":"scripts/node_collection_inline/node_collection_inline.yy",}, {"name":"node_collection_managed","order":2,"path":"scripts/node_collection_managed/node_collection_managed.yy",}, - {"name":"node_color_adjust","order":4,"path":"scripts/node_color_adjust/node_color_adjust.yy",}, + {"name":"node_color_adjust","order":6,"path":"scripts/node_color_adjust/node_color_adjust.yy",}, {"name":"node_color_data","order":6,"path":"scripts/node_color_data/node_color_data.yy",}, {"name":"node_color_hsv","order":2,"path":"scripts/node_color_hsv/node_color_hsv.yy",}, {"name":"node_color_mix","order":7,"path":"scripts/node_color_mix/node_color_mix.yy",}, {"name":"node_color_oklch","order":3,"path":"scripts/node_color_oklch/node_color_oklch.yy",}, - {"name":"node_color_remove","order":6,"path":"scripts/node_color_remove/node_color_remove.yy",}, - {"name":"node_color_replace","order":8,"path":"scripts/node_color_replace/node_color_replace.yy",}, + {"name":"node_color_remove","order":8,"path":"scripts/node_color_remove/node_color_remove.yy",}, + {"name":"node_color_replace","order":10,"path":"scripts/node_color_replace/node_color_replace.yy",}, {"name":"node_color_rgb","order":1,"path":"scripts/node_color_rgb/node_color_rgb.yy",}, {"name":"node_color_to_hsv","order":9,"path":"scripts/node_color_to_hsv/node_color_to_hsv.yy",}, {"name":"node_color_to_oklch","order":10,"path":"scripts/node_color_to_oklch/node_color_to_oklch.yy",}, {"name":"node_color_to_rgb","order":8,"path":"scripts/node_color_to_rgb/node_color_to_rgb.yy",}, - {"name":"node_colorize","order":12,"path":"scripts/node_colorize/node_colorize.yy",}, - {"name":"node_colors_replace","order":10,"path":"scripts/node_colors_replace/node_colors_replace.yy",}, + {"name":"node_colorize","order":14,"path":"scripts/node_colorize/node_colorize.yy",}, + {"name":"node_colors_replace","order":12,"path":"scripts/node_colors_replace/node_colors_replace.yy",}, {"name":"node_combine_hsv","order":2,"path":"scripts/node_combine_hsv/node_combine_hsv.yy",}, {"name":"node_compare","order":16,"path":"scripts/node_compare/node_compare.yy",}, {"name":"node_composite_tag","order":9,"path":"scripts/node_composite_tag/node_composite_tag.yy",}, @@ -829,7 +828,7 @@ {"name":"node_cross_section","order":16,"path":"scripts/node_cross_section/node_cross_section.yy",}, {"name":"node_csv_file_read","order":6,"path":"scripts/node_csv_file_read/node_csv_file_read.yy",}, {"name":"node_csv_file_write","order":10,"path":"scripts/node_csv_file_write/node_csv_file_write.yy",}, - {"name":"node_curve_hsv","order":38,"path":"scripts/node_curve_hsv/node_curve_hsv.yy",}, + {"name":"node_curve_hsv","order":4,"path":"scripts/node_curve_hsv/node_curve_hsv.yy",}, {"name":"node_curve","order":2,"path":"scripts/node_curve/node_curve.yy",}, {"name":"node_custom_shader","order":1,"path":"scripts/node_custom_shader/node_custom_shader.yy",}, {"name":"node_data","order":7,"path":"scripts/node_data/node_data.yy",}, @@ -889,7 +888,7 @@ {"name":"node_functions","order":8,"path":"scripts/node_functions/node_functions.yy",}, {"name":"node_FXAA","order":25,"path":"scripts/node_FXAA/node_FXAA.yy",}, {"name":"node_gabor_noise","order":26,"path":"scripts/node_gabor_noise/node_gabor_noise.yy",}, - {"name":"node_gamma_map","order":32,"path":"scripts/node_gamma_map/node_gamma_map.yy",}, + {"name":"node_gamma_map","order":34,"path":"scripts/node_gamma_map/node_gamma_map.yy",}, {"name":"node_global","order":9,"path":"scripts/node_global/node_global.yy",}, {"name":"node_glow","order":24,"path":"scripts/node_glow/node_glow.yy",}, {"name":"node_gm_room","order":4,"path":"scripts/node_gm_room/node_gm_room.yy",}, @@ -902,7 +901,7 @@ {"name":"node_grain","order":40,"path":"scripts/node_grain/node_grain.yy",}, {"name":"node_graph_preview","order":24,"path":"scripts/node_graph_preview/node_graph_preview.yy",}, {"name":"node_grey_alpha","order":8,"path":"scripts/node_grey_alpha/node_grey_alpha.yy",}, - {"name":"node_greyscale","order":14,"path":"scripts/node_greyscale/node_greyscale.yy",}, + {"name":"node_greyscale","order":16,"path":"scripts/node_greyscale/node_greyscale.yy",}, {"name":"node_grid_hex","order":4,"path":"scripts/node_grid_hex/node_grid_hex.yy",}, {"name":"node_grid_noise","order":8,"path":"scripts/node_grid_noise/node_grid_noise.yy",}, {"name":"node_grid_pentagonal","order":20,"path":"scripts/node_grid_pentagonal/node_grid_pentagonal.yy",}, @@ -927,7 +926,7 @@ {"name":"node_image_sheet","order":4,"path":"scripts/node_image_sheet/node_image_sheet.yy",}, {"name":"node_interlaced","order":53,"path":"scripts/node_interlaced/node_interlaced.yy",}, {"name":"node_interpret_number","order":8,"path":"scripts/node_interpret_number/node_interpret_number.yy",}, - {"name":"node_invert","order":16,"path":"scripts/node_invert/node_invert.yy",}, + {"name":"node_invert","order":18,"path":"scripts/node_invert/node_invert.yy",}, {"name":"node_isosurf","order":3,"path":"scripts/node_isosurf/node_isosurf.yy",}, {"name":"node_iterate_inline","order":3,"path":"scripts/node_iterate_inline/node_iterate_inline.yy",}, {"name":"node_iterator_each_inline_input","order":1,"path":"scripts/node_iterator_each_inline_input/node_iterator_each_inline_input.yy",}, @@ -954,8 +953,8 @@ {"name":"node_keyframe","order":10,"path":"scripts/node_keyframe/node_keyframe.yy",}, {"name":"node_kuwahara","order":45,"path":"scripts/node_kuwahara/node_kuwahara.yy",}, {"name":"node_lerp","order":3,"path":"scripts/node_lerp/node_lerp.yy",}, - {"name":"node_level_selector","order":20,"path":"scripts/node_level_selector/node_level_selector.yy",}, - {"name":"node_level","order":18,"path":"scripts/node_level/node_level.yy",}, + {"name":"node_level_selector","order":22,"path":"scripts/node_level_selector/node_level_selector.yy",}, + {"name":"node_level","order":20,"path":"scripts/node_level/node_level.yy",}, {"name":"node_line","order":7,"path":"scripts/node_line/node_line.yy",}, {"name":"node_liquefy","order":19,"path":"scripts/node_liquefy/node_liquefy.yy",}, {"name":"node_local_analyze","order":35,"path":"scripts/node_local_analyze/node_local_analyze.yy",}, @@ -1009,7 +1008,7 @@ {"name":"node_noise_tri","order":12,"path":"scripts/node_noise_tri/node_noise_tri.yy",}, {"name":"node_normal_light","order":2,"path":"scripts/node_normal_light/node_normal_light.yy",}, {"name":"node_normal","order":1,"path":"scripts/node_normal/node_normal.yy",}, - {"name":"node_normalize","order":36,"path":"scripts/node_normalize/node_normalize.yy",}, + {"name":"node_normalize","order":38,"path":"scripts/node_normalize/node_normalize.yy",}, {"name":"node_note","order":19,"path":"scripts/node_note/node_note.yy",}, {"name":"node_number","order":1,"path":"scripts/node_number/node_number.yy",}, {"name":"node_offset","order":27,"path":"scripts/node_offset/node_offset.yy",}, @@ -1019,7 +1018,7 @@ {"name":"node_pack_sprites","order":4,"path":"scripts/node_pack_sprites/node_pack_sprites.yy",}, {"name":"node_padding","order":13,"path":"scripts/node_padding/node_padding.yy",}, {"name":"node_palette_extract","order":18,"path":"scripts/node_palette_extract/node_palette_extract.yy",}, - {"name":"node_palette_shift","order":30,"path":"scripts/node_palette_shift/node_palette_shift.yy",}, + {"name":"node_palette_shift","order":32,"path":"scripts/node_palette_shift/node_palette_shift.yy",}, {"name":"node_palette_shrink","order":3,"path":"scripts/node_palette_shrink/node_palette_shrink.yy",}, {"name":"node_palette_sort","order":2,"path":"scripts/node_palette_sort/node_palette_sort.yy",}, {"name":"node_palette","order":1,"path":"scripts/node_palette/node_palette.yy",}, @@ -1099,7 +1098,7 @@ {"name":"node_pixel_extract","order":19,"path":"scripts/node_pixel_extract/node_pixel_extract.yy",}, {"name":"node_pixel_math","order":55,"path":"scripts/node_pixel_math/node_pixel_math.yy",}, {"name":"node_pixel_sampler","order":18,"path":"scripts/node_pixel_sampler/node_pixel_sampler.yy",}, - {"name":"node_pixel_sort","order":28,"path":"scripts/node_pixel_sort/node_pixel_sort.yy",}, + {"name":"node_pixel_sort","order":30,"path":"scripts/node_pixel_sort/node_pixel_sort.yy",}, {"name":"node_plot_linear","order":8,"path":"scripts/node_plot_linear/node_plot_linear.yy",}, {"name":"node_point_in_area","order":1,"path":"scripts/node_point_in_area/node_point_in_area.yy",}, {"name":"node_polar","order":8,"path":"scripts/node_polar/node_polar.yy",}, @@ -1218,7 +1217,7 @@ {"name":"node_text_file_write","order":8,"path":"scripts/node_text_file_write/node_text_file_write.yy",}, {"name":"node_text","order":14,"path":"scripts/node_text/node_text.yy",}, {"name":"node_texture_remap","order":4,"path":"scripts/node_texture_remap/node_texture_remap.yy",}, - {"name":"node_threshold","order":22,"path":"scripts/node_threshold/node_threshold.yy",}, + {"name":"node_threshold","order":24,"path":"scripts/node_threshold/node_threshold.yy",}, {"name":"node_tile_random","order":25,"path":"scripts/node_tile_random/node_tile_random.yy",}, {"name":"node_tile","order":6,"path":"scripts/node_tile/node_tile.yy",}, {"name":"node_tiler_convert","order":8,"path":"scripts/node_tiler_convert/node_tiler_convert.yy",}, @@ -1231,7 +1230,7 @@ {"name":"node_timeline_preview","order":1,"path":"scripts/node_timeline_preview/node_timeline_preview.yy",}, {"name":"node_to_number","order":14,"path":"scripts/node_to_number/node_to_number.yy",}, {"name":"node_to_text","order":17,"path":"scripts/node_to_text/node_to_text.yy",}, - {"name":"node_tonemap_ace","order":34,"path":"scripts/node_tonemap_ace/node_tonemap_ace.yy",}, + {"name":"node_tonemap_ace","order":36,"path":"scripts/node_tonemap_ace/node_tonemap_ace.yy",}, {"name":"node_tool","order":12,"path":"scripts/node_tool/node_tool.yy",}, {"name":"node_trail","order":33,"path":"scripts/node_trail/node_trail.yy",}, {"name":"node_transform_array","order":16,"path":"scripts/node_transform_array/node_transform_array.yy",}, @@ -1496,11 +1495,11 @@ {"name":"sh_3d_extrude_corner","order":7,"path":"shaders/sh_3d_extrude_corner/sh_3d_extrude_corner.yy",}, {"name":"sh_3d_extrude_filler_depth","order":9,"path":"shaders/sh_3d_extrude_filler_depth/sh_3d_extrude_filler_depth.yy",}, {"name":"sh_3d_extrude_filler","order":8,"path":"shaders/sh_3d_extrude_filler/sh_3d_extrude_filler.yy",}, - {"name":"sh_ace","order":35,"path":"shaders/sh_ace/sh_ace.yy",}, + {"name":"sh_ace","order":37,"path":"shaders/sh_ace/sh_ace.yy",}, {"name":"sh_active_canvas_ink","order":5,"path":"shaders/sh_active_canvas_ink/sh_active_canvas_ink.yy",}, - {"name":"sh_alpha_cutoff","order":25,"path":"shaders/sh_alpha_cutoff/sh_alpha_cutoff.yy",}, + {"name":"sh_alpha_cutoff","order":27,"path":"shaders/sh_alpha_cutoff/sh_alpha_cutoff.yy",}, {"name":"sh_alpha_grey","order":7,"path":"shaders/sh_alpha_grey/sh_alpha_grey.yy",}, - {"name":"sh_alpha_hash","order":27,"path":"shaders/sh_alpha_hash/sh_alpha_hash.yy",}, + {"name":"sh_alpha_hash","order":29,"path":"shaders/sh_alpha_hash/sh_alpha_hash.yy",}, {"name":"sh_ani_noise","order":3,"path":"shaders/sh_ani_noise/sh_ani_noise.yy",}, {"name":"sh_atlas_scan","order":1,"path":"shaders/sh_atlas_scan/sh_atlas_scan.yy",}, {"name":"sh_average","order":1,"path":"shaders/sh_average/sh_average.yy",}, @@ -1586,15 +1585,15 @@ {"name":"sh_checkerboard","order":1,"path":"shaders/sh_checkerboard/sh_checkerboard.yy",}, {"name":"sh_chromatic_aberration","order":7,"path":"shaders/sh_chromatic_aberration/sh_chromatic_aberration.yy",}, {"name":"sh_clean_shape","order":1,"path":"shaders/sh_clean_shape/sh_clean_shape.yy",}, - {"name":"sh_color_adjust","order":5,"path":"shaders/sh_color_adjust/sh_color_adjust.yy",}, + {"name":"sh_color_adjust","order":7,"path":"shaders/sh_color_adjust/sh_color_adjust.yy",}, {"name":"sh_color_picker_side_hue","order":1,"path":"shaders/sh_color_picker_side_hue/sh_color_picker_side_hue.yy",}, {"name":"sh_color_picker_side_value","order":2,"path":"shaders/sh_color_picker_side_value/sh_color_picker_side_value.yy",}, {"name":"sh_color_picker_value","order":3,"path":"shaders/sh_color_picker_value/sh_color_picker_value.yy",}, - {"name":"sh_color_remove","order":7,"path":"shaders/sh_color_remove/sh_color_remove.yy",}, + {"name":"sh_color_remove","order":9,"path":"shaders/sh_color_remove/sh_color_remove.yy",}, {"name":"sh_color_replace","order":10,"path":"shaders/sh_color_replace/sh_color_replace.yy",}, {"name":"sh_color_select_side","order":1,"path":"shaders/sh_color_select_side/sh_color_select_side.yy",}, - {"name":"sh_colorize","order":13,"path":"shaders/sh_colorize/sh_colorize.yy",}, - {"name":"sh_colours_replace","order":11,"path":"shaders/sh_colours_replace/sh_colours_replace.yy",}, + {"name":"sh_colorize","order":15,"path":"shaders/sh_colorize/sh_colorize.yy",}, + {"name":"sh_colours_replace","order":13,"path":"shaders/sh_colours_replace/sh_colours_replace.yy",}, {"name":"sh_combine_hsv","order":3,"path":"shaders/sh_combine_hsv/sh_combine_hsv.yy",}, {"name":"sh_combine_rgb","order":1,"path":"shaders/sh_combine_rgb/sh_combine_rgb.yy",}, {"name":"sh_content_sampler","order":17,"path":"shaders/sh_content_sampler/sh_content_sampler.yy",}, @@ -1603,7 +1602,7 @@ {"name":"sh_corner_erode","order":1,"path":"shaders/sh_corner_erode/sh_corner_erode.yy",}, {"name":"sh_corner_iterate","order":2,"path":"shaders/sh_corner_iterate/sh_corner_iterate.yy",}, {"name":"sh_cross_section","order":17,"path":"shaders/sh_cross_section/sh_cross_section.yy",}, - {"name":"sh_curve_hsv","order":39,"path":"shaders/sh_curve_hsv/sh_curve_hsv.yy",}, + {"name":"sh_curve_hsv","order":5,"path":"shaders/sh_curve_hsv/sh_curve_hsv.yy",}, {"name":"sh_curve","order":3,"path":"shaders/sh_curve/sh_curve.yy",}, {"name":"sh_d3d_3d_transform","order":17,"path":"shaders/sh_d3d_3d_transform/sh_d3d_3d_transform.yy",}, {"name":"sh_d3d_background","order":13,"path":"shaders/sh_d3d_background/sh_d3d_background.yy",}, @@ -1674,7 +1673,7 @@ {"name":"sh_freeform_fill_pass1","order":7,"path":"shaders/sh_freeform_fill_pass1/sh_freeform_fill_pass1.yy",}, {"name":"sh_freeform_fill_pass2","order":8,"path":"shaders/sh_freeform_fill_pass2/sh_freeform_fill_pass2.yy",}, {"name":"sh_FXAA","order":26,"path":"shaders/sh_FXAA/sh_FXAA.yy",}, - {"name":"sh_gamma_map","order":33,"path":"shaders/sh_gamma_map/sh_gamma_map.yy",}, + {"name":"sh_gamma_map","order":35,"path":"shaders/sh_gamma_map/sh_gamma_map.yy",}, {"name":"sh_get_max_downsampled","order":2,"path":"shaders/sh_get_max_downsampled/sh_get_max_downsampled.yy",}, {"name":"sh_get_min_downsampled","order":3,"path":"shaders/sh_get_min_downsampled/sh_get_min_downsampled.yy",}, {"name":"sh_glow","order":25,"path":"shaders/sh_glow/sh_glow.yy",}, @@ -1683,7 +1682,7 @@ {"name":"sh_gradient","order":1,"path":"shaders/sh_gradient/sh_gradient.yy",}, {"name":"sh_grain","order":41,"path":"shaders/sh_grain/sh_grain.yy",}, {"name":"sh_grey_alpha","order":9,"path":"shaders/sh_grey_alpha/sh_grey_alpha.yy",}, - {"name":"sh_greyscale","order":15,"path":"shaders/sh_greyscale/sh_greyscale.yy",}, + {"name":"sh_greyscale","order":17,"path":"shaders/sh_greyscale/sh_greyscale.yy",}, {"name":"sh_grid_hex","order":5,"path":"shaders/sh_grid_hex/sh_grid_hex.yy",}, {"name":"sh_grid_noise","order":9,"path":"shaders/sh_grid_noise/sh_grid_noise.yy",}, {"name":"sh_grid_pentagonal","order":21,"path":"shaders/sh_grid_pentagonal/sh_grid_pentagonal.yy",}, @@ -1694,7 +1693,7 @@ {"name":"sh_image_trace","order":20,"path":"shaders/sh_image_trace/sh_image_trace.yy",}, {"name":"sh_interlaced","order":54,"path":"shaders/sh_interlaced/sh_interlaced.yy",}, {"name":"sh_interpret_number","order":9,"path":"shaders/sh_interpret_number/sh_interpret_number.yy",}, - {"name":"sh_invert","order":17,"path":"shaders/sh_invert/sh_invert.yy",}, + {"name":"sh_invert","order":19,"path":"shaders/sh_invert/sh_invert.yy",}, {"name":"sh_jpeg_recons","order":1,"path":"shaders/sh_jpeg_recons/sh_jpeg_recons.yy",}, {"name":"sh_julia_set","order":25,"path":"shaders/sh_julia_set/sh_julia_set.yy",}, {"name":"sh_kuwahara_ani_pass1","order":1,"path":"shaders/sh_kuwahara_ani_pass1/sh_kuwahara_ani_pass1.yy",}, @@ -1702,8 +1701,8 @@ {"name":"sh_kuwahara_ani_pass3","order":3,"path":"shaders/sh_kuwahara_ani_pass3/sh_kuwahara_ani_pass3.yy",}, {"name":"sh_kuwahara_ani_pass4","order":4,"path":"shaders/sh_kuwahara_ani_pass4/sh_kuwahara_ani_pass4.yy",}, {"name":"sh_kuwahara_gen","order":5,"path":"shaders/sh_kuwahara_gen/sh_kuwahara_gen.yy",}, - {"name":"sh_level_selector","order":21,"path":"shaders/sh_level_selector/sh_level_selector.yy",}, - {"name":"sh_level","order":19,"path":"shaders/sh_level/sh_level.yy",}, + {"name":"sh_level_selector","order":23,"path":"shaders/sh_level_selector/sh_level_selector.yy",}, + {"name":"sh_level","order":21,"path":"shaders/sh_level/sh_level.yy",}, {"name":"sh_liquefy_bloat","order":3,"path":"shaders/sh_liquefy_bloat/sh_liquefy_bloat.yy",}, {"name":"sh_liquefy_pinch","order":2,"path":"shaders/sh_liquefy_pinch/sh_liquefy_pinch.yy",}, {"name":"sh_liquefy_twirl","order":1,"path":"shaders/sh_liquefy_twirl/sh_liquefy_twirl.yy",}, @@ -1765,8 +1764,8 @@ {"name":"sh_palette_mixer_atlas_expand_apply","order":2,"path":"shaders/sh_palette_mixer_atlas_expand_apply/sh_palette_mixer_atlas_expand_apply.yy",}, {"name":"sh_palette_mixer_atlas_expand_iterate","order":1,"path":"shaders/sh_palette_mixer_atlas_expand_iterate/sh_palette_mixer_atlas_expand_iterate.yy",}, {"name":"sh_palette_mixer_atlas_expand_palette","order":3,"path":"shaders/sh_palette_mixer_atlas_expand_palette/sh_palette_mixer_atlas_expand_palette.yy",}, - {"name":"sh_palette_replace","order":9,"path":"shaders/sh_palette_replace/sh_palette_replace.yy",}, - {"name":"sh_palette_shift","order":31,"path":"shaders/sh_palette_shift/sh_palette_shift.yy",}, + {"name":"sh_palette_replace","order":11,"path":"shaders/sh_palette_replace/sh_palette_replace.yy",}, + {"name":"sh_palette_shift","order":33,"path":"shaders/sh_palette_shift/sh_palette_shift.yy",}, {"name":"sh_path_fill_profile","order":16,"path":"shaders/sh_path_fill_profile/sh_path_fill_profile.yy",}, {"name":"sh_path_morph","order":25,"path":"shaders/sh_path_morph/sh_path_morph.yy",}, {"name":"sh_path_sdf","order":30,"path":"shaders/sh_path_sdf/sh_path_sdf.yy",}, @@ -1786,7 +1785,7 @@ {"name":"sh_pixel_cloud","order":44,"path":"shaders/sh_pixel_cloud/sh_pixel_cloud.yy",}, {"name":"sh_pixel_math","order":56,"path":"shaders/sh_pixel_math/sh_pixel_math.yy",}, {"name":"sh_pixel_sample","order":19,"path":"shaders/sh_pixel_sample/sh_pixel_sample.yy",}, - {"name":"sh_pixel_sort","order":29,"path":"shaders/sh_pixel_sort/sh_pixel_sort.yy",}, + {"name":"sh_pixel_sort","order":31,"path":"shaders/sh_pixel_sort/sh_pixel_sort.yy",}, {"name":"sh_polar","order":9,"path":"shaders/sh_polar/sh_polar.yy",}, {"name":"sh_posterize_palette","order":1,"path":"shaders/sh_posterize_palette/sh_posterize_palette.yy",}, {"name":"sh_preview_histogram_outline","order":1,"path":"shaders/sh_preview_histogram_outline/sh_preview_histogram_outline.yy",}, @@ -2521,6 +2520,7 @@ {"name":"s_run","order":2,"path":"sprites/s_run/s_run.yy",}, {"name":"s_shape_curve","order":35,"path":"sprites/s_shape_curve/s_shape_curve.yy",}, {"name":"s_texture_default","order":1,"path":"sprites/s_texture_default/s_texture_default.yy",}, + {"name":"s_title","order":5,"path":"sprites/s_title/s_title.yy",}, {"name":"s_transparent","order":5,"path":"sprites/s_transparent/s_transparent.yy",}, {"name":"s_ui_base_white","order":6,"path":"sprites/s_ui_base_white/s_ui_base_white.yy",}, {"name":"s_workshop_badge_version","order":3,"path":"sprites/s_workshop_badge_version/s_workshop_badge_version.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index 90bcf55f7..da8608a92 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -43,9 +43,9 @@ {"$GMFolder":"","%Name":"biterator","folderPath":"folders/__extensions/VCT/biterator.yy","name":"biterator","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"widget","folderPath":"folders/__extensions/VCT/widget.yy","name":"widget","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"WinMan","folderPath":"folders/__extensions/WinMan.yy","name":"WinMan","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"addons","folderPath":"folders/addons.yy","name":"addons","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"custom","folderPath":"folders/addons/custom.yy","name":"custom","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"key_displayer","folderPath":"folders/addons/key_displayer.yy","name":"key_displayer","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"addons","folderPath":"folders/misc/addons.yy","name":"addons","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"custom","folderPath":"folders/misc/addons/custom.yy","name":"custom","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"key_displayer","folderPath":"folders/misc/addons/key_displayer.yy","name":"key_displayer","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"dialog","folderPath":"folders/dialog.yy","name":"dialog","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"_others","folderPath":"folders/dialog/_others.yy","name":"_others","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"color_selector","folderPath":"folders/dialog/color_selector.yy","name":"color_selector","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -334,7 +334,7 @@ {"$GMFolder":"","%Name":"palette mixer","folderPath":"folders/shader/UI/palette mixer.yy","name":"palette mixer","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"sprites","folderPath":"folders/sprites.yy","name":"sprites","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"bs","folderPath":"folders/sprites/bs.yy","name":"bs","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"font","folderPath":"folders/sprites/font.yy","name":"font","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"font","folderPath":"folders/font.yy","name":"font","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"gameframe","folderPath":"folders/sprites/gameframe.yy","name":"gameframe","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"meta","folderPath":"folders/sprites/meta.yy","name":"meta","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"misc","folderPath":"folders/sprites/misc.yy","name":"misc","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -1259,8 +1259,10 @@ {"$GMIncludedFile":"","%Name":"info.json","CopyToMask":-1,"filePath":"datafiles/data/Nodes/Internal/VFX/Node_VFX_Variable","name":"info.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"info.json","CopyToMask":-1,"filePath":"datafiles/data/Nodes/Internal/VFX/Node_VFX_Vortex","name":"info.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"info.json","CopyToMask":-1,"filePath":"datafiles/data/Nodes/Internal/VFX/Node_VFX_Wind","name":"info.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"latest_zip_time.txt","CopyToMask":-1,"filePath":"datafiles/data/Nodes","name":"latest_zip_time.txt","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"related_node.json","CopyToMask":-1,"filePath":"datafiles/data/Nodes","name":"related_node.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"Update.ps1","CopyToMask":-1,"filePath":"datafiles/data/Nodes","name":"Update.ps1","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"update.py","CopyToMask":-1,"filePath":"datafiles/data/Nodes","name":"update.py","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"tileset_gamemaker2_room.yy","CopyToMask":-1,"filePath":"datafiles/data/TemplateStrings","name":"tileset_gamemaker2_room.yy","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"Theme.zip","CopyToMask":-1,"filePath":"datafiles/data","name":"Theme.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"0 Introduction.png","CopyToMask":-1,"filePath":"datafiles/data/Welcome files/Getting started","name":"0 Introduction.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -3900,6 +3902,7 @@ {"id":{"name":"s_run","path":"sprites/s_run/s_run.yy",},}, {"id":{"name":"s_shape_curve","path":"sprites/s_shape_curve/s_shape_curve.yy",},}, {"id":{"name":"s_texture_default","path":"sprites/s_texture_default/s_texture_default.yy",},}, + {"id":{"name":"s_title","path":"sprites/s_title/s_title.yy",},}, {"id":{"name":"s_transparent","path":"sprites/s_transparent/s_transparent.yy",},}, {"id":{"name":"s_ui_base_white","path":"sprites/s_ui_base_white/s_ui_base_white.yy",},}, {"id":{"name":"s_workshop_badge_version","path":"sprites/s_workshop_badge_version/s_workshop_badge_version.yy",},}, diff --git a/datafiles/data/Nodes/Internal.zip b/datafiles/data/Nodes/Internal.zip index 5a0e15d49..b812a3342 100644 Binary files a/datafiles/data/Nodes/Internal.zip and b/datafiles/data/Nodes/Internal.zip differ diff --git a/datafiles/data/Nodes/latest_zip_time.txt b/datafiles/data/Nodes/latest_zip_time.txt new file mode 100644 index 000000000..500e88b8a --- /dev/null +++ b/datafiles/data/Nodes/latest_zip_time.txt @@ -0,0 +1 @@ +1740014677.4821365 \ No newline at end of file diff --git a/datafiles/data/Nodes/update.py b/datafiles/data/Nodes/update.py new file mode 100644 index 000000000..f18c622d1 --- /dev/null +++ b/datafiles/data/Nodes/update.py @@ -0,0 +1,25 @@ +import os + +DIR = "D:/Project/MakhamDev/LTS-PixelComposer/PixelComposer/datafiles/data/Nodes" + +ltime = 0 +lpath = f"{DIR}/latest_zip_time.txt" +if os.path.exists(lpath): + with open(lpath, 'r') as f: + ltime = f.read() + ltime = float(ltime) + +root = f"{DIR}/Internal" +etime = max(os.path.getmtime(r) for r,_,_ in os.walk(root)) + +if etime > ltime: + print("Update node zip...") + + ps = "C:/Windows/System32/WindowsPowerShell/v1.0/powershell.exe" + os.system(f'{ps} "{DIR}/Update.ps1"') + + with open(lpath, 'w') as f: + f.write(str(etime)) + +else : + print("Node up to date") \ No newline at end of file diff --git a/datafiles/data/Theme.zip b/datafiles/data/Theme.zip index 7bc57e713..287cfae73 100644 Binary files a/datafiles/data/Theme.zip and b/datafiles/data/Theme.zip differ diff --git a/fonts/_f_code/_f_code.yy b/fonts/_f_code/_f_code.yy index 6dd5aeab2..240082bcb 100644 --- a/fonts/_f_code/_f_code.yy +++ b/fonts/_f_code/_f_code.yy @@ -216,7 +216,7 @@ "name":"_f_code", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_code_s/_f_code_s.yy b/fonts/_f_code_s/_f_code_s.yy index 6517c650d..27fbb0cea 100644 --- a/fonts/_f_code_s/_f_code_s.yy +++ b/fonts/_f_code_s/_f_code_s.yy @@ -216,7 +216,7 @@ "name":"_f_code_s", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":2, "ranges":[ diff --git a/fonts/_f_h1/_f_h1.yy b/fonts/_f_h1/_f_h1.yy index 54b3a8f6a..230ebe5d6 100644 --- a/fonts/_f_h1/_f_h1.yy +++ b/fonts/_f_h1/_f_h1.yy @@ -216,7 +216,7 @@ "name":"_f_h1", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_h2/_f_h2.yy b/fonts/_f_h2/_f_h2.yy index 5bf9f456f..7e4efe463 100644 --- a/fonts/_f_h2/_f_h2.yy +++ b/fonts/_f_h2/_f_h2.yy @@ -216,7 +216,7 @@ "name":"_f_h2", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_h3/_f_h3.yy b/fonts/_f_h3/_f_h3.yy index aa526b8df..59e37e073 100644 --- a/fonts/_f_h3/_f_h3.yy +++ b/fonts/_f_h3/_f_h3.yy @@ -216,7 +216,7 @@ "name":"_f_h3", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_h5/_f_h5.yy b/fonts/_f_h5/_f_h5.yy index 77bde7305..4d4f87a74 100644 --- a/fonts/_f_h5/_f_h5.yy +++ b/fonts/_f_h5/_f_h5.yy @@ -120,7 +120,7 @@ "name":"_f_h5", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_ico_h5/_f_ico_h5.yy b/fonts/_f_ico_h5/_f_ico_h5.yy index fd1e5f05e..7b8269b0a 100644 --- a/fonts/_f_ico_h5/_f_ico_h5.yy +++ b/fonts/_f_ico_h5/_f_ico_h5.yy @@ -216,7 +216,7 @@ "name":"_f_ico_h5", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_p0/_f_p0.yy b/fonts/_f_p0/_f_p0.yy index 90bfca0a2..1c2202707 100644 --- a/fonts/_f_p0/_f_p0.yy +++ b/fonts/_f_p0/_f_p0.yy @@ -216,7 +216,7 @@ "name":"_f_p0", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_p0b/_f_p0b.yy b/fonts/_f_p0b/_f_p0b.yy index c57407bc2..9e89ce556 100644 --- a/fonts/_f_p0b/_f_p0b.yy +++ b/fonts/_f_p0b/_f_p0b.yy @@ -216,7 +216,7 @@ "name":"_f_p0b", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_p1/_f_p1.yy b/fonts/_f_p1/_f_p1.yy index 0f26b242d..3b3355138 100644 --- a/fonts/_f_p1/_f_p1.yy +++ b/fonts/_f_p1/_f_p1.yy @@ -216,7 +216,7 @@ "name":"_f_p1", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_p1b/_f_p1b.yy b/fonts/_f_p1b/_f_p1b.yy index 189d07d34..b6d56e40d 100644 --- a/fonts/_f_p1b/_f_p1b.yy +++ b/fonts/_f_p1b/_f_p1b.yy @@ -216,7 +216,7 @@ "name":"_f_p1b", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_p2/_f_p2.yy b/fonts/_f_p2/_f_p2.yy index 6e8cb32cc..3b9e7d0ef 100644 --- a/fonts/_f_p2/_f_p2.yy +++ b/fonts/_f_p2/_f_p2.yy @@ -216,7 +216,7 @@ "name":"_f_p2", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":1, "ranges":[ diff --git a/fonts/_f_p2b/_f_p2b.yy b/fonts/_f_p2b/_f_p2b.yy index b90cd2454..5e3b7687e 100644 --- a/fonts/_f_p2b/_f_p2b.yy +++ b/fonts/_f_p2b/_f_p2b.yy @@ -216,7 +216,7 @@ "name":"_f_p2b", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":1, "ranges":[ diff --git a/fonts/_f_p3/_f_p3.yy b/fonts/_f_p3/_f_p3.yy index a01b075e8..07e3ba2e8 100644 --- a/fonts/_f_p3/_f_p3.yy +++ b/fonts/_f_p3/_f_p3.yy @@ -216,7 +216,7 @@ "name":"_f_p3", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":2, "ranges":[ diff --git a/fonts/_f_p4/_f_p4.yy b/fonts/_f_p4/_f_p4.yy index 4e0330250..8a2a633ea 100644 --- a/fonts/_f_p4/_f_p4.yy +++ b/fonts/_f_p4/_f_p4.yy @@ -216,7 +216,7 @@ "name":"_f_p4", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":2, "ranges":[ diff --git a/fonts/_f_sdf/_f_sdf.old.png b/fonts/_f_sdf/_f_sdf.old.png index 7bc7d6e7c..0b6a83a2d 100644 Binary files a/fonts/_f_sdf/_f_sdf.old.png and b/fonts/_f_sdf/_f_sdf.old.png differ diff --git a/fonts/_f_sdf/_f_sdf.old.yy b/fonts/_f_sdf/_f_sdf.old.yy index fb5959226..2e96f348b 100644 --- a/fonts/_f_sdf/_f_sdf.old.yy +++ b/fonts/_f_sdf/_f_sdf.old.yy @@ -13,101 +13,197 @@ "glyphOperations":0, "glyphs":{ "32":{"character":32,"h":68,"offset":0,"shift":11,"w":11,"x":2,"y":2,}, - "33":{"character":33,"h":68,"offset":2,"shift":12,"w":24,"x":625,"y":142,}, - "34":{"character":34,"h":68,"offset":2,"shift":20,"w":32,"x":591,"y":142,}, - "35":{"character":35,"h":68,"offset":0,"shift":28,"w":43,"x":546,"y":142,}, - "36":{"character":36,"h":68,"offset":1,"shift":25,"w":38,"x":506,"y":142,}, - "37":{"character":37,"h":68,"offset":1,"shift":39,"w":53,"x":451,"y":142,}, - "38":{"character":38,"h":68,"offset":1,"shift":32,"w":48,"x":401,"y":142,}, - "39":{"character":39,"h":68,"offset":2,"shift":11,"w":23,"x":376,"y":142,}, - "40":{"character":40,"h":68,"offset":1,"shift":15,"w":29,"x":345,"y":142,}, - "41":{"character":41,"h":68,"offset":1,"shift":15,"w":28,"x":315,"y":142,}, - "42":{"character":42,"h":68,"offset":1,"shift":23,"w":38,"x":651,"y":142,}, - "43":{"character":43,"h":68,"offset":1,"shift":25,"w":38,"x":275,"y":142,}, - "44":{"character":44,"h":68,"offset":1,"shift":12,"w":25,"x":209,"y":142,}, - "45":{"character":45,"h":68,"offset":1,"shift":14,"w":28,"x":179,"y":142,}, - "46":{"character":46,"h":68,"offset":2,"shift":12,"w":24,"x":153,"y":142,}, - "47":{"character":47,"h":68,"offset":0,"shift":18,"w":34,"x":117,"y":142,}, - "48":{"character":48,"h":68,"offset":1,"shift":25,"w":38,"x":77,"y":142,}, - "49":{"character":49,"h":68,"offset":2,"shift":25,"w":32,"x":43,"y":142,}, - "50":{"character":50,"h":68,"offset":1,"shift":25,"w":39,"x":2,"y":142,}, - "51":{"character":51,"h":68,"offset":1,"shift":25,"w":38,"x":965,"y":72,}, - "52":{"character":52,"h":68,"offset":0,"shift":25,"w":40,"x":923,"y":72,}, - "53":{"character":53,"h":68,"offset":2,"shift":25,"w":37,"x":236,"y":142,}, - "54":{"character":54,"h":68,"offset":1,"shift":25,"w":39,"x":691,"y":142,}, - "55":{"character":55,"h":68,"offset":1,"shift":25,"w":39,"x":732,"y":142,}, - "56":{"character":56,"h":68,"offset":1,"shift":25,"w":39,"x":773,"y":142,}, - "57":{"character":57,"h":68,"offset":1,"shift":25,"w":39,"x":606,"y":212,}, - "58":{"character":58,"h":68,"offset":2,"shift":12,"w":24,"x":580,"y":212,}, - "59":{"character":59,"h":68,"offset":1,"shift":12,"w":25,"x":553,"y":212,}, - "60":{"character":60,"h":68,"offset":1,"shift":25,"w":38,"x":513,"y":212,}, - "61":{"character":61,"h":68,"offset":1,"shift":25,"w":38,"x":473,"y":212,}, - "62":{"character":62,"h":68,"offset":1,"shift":25,"w":38,"x":433,"y":212,}, - "63":{"character":63,"h":68,"offset":0,"shift":21,"w":36,"x":395,"y":212,}, - "64":{"character":64,"h":68,"offset":2,"shift":39,"w":51,"x":342,"y":212,}, - "65":{"character":65,"h":68,"offset":0,"shift":30,"w":46,"x":294,"y":212,}, - "66":{"character":66,"h":68,"offset":3,"shift":29,"w":40,"x":252,"y":212,}, - "67":{"character":67,"h":68,"offset":2,"shift":27,"w":40,"x":210,"y":212,}, - "68":{"character":68,"h":68,"offset":3,"shift":32,"w":43,"x":165,"y":212,}, - "69":{"character":69,"h":68,"offset":3,"shift":24,"w":35,"x":128,"y":212,}, - "70":{"character":70,"h":68,"offset":3,"shift":24,"w":35,"x":91,"y":212,}, - "71":{"character":71,"h":68,"offset":2,"shift":31,"w":42,"x":47,"y":212,}, - "72":{"character":72,"h":68,"offset":3,"shift":33,"w":43,"x":2,"y":212,}, - "73":{"character":73,"h":68,"offset":1,"shift":17,"w":31,"x":981,"y":142,}, - "74":{"character":74,"h":68,"offset":-4,"shift":14,"w":31,"x":948,"y":142,}, - "75":{"character":75,"h":68,"offset":3,"shift":29,"w":42,"x":904,"y":142,}, - "76":{"character":76,"h":68,"offset":3,"shift":24,"w":36,"x":866,"y":142,}, - "77":{"character":77,"h":68,"offset":3,"shift":41,"w":50,"x":814,"y":142,}, - "78":{"character":78,"h":68,"offset":3,"shift":35,"w":45,"x":876,"y":72,}, - "79":{"character":79,"h":68,"offset":2,"shift":34,"w":46,"x":828,"y":72,}, - "80":{"character":80,"h":68,"offset":3,"shift":27,"w":39,"x":787,"y":72,}, - "81":{"character":81,"h":68,"offset":2,"shift":34,"w":46,"x":866,"y":2,}, - "82":{"character":82,"h":68,"offset":3,"shift":28,"w":42,"x":793,"y":2,}, - "83":{"character":83,"h":68,"offset":1,"shift":24,"w":37,"x":754,"y":2,}, - "84":{"character":84,"h":68,"offset":0,"shift":25,"w":41,"x":711,"y":2,}, - "85":{"character":85,"h":68,"offset":3,"shift":33,"w":42,"x":667,"y":2,}, - "86":{"character":86,"h":68,"offset":0,"shift":28,"w":44,"x":621,"y":2,}, - "87":{"character":87,"h":68,"offset":0,"shift":42,"w":58,"x":561,"y":2,}, - "88":{"character":88,"h":68,"offset":0,"shift":29,"w":45,"x":514,"y":2,}, - "89":{"character":89,"h":68,"offset":0,"shift":27,"w":43,"x":469,"y":2,}, - "90":{"character":90,"h":68,"offset":1,"shift":25,"w":39,"x":428,"y":2,}, - "91":{"character":91,"h":68,"offset":3,"shift":14,"w":27,"x":837,"y":2,}, - "92":{"character":92,"h":68,"offset":0,"shift":18,"w":34,"x":392,"y":2,}, - "93":{"character":93,"h":68,"offset":1,"shift":14,"w":27,"x":326,"y":2,}, - "94":{"character":94,"h":68,"offset":0,"shift":25,"w":40,"x":284,"y":2,}, - "95":{"character":95,"h":68,"offset":-1,"shift":18,"w":35,"x":247,"y":2,}, - "96":{"character":96,"h":68,"offset":1,"shift":16,"w":29,"x":216,"y":2,}, - "97":{"character":97,"h":68,"offset":1,"shift":26,"w":38,"x":176,"y":2,}, - "98":{"character":98,"h":68,"offset":3,"shift":27,"w":39,"x":135,"y":2,}, - "99":{"character":99,"h":68,"offset":1,"shift":22,"w":36,"x":97,"y":2,}, - "100":{"character":100,"h":68,"offset":1,"shift":27,"w":39,"x":56,"y":2,}, - "101":{"character":101,"h":68,"offset":1,"shift":25,"w":39,"x":15,"y":2,}, - "102":{"character":102,"h":68,"offset":0,"shift":17,"w":35,"x":355,"y":2,}, - "103":{"character":103,"h":68,"offset":1,"shift":27,"w":39,"x":914,"y":2,}, - "104":{"character":104,"h":68,"offset":3,"shift":28,"w":39,"x":321,"y":72,}, - "105":{"character":105,"h":68,"offset":3,"shift":13,"w":24,"x":955,"y":2,}, - "106":{"character":106,"h":68,"offset":-3,"shift":13,"w":30,"x":718,"y":72,}, - "107":{"character":107,"h":68,"offset":3,"shift":27,"w":40,"x":676,"y":72,}, - "108":{"character":108,"h":68,"offset":3,"shift":13,"w":23,"x":651,"y":72,}, - "109":{"character":109,"h":68,"offset":3,"shift":42,"w":52,"x":597,"y":72,}, - "110":{"character":110,"h":68,"offset":3,"shift":28,"w":39,"x":556,"y":72,}, - "111":{"character":111,"h":68,"offset":1,"shift":27,"w":40,"x":514,"y":72,}, - "112":{"character":112,"h":68,"offset":3,"shift":27,"w":39,"x":473,"y":72,}, - "113":{"character":113,"h":68,"offset":1,"shift":27,"w":39,"x":432,"y":72,}, - "114":{"character":114,"h":68,"offset":3,"shift":20,"w":32,"x":398,"y":72,}, - "115":{"character":115,"h":68,"offset":1,"shift":21,"w":35,"x":750,"y":72,}, - "116":{"character":116,"h":68,"offset":0,"shift":19,"w":34,"x":362,"y":72,}, - "117":{"character":117,"h":68,"offset":3,"shift":28,"w":38,"x":281,"y":72,}, - "118":{"character":118,"h":68,"offset":0,"shift":24,"w":41,"x":238,"y":72,}, - "119":{"character":119,"h":68,"offset":0,"shift":37,"w":53,"x":183,"y":72,}, - "120":{"character":120,"h":68,"offset":0,"shift":25,"w":41,"x":140,"y":72,}, - "121":{"character":121,"h":68,"offset":0,"shift":24,"w":41,"x":97,"y":72,}, - "122":{"character":122,"h":68,"offset":1,"shift":21,"w":35,"x":60,"y":72,}, - "123":{"character":123,"h":68,"offset":0,"shift":17,"w":32,"x":26,"y":72,}, - "124":{"character":124,"h":68,"offset":9,"shift":24,"w":22,"x":2,"y":72,}, - "125":{"character":125,"h":68,"offset":1,"shift":17,"w":32,"x":981,"y":2,}, - "126":{"character":126,"h":68,"offset":1,"shift":25,"w":38,"x":647,"y":212,}, - "9647":{"character":9647,"h":68,"offset":8,"shift":42,"w":42,"x":687,"y":212,}, + "33":{"character":33,"h":68,"offset":2,"shift":12,"w":24,"x":794,"y":282,}, + "34":{"character":34,"h":68,"offset":2,"shift":20,"w":32,"x":820,"y":282,}, + "35":{"character":35,"h":68,"offset":0,"shift":28,"w":43,"x":854,"y":282,}, + "36":{"character":36,"h":68,"offset":1,"shift":25,"w":38,"x":899,"y":282,}, + "37":{"character":37,"h":68,"offset":1,"shift":39,"w":53,"x":939,"y":282,}, + "38":{"character":38,"h":68,"offset":1,"shift":32,"w":48,"x":2,"y":352,}, + "39":{"character":39,"h":68,"offset":2,"shift":11,"w":23,"x":52,"y":352,}, + "40":{"character":40,"h":68,"offset":1,"shift":15,"w":29,"x":77,"y":352,}, + "41":{"character":41,"h":68,"offset":1,"shift":15,"w":28,"x":108,"y":352,}, + "42":{"character":42,"h":68,"offset":1,"shift":23,"w":38,"x":179,"y":352,}, + "43":{"character":43,"h":68,"offset":1,"shift":25,"w":38,"x":535,"y":352,}, + "44":{"character":44,"h":68,"offset":1,"shift":12,"w":25,"x":219,"y":352,}, + "45":{"character":45,"h":68,"offset":1,"shift":14,"w":28,"x":246,"y":352,}, + "46":{"character":46,"h":68,"offset":2,"shift":12,"w":24,"x":276,"y":352,}, + "47":{"character":47,"h":68,"offset":0,"shift":18,"w":34,"x":302,"y":352,}, + "48":{"character":48,"h":68,"offset":1,"shift":25,"w":38,"x":338,"y":352,}, + "49":{"character":49,"h":68,"offset":2,"shift":25,"w":32,"x":378,"y":352,}, + "50":{"character":50,"h":68,"offset":1,"shift":25,"w":39,"x":412,"y":352,}, + "51":{"character":51,"h":68,"offset":1,"shift":25,"w":38,"x":453,"y":352,}, + "52":{"character":52,"h":68,"offset":0,"shift":25,"w":40,"x":493,"y":352,}, + "53":{"character":53,"h":68,"offset":2,"shift":25,"w":37,"x":755,"y":282,}, + "54":{"character":54,"h":68,"offset":1,"shift":25,"w":39,"x":138,"y":352,}, + "55":{"character":55,"h":68,"offset":1,"shift":25,"w":39,"x":714,"y":282,}, + "56":{"character":56,"h":68,"offset":1,"shift":25,"w":39,"x":181,"y":282,}, + "57":{"character":57,"h":68,"offset":1,"shift":25,"w":39,"x":847,"y":212,}, + "58":{"character":58,"h":68,"offset":2,"shift":12,"w":24,"x":888,"y":212,}, + "59":{"character":59,"h":68,"offset":1,"shift":12,"w":25,"x":914,"y":212,}, + "60":{"character":60,"h":68,"offset":1,"shift":25,"w":38,"x":941,"y":212,}, + "61":{"character":61,"h":68,"offset":1,"shift":25,"w":38,"x":981,"y":212,}, + "62":{"character":62,"h":68,"offset":1,"shift":25,"w":38,"x":2,"y":282,}, + "63":{"character":63,"h":68,"offset":0,"shift":21,"w":36,"x":42,"y":282,}, + "64":{"character":64,"h":68,"offset":2,"shift":39,"w":51,"x":80,"y":282,}, + "65":{"character":65,"h":68,"offset":0,"shift":30,"w":46,"x":133,"y":282,}, + "66":{"character":66,"h":68,"offset":3,"shift":29,"w":40,"x":222,"y":282,}, + "67":{"character":67,"h":68,"offset":2,"shift":27,"w":40,"x":620,"y":282,}, + "68":{"character":68,"h":68,"offset":3,"shift":32,"w":43,"x":264,"y":282,}, + "69":{"character":69,"h":68,"offset":3,"shift":24,"w":35,"x":309,"y":282,}, + "70":{"character":70,"h":68,"offset":3,"shift":24,"w":35,"x":346,"y":282,}, + "71":{"character":71,"h":68,"offset":2,"shift":31,"w":42,"x":383,"y":282,}, + "72":{"character":72,"h":68,"offset":3,"shift":33,"w":43,"x":427,"y":282,}, + "73":{"character":73,"h":68,"offset":1,"shift":17,"w":31,"x":472,"y":282,}, + "74":{"character":74,"h":68,"offset":-4,"shift":14,"w":31,"x":505,"y":282,}, + "75":{"character":75,"h":68,"offset":3,"shift":29,"w":42,"x":538,"y":282,}, + "76":{"character":76,"h":68,"offset":3,"shift":24,"w":36,"x":582,"y":282,}, + "77":{"character":77,"h":68,"offset":3,"shift":41,"w":50,"x":662,"y":282,}, + "78":{"character":78,"h":68,"offset":3,"shift":35,"w":45,"x":575,"y":352,}, + "79":{"character":79,"h":68,"offset":2,"shift":34,"w":46,"x":622,"y":352,}, + "80":{"character":80,"h":68,"offset":3,"shift":27,"w":39,"x":670,"y":352,}, + "81":{"character":81,"h":68,"offset":2,"shift":34,"w":46,"x":648,"y":422,}, + "82":{"character":82,"h":68,"offset":3,"shift":28,"w":42,"x":696,"y":422,}, + "83":{"character":83,"h":68,"offset":1,"shift":24,"w":37,"x":740,"y":422,}, + "84":{"character":84,"h":68,"offset":0,"shift":25,"w":41,"x":779,"y":422,}, + "85":{"character":85,"h":68,"offset":3,"shift":33,"w":42,"x":822,"y":422,}, + "86":{"character":86,"h":68,"offset":0,"shift":28,"w":44,"x":866,"y":422,}, + "87":{"character":87,"h":68,"offset":0,"shift":42,"w":58,"x":912,"y":422,}, + "88":{"character":88,"h":68,"offset":0,"shift":29,"w":45,"x":972,"y":422,}, + "89":{"character":89,"h":68,"offset":0,"shift":27,"w":43,"x":2,"y":492,}, + "90":{"character":90,"h":68,"offset":1,"shift":25,"w":39,"x":47,"y":492,}, + "91":{"character":91,"h":68,"offset":3,"shift":14,"w":27,"x":88,"y":492,}, + "92":{"character":92,"h":68,"offset":0,"shift":18,"w":34,"x":117,"y":492,}, + "93":{"character":93,"h":68,"offset":1,"shift":14,"w":27,"x":153,"y":492,}, + "94":{"character":94,"h":68,"offset":0,"shift":25,"w":40,"x":182,"y":492,}, + "95":{"character":95,"h":68,"offset":-1,"shift":18,"w":35,"x":224,"y":492,}, + "96":{"character":96,"h":68,"offset":1,"shift":16,"w":29,"x":261,"y":492,}, + "97":{"character":97,"h":68,"offset":1,"shift":26,"w":38,"x":292,"y":492,}, + "98":{"character":98,"h":68,"offset":3,"shift":27,"w":39,"x":332,"y":492,}, + "99":{"character":99,"h":68,"offset":1,"shift":22,"w":36,"x":373,"y":492,}, + "100":{"character":100,"h":68,"offset":1,"shift":27,"w":39,"x":411,"y":492,}, + "101":{"character":101,"h":68,"offset":1,"shift":25,"w":39,"x":452,"y":492,}, + "102":{"character":102,"h":68,"offset":0,"shift":17,"w":35,"x":611,"y":422,}, + "103":{"character":103,"h":68,"offset":1,"shift":27,"w":39,"x":570,"y":422,}, + "104":{"character":104,"h":68,"offset":3,"shift":28,"w":39,"x":529,"y":422,}, + "105":{"character":105,"h":68,"offset":3,"shift":13,"w":24,"x":77,"y":422,}, + "106":{"character":106,"h":68,"offset":-3,"shift":13,"w":30,"x":711,"y":352,}, + "107":{"character":107,"h":68,"offset":3,"shift":27,"w":40,"x":743,"y":352,}, + "108":{"character":108,"h":68,"offset":3,"shift":13,"w":23,"x":785,"y":352,}, + "109":{"character":109,"h":68,"offset":3,"shift":42,"w":52,"x":810,"y":352,}, + "110":{"character":110,"h":68,"offset":3,"shift":28,"w":39,"x":864,"y":352,}, + "111":{"character":111,"h":68,"offset":1,"shift":27,"w":40,"x":905,"y":352,}, + "112":{"character":112,"h":68,"offset":3,"shift":27,"w":39,"x":947,"y":352,}, + "113":{"character":113,"h":68,"offset":1,"shift":27,"w":39,"x":2,"y":422,}, + "114":{"character":114,"h":68,"offset":3,"shift":20,"w":32,"x":43,"y":422,}, + "115":{"character":115,"h":68,"offset":1,"shift":21,"w":35,"x":103,"y":422,}, + "116":{"character":116,"h":68,"offset":0,"shift":19,"w":34,"x":493,"y":422,}, + "117":{"character":117,"h":68,"offset":3,"shift":28,"w":38,"x":140,"y":422,}, + "118":{"character":118,"h":68,"offset":0,"shift":24,"w":41,"x":180,"y":422,}, + "119":{"character":119,"h":68,"offset":0,"shift":37,"w":53,"x":223,"y":422,}, + "120":{"character":120,"h":68,"offset":0,"shift":25,"w":41,"x":278,"y":422,}, + "121":{"character":121,"h":68,"offset":0,"shift":24,"w":41,"x":321,"y":422,}, + "122":{"character":122,"h":68,"offset":1,"shift":21,"w":35,"x":364,"y":422,}, + "123":{"character":123,"h":68,"offset":0,"shift":17,"w":32,"x":401,"y":422,}, + "124":{"character":124,"h":68,"offset":9,"shift":24,"w":22,"x":435,"y":422,}, + "125":{"character":125,"h":68,"offset":1,"shift":17,"w":32,"x":459,"y":422,}, + "126":{"character":126,"h":68,"offset":1,"shift":25,"w":38,"x":807,"y":212,}, + "160":{"character":160,"h":68,"offset":0,"shift":11,"w":0,"x":805,"y":212,}, + "161":{"character":161,"h":68,"offset":2,"shift":12,"w":24,"x":779,"y":212,}, + "162":{"character":162,"h":68,"offset":3,"shift":25,"w":35,"x":784,"y":72,}, + "163":{"character":163,"h":68,"offset":1,"shift":25,"w":39,"x":2,"y":72,}, + "164":{"character":164,"h":68,"offset":2,"shift":25,"w":37,"x":43,"y":72,}, + "165":{"character":165,"h":68,"offset":0,"shift":25,"w":41,"x":82,"y":72,}, + "166":{"character":166,"h":68,"offset":9,"shift":24,"w":22,"x":125,"y":72,}, + "167":{"character":167,"h":68,"offset":2,"shift":21,"w":33,"x":149,"y":72,}, + "168":{"character":168,"h":68,"offset":5,"shift":26,"w":32,"x":184,"y":72,}, + "169":{"character":169,"h":68,"offset":2,"shift":36,"w":48,"x":218,"y":72,}, + "170":{"character":170,"h":68,"offset":0,"shift":16,"w":31,"x":268,"y":72,}, + "171":{"character":171,"h":68,"offset":1,"shift":26,"w":40,"x":301,"y":72,}, + "172":{"character":172,"h":68,"offset":1,"shift":25,"w":38,"x":371,"y":72,}, + "173":{"character":173,"h":68,"offset":1,"shift":14,"w":28,"x":754,"y":72,}, + "174":{"character":174,"h":68,"offset":2,"shift":36,"w":48,"x":411,"y":72,}, + "175":{"character":175,"h":68,"offset":-1,"shift":22,"w":39,"x":461,"y":72,}, + "176":{"character":176,"h":68,"offset":1,"shift":18,"w":32,"x":502,"y":72,}, + "177":{"character":177,"h":68,"offset":1,"shift":25,"w":38,"x":536,"y":72,}, + "178":{"character":178,"h":68,"offset":0,"shift":16,"w":31,"x":576,"y":72,}, + "179":{"character":179,"h":68,"offset":1,"shift":16,"w":30,"x":609,"y":72,}, + "180":{"character":180,"h":68,"offset":1,"shift":16,"w":29,"x":641,"y":72,}, + "181":{"character":181,"h":68,"offset":3,"shift":28,"w":39,"x":672,"y":72,}, + "182":{"character":182,"h":68,"offset":2,"shift":28,"w":39,"x":713,"y":72,}, + "183":{"character":183,"h":68,"offset":2,"shift":12,"w":24,"x":996,"y":2,}, + "184":{"character":184,"h":68,"offset":-1,"shift":9,"w":26,"x":343,"y":72,}, + "185":{"character":185,"h":68,"offset":1,"shift":16,"w":28,"x":966,"y":2,}, + "186":{"character":186,"h":68,"offset":1,"shift":17,"w":31,"x":449,"y":2,}, + "187":{"character":187,"h":68,"offset":1,"shift":26,"w":40,"x":15,"y":2,}, + "188":{"character":188,"h":68,"offset":0,"shift":36,"w":52,"x":57,"y":2,}, + "189":{"character":189,"h":68,"offset":0,"shift":38,"w":53,"x":111,"y":2,}, + "190":{"character":190,"h":68,"offset":1,"shift":36,"w":51,"x":166,"y":2,}, + "191":{"character":191,"h":68,"offset":1,"shift":21,"w":36,"x":219,"y":2,}, + "192":{"character":192,"h":68,"offset":0,"shift":30,"w":46,"x":257,"y":2,}, + "193":{"character":193,"h":68,"offset":0,"shift":30,"w":46,"x":305,"y":2,}, + "194":{"character":194,"h":68,"offset":0,"shift":30,"w":46,"x":353,"y":2,}, + "195":{"character":195,"h":68,"offset":0,"shift":30,"w":46,"x":401,"y":2,}, + "196":{"character":196,"h":68,"offset":0,"shift":30,"w":46,"x":482,"y":2,}, + "197":{"character":197,"h":68,"offset":0,"shift":30,"w":46,"x":885,"y":2,}, + "198":{"character":198,"h":68,"offset":0,"shift":41,"w":55,"x":530,"y":2,}, + "199":{"character":199,"h":68,"offset":2,"shift":27,"w":40,"x":587,"y":2,}, + "200":{"character":200,"h":68,"offset":3,"shift":24,"w":35,"x":629,"y":2,}, + "201":{"character":201,"h":68,"offset":3,"shift":24,"w":36,"x":666,"y":2,}, + "202":{"character":202,"h":68,"offset":3,"shift":24,"w":36,"x":704,"y":2,}, + "203":{"character":203,"h":68,"offset":3,"shift":24,"w":35,"x":742,"y":2,}, + "204":{"character":204,"h":68,"offset":0,"shift":17,"w":32,"x":779,"y":2,}, + "205":{"character":205,"h":68,"offset":1,"shift":17,"w":33,"x":813,"y":2,}, + "206":{"character":206,"h":68,"offset":-1,"shift":17,"w":35,"x":848,"y":2,}, + "207":{"character":207,"h":68,"offset":1,"shift":17,"w":31,"x":933,"y":2,}, + "208":{"character":208,"h":68,"offset":0,"shift":32,"w":46,"x":821,"y":72,}, + "209":{"character":209,"h":68,"offset":3,"shift":35,"w":45,"x":732,"y":142,}, + "210":{"character":210,"h":68,"offset":2,"shift":34,"w":46,"x":869,"y":72,}, + "211":{"character":211,"h":68,"offset":2,"shift":34,"w":46,"x":858,"y":142,}, + "212":{"character":212,"h":68,"offset":2,"shift":34,"w":46,"x":906,"y":142,}, + "213":{"character":213,"h":68,"offset":2,"shift":34,"w":46,"x":954,"y":142,}, + "214":{"character":214,"h":68,"offset":2,"shift":34,"w":46,"x":2,"y":212,}, + "215":{"character":215,"h":68,"offset":2,"shift":25,"w":36,"x":50,"y":212,}, + "216":{"character":216,"h":68,"offset":2,"shift":34,"w":46,"x":88,"y":212,}, + "217":{"character":217,"h":68,"offset":3,"shift":33,"w":42,"x":136,"y":212,}, + "218":{"character":218,"h":68,"offset":3,"shift":33,"w":42,"x":180,"y":212,}, + "219":{"character":219,"h":68,"offset":3,"shift":33,"w":42,"x":224,"y":212,}, + "220":{"character":220,"h":68,"offset":3,"shift":33,"w":42,"x":309,"y":212,}, + "221":{"character":221,"h":68,"offset":0,"shift":27,"w":43,"x":734,"y":212,}, + "222":{"character":222,"h":68,"offset":3,"shift":27,"w":39,"x":353,"y":212,}, + "223":{"character":223,"h":68,"offset":3,"shift":31,"w":43,"x":394,"y":212,}, + "224":{"character":224,"h":68,"offset":1,"shift":26,"w":38,"x":439,"y":212,}, + "225":{"character":225,"h":68,"offset":1,"shift":26,"w":38,"x":479,"y":212,}, + "226":{"character":226,"h":68,"offset":1,"shift":26,"w":38,"x":519,"y":212,}, + "227":{"character":227,"h":68,"offset":1,"shift":26,"w":38,"x":559,"y":212,}, + "228":{"character":228,"h":68,"offset":1,"shift":26,"w":38,"x":599,"y":212,}, + "229":{"character":229,"h":68,"offset":1,"shift":26,"w":38,"x":639,"y":212,}, + "230":{"character":230,"h":68,"offset":1,"shift":39,"w":53,"x":679,"y":212,}, + "231":{"character":231,"h":68,"offset":1,"shift":22,"w":36,"x":820,"y":142,}, + "232":{"character":232,"h":68,"offset":1,"shift":25,"w":39,"x":268,"y":212,}, + "233":{"character":233,"h":68,"offset":1,"shift":25,"w":39,"x":779,"y":142,}, + "234":{"character":234,"h":68,"offset":1,"shift":25,"w":39,"x":239,"y":142,}, + "235":{"character":235,"h":68,"offset":1,"shift":25,"w":39,"x":917,"y":72,}, + "236":{"character":236,"h":68,"offset":-2,"shift":13,"w":29,"x":958,"y":72,}, + "237":{"character":237,"h":68,"offset":3,"shift":13,"w":29,"x":989,"y":72,}, + "238":{"character":238,"h":68,"offset":-3,"shift":13,"w":35,"x":2,"y":142,}, + "239":{"character":239,"h":68,"offset":-1,"shift":13,"w":31,"x":39,"y":142,}, + "240":{"character":240,"h":68,"offset":1,"shift":27,"w":40,"x":72,"y":142,}, + "241":{"character":241,"h":68,"offset":3,"shift":28,"w":39,"x":114,"y":142,}, + "242":{"character":242,"h":68,"offset":1,"shift":27,"w":40,"x":155,"y":142,}, + "243":{"character":243,"h":68,"offset":1,"shift":27,"w":40,"x":197,"y":142,}, + "244":{"character":244,"h":68,"offset":1,"shift":27,"w":40,"x":280,"y":142,}, + "245":{"character":245,"h":68,"offset":1,"shift":27,"w":40,"x":690,"y":142,}, + "246":{"character":246,"h":68,"offset":1,"shift":27,"w":40,"x":322,"y":142,}, + "247":{"character":247,"h":68,"offset":1,"shift":25,"w":38,"x":364,"y":142,}, + "248":{"character":248,"h":68,"offset":1,"shift":27,"w":40,"x":404,"y":142,}, + "249":{"character":249,"h":68,"offset":3,"shift":28,"w":38,"x":446,"y":142,}, + "250":{"character":250,"h":68,"offset":3,"shift":28,"w":38,"x":486,"y":142,}, + "251":{"character":251,"h":68,"offset":3,"shift":28,"w":38,"x":526,"y":142,}, + "252":{"character":252,"h":68,"offset":3,"shift":28,"w":38,"x":566,"y":142,}, + "253":{"character":253,"h":68,"offset":0,"shift":24,"w":41,"x":606,"y":142,}, + "254":{"character":254,"h":68,"offset":3,"shift":27,"w":39,"x":649,"y":142,}, + "255":{"character":255,"h":68,"offset":0,"shift":24,"w":41,"x":493,"y":492,}, + "9647":{"character":9647,"h":68,"offset":8,"shift":42,"w":42,"x":536,"y":492,}, }, "hinting":0, "includeTTF":false, @@ -124,7 +220,7 @@ }, "pointRounding":0, "ranges":[ - {"lower":32,"upper":127,}, + {"lower":32,"upper":255,}, {"lower":9647,"upper":9647,}, ], "regenerateBitmap":false, diff --git a/fonts/_f_sdf/_f_sdf.png b/fonts/_f_sdf/_f_sdf.png index 0b6a83a2d..5e4ea34d6 100644 Binary files a/fonts/_f_sdf/_f_sdf.png and b/fonts/_f_sdf/_f_sdf.png differ diff --git a/fonts/_f_sdf/_f_sdf.yy b/fonts/_f_sdf/_f_sdf.yy index 2e96f348b..3e827d5ed 100644 --- a/fonts/_f_sdf/_f_sdf.yy +++ b/fonts/_f_sdf/_f_sdf.yy @@ -216,7 +216,7 @@ "name":"_f_sdf", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/fonts/_f_sdf_medium/_f_sdf_medium.old.png b/fonts/_f_sdf_medium/_f_sdf_medium.old.png index ecd35962b..eb51d53be 100644 Binary files a/fonts/_f_sdf_medium/_f_sdf_medium.old.png and b/fonts/_f_sdf_medium/_f_sdf_medium.old.png differ diff --git a/fonts/_f_sdf_medium/_f_sdf_medium.old.yy b/fonts/_f_sdf_medium/_f_sdf_medium.old.yy index 825f4f38f..e82b42a20 100644 --- a/fonts/_f_sdf_medium/_f_sdf_medium.old.yy +++ b/fonts/_f_sdf_medium/_f_sdf_medium.old.yy @@ -13,101 +13,197 @@ "glyphOperations":0, "glyphs":{ "32":{"character":32,"h":53,"offset":0,"shift":8,"w":8,"x":2,"y":2,}, - "33":{"character":33,"h":53,"offset":2,"shift":8,"w":21,"x":203,"y":222,}, - "34":{"character":34,"h":53,"offset":1,"shift":13,"w":26,"x":175,"y":222,}, - "35":{"character":35,"h":53,"offset":0,"shift":19,"w":35,"x":138,"y":222,}, - "36":{"character":36,"h":53,"offset":1,"shift":17,"w":31,"x":105,"y":222,}, - "37":{"character":37,"h":53,"offset":1,"shift":25,"w":39,"x":64,"y":222,}, - "38":{"character":38,"h":53,"offset":1,"shift":22,"w":37,"x":25,"y":222,}, - "39":{"character":39,"h":53,"offset":1,"shift":7,"w":21,"x":2,"y":222,}, - "40":{"character":40,"h":53,"offset":1,"shift":9,"w":24,"x":465,"y":167,}, - "41":{"character":41,"h":53,"offset":0,"shift":9,"w":24,"x":439,"y":167,}, - "42":{"character":42,"h":53,"offset":1,"shift":16,"w":30,"x":226,"y":222,}, - "43":{"character":43,"h":53,"offset":1,"shift":17,"w":31,"x":406,"y":167,}, - "44":{"character":44,"h":53,"offset":1,"shift":8,"w":21,"x":350,"y":167,}, - "45":{"character":45,"h":53,"offset":1,"shift":9,"w":24,"x":324,"y":167,}, - "46":{"character":46,"h":53,"offset":2,"shift":8,"w":21,"x":301,"y":167,}, - "47":{"character":47,"h":53,"offset":0,"shift":11,"w":28,"x":271,"y":167,}, - "48":{"character":48,"h":53,"offset":1,"shift":17,"w":31,"x":238,"y":167,}, - "49":{"character":49,"h":53,"offset":2,"shift":17,"w":25,"x":211,"y":167,}, - "50":{"character":50,"h":53,"offset":1,"shift":17,"w":31,"x":178,"y":167,}, - "51":{"character":51,"h":53,"offset":1,"shift":17,"w":31,"x":145,"y":167,}, - "52":{"character":52,"h":53,"offset":0,"shift":17,"w":33,"x":110,"y":167,}, - "53":{"character":53,"h":53,"offset":1,"shift":17,"w":31,"x":373,"y":167,}, - "54":{"character":54,"h":53,"offset":1,"shift":17,"w":31,"x":258,"y":222,}, - "55":{"character":55,"h":53,"offset":1,"shift":17,"w":31,"x":291,"y":222,}, - "56":{"character":56,"h":53,"offset":1,"shift":17,"w":31,"x":324,"y":222,}, - "57":{"character":57,"h":53,"offset":1,"shift":17,"w":31,"x":25,"y":332,}, - "58":{"character":58,"h":53,"offset":2,"shift":8,"w":21,"x":2,"y":332,}, - "59":{"character":59,"h":53,"offset":0,"shift":8,"w":22,"x":479,"y":277,}, - "60":{"character":60,"h":53,"offset":1,"shift":17,"w":31,"x":446,"y":277,}, - "61":{"character":61,"h":53,"offset":1,"shift":17,"w":31,"x":413,"y":277,}, - "62":{"character":62,"h":53,"offset":1,"shift":17,"w":31,"x":380,"y":277,}, - "63":{"character":63,"h":53,"offset":0,"shift":13,"w":29,"x":349,"y":277,}, - "64":{"character":64,"h":53,"offset":1,"shift":26,"w":40,"x":307,"y":277,}, - "65":{"character":65,"h":53,"offset":0,"shift":19,"w":36,"x":269,"y":277,}, - "66":{"character":66,"h":53,"offset":2,"shift":19,"w":32,"x":235,"y":277,}, - "67":{"character":67,"h":53,"offset":1,"shift":19,"w":33,"x":200,"y":277,}, - "68":{"character":68,"h":53,"offset":2,"shift":22,"w":34,"x":164,"y":277,}, - "69":{"character":69,"h":53,"offset":2,"shift":16,"w":29,"x":133,"y":277,}, - "70":{"character":70,"h":53,"offset":2,"shift":15,"w":29,"x":102,"y":277,}, - "71":{"character":71,"h":53,"offset":1,"shift":21,"w":35,"x":65,"y":277,}, - "72":{"character":72,"h":53,"offset":2,"shift":22,"w":34,"x":29,"y":277,}, - "73":{"character":73,"h":53,"offset":1,"shift":10,"w":25,"x":2,"y":277,}, - "74":{"character":74,"h":53,"offset":-3,"shift":9,"w":25,"x":464,"y":222,}, - "75":{"character":75,"h":53,"offset":2,"shift":19,"w":33,"x":429,"y":222,}, - "76":{"character":76,"h":53,"offset":2,"shift":16,"w":29,"x":398,"y":222,}, - "77":{"character":77,"h":53,"offset":2,"shift":27,"w":39,"x":357,"y":222,}, - "78":{"character":78,"h":53,"offset":2,"shift":23,"w":34,"x":74,"y":167,}, - "79":{"character":79,"h":53,"offset":1,"shift":23,"w":37,"x":35,"y":167,}, - "80":{"character":80,"h":53,"offset":2,"shift":18,"w":31,"x":2,"y":167,}, - "81":{"character":81,"h":53,"offset":1,"shift":23,"w":37,"x":202,"y":57,}, - "82":{"character":82,"h":53,"offset":2,"shift":19,"w":33,"x":142,"y":57,}, - "83":{"character":83,"h":53,"offset":1,"shift":16,"w":30,"x":110,"y":57,}, - "84":{"character":84,"h":53,"offset":0,"shift":17,"w":33,"x":75,"y":57,}, - "85":{"character":85,"h":53,"offset":2,"shift":22,"w":34,"x":39,"y":57,}, - "86":{"character":86,"h":53,"offset":0,"shift":18,"w":35,"x":2,"y":57,}, - "87":{"character":87,"h":53,"offset":0,"shift":28,"w":44,"x":455,"y":2,}, - "88":{"character":88,"h":53,"offset":0,"shift":18,"w":34,"x":419,"y":2,}, - "89":{"character":89,"h":53,"offset":0,"shift":17,"w":34,"x":383,"y":2,}, - "90":{"character":90,"h":53,"offset":1,"shift":17,"w":31,"x":350,"y":2,}, - "91":{"character":91,"h":53,"offset":2,"shift":10,"w":23,"x":177,"y":57,}, - "92":{"character":92,"h":53,"offset":0,"shift":11,"w":28,"x":320,"y":2,}, - "93":{"character":93,"h":53,"offset":0,"shift":10,"w":24,"x":264,"y":2,}, - "94":{"character":94,"h":53,"offset":1,"shift":17,"w":31,"x":231,"y":2,}, - "95":{"character":95,"h":53,"offset":-1,"shift":13,"w":30,"x":199,"y":2,}, - "96":{"character":96,"h":53,"offset":1,"shift":9,"w":23,"x":174,"y":2,}, - "97":{"character":97,"h":53,"offset":1,"shift":17,"w":30,"x":142,"y":2,}, - "98":{"character":98,"h":53,"offset":2,"shift":18,"w":31,"x":109,"y":2,}, - "99":{"character":99,"h":53,"offset":1,"shift":14,"w":29,"x":78,"y":2,}, - "100":{"character":100,"h":53,"offset":1,"shift":18,"w":31,"x":45,"y":2,}, - "101":{"character":101,"h":53,"offset":1,"shift":17,"w":31,"x":12,"y":2,}, - "102":{"character":102,"h":53,"offset":0,"shift":10,"w":28,"x":290,"y":2,}, - "103":{"character":103,"h":53,"offset":1,"shift":18,"w":31,"x":241,"y":57,}, - "104":{"character":104,"h":53,"offset":2,"shift":18,"w":31,"x":111,"y":112,}, - "105":{"character":105,"h":53,"offset":2,"shift":8,"w":20,"x":274,"y":57,}, - "106":{"character":106,"h":53,"offset":-2,"shift":8,"w":24,"x":431,"y":112,}, - "107":{"character":107,"h":53,"offset":2,"shift":16,"w":31,"x":398,"y":112,}, - "108":{"character":108,"h":53,"offset":2,"shift":8,"w":20,"x":376,"y":112,}, - "109":{"character":109,"h":53,"offset":2,"shift":28,"w":40,"x":334,"y":112,}, - "110":{"character":110,"h":53,"offset":2,"shift":18,"w":31,"x":301,"y":112,}, - "111":{"character":111,"h":53,"offset":1,"shift":18,"w":32,"x":267,"y":112,}, - "112":{"character":112,"h":53,"offset":2,"shift":18,"w":31,"x":234,"y":112,}, - "113":{"character":113,"h":53,"offset":1,"shift":18,"w":31,"x":201,"y":112,}, - "114":{"character":114,"h":53,"offset":2,"shift":12,"w":26,"x":173,"y":112,}, - "115":{"character":115,"h":53,"offset":1,"shift":14,"w":28,"x":457,"y":112,}, - "116":{"character":116,"h":53,"offset":0,"shift":11,"w":27,"x":144,"y":112,}, - "117":{"character":117,"h":53,"offset":2,"shift":18,"w":31,"x":78,"y":112,}, - "118":{"character":118,"h":53,"offset":0,"shift":15,"w":32,"x":44,"y":112,}, - "119":{"character":119,"h":53,"offset":0,"shift":24,"w":40,"x":2,"y":112,}, - "120":{"character":120,"h":53,"offset":0,"shift":16,"w":32,"x":439,"y":57,}, - "121":{"character":121,"h":53,"offset":0,"shift":15,"w":32,"x":405,"y":57,}, - "122":{"character":122,"h":53,"offset":1,"shift":14,"w":28,"x":375,"y":57,}, - "123":{"character":123,"h":53,"offset":0,"shift":11,"w":27,"x":346,"y":57,}, - "124":{"character":124,"h":53,"offset":6,"shift":16,"w":20,"x":324,"y":57,}, - "125":{"character":125,"h":53,"offset":1,"shift":11,"w":26,"x":296,"y":57,}, - "126":{"character":126,"h":53,"offset":1,"shift":17,"w":31,"x":58,"y":332,}, - "9647":{"character":9647,"h":53,"offset":5,"shift":28,"w":34,"x":91,"y":332,}, + "33":{"character":33,"h":53,"offset":2,"shift":8,"w":21,"x":928,"y":167,}, + "34":{"character":34,"h":53,"offset":1,"shift":13,"w":26,"x":951,"y":167,}, + "35":{"character":35,"h":53,"offset":0,"shift":19,"w":35,"x":979,"y":167,}, + "36":{"character":36,"h":53,"offset":1,"shift":17,"w":31,"x":2,"y":222,}, + "37":{"character":37,"h":53,"offset":1,"shift":25,"w":39,"x":35,"y":222,}, + "38":{"character":38,"h":53,"offset":1,"shift":22,"w":37,"x":76,"y":222,}, + "39":{"character":39,"h":53,"offset":1,"shift":7,"w":21,"x":115,"y":222,}, + "40":{"character":40,"h":53,"offset":1,"shift":9,"w":24,"x":138,"y":222,}, + "41":{"character":41,"h":53,"offset":0,"shift":9,"w":24,"x":164,"y":222,}, + "42":{"character":42,"h":53,"offset":1,"shift":16,"w":30,"x":223,"y":222,}, + "43":{"character":43,"h":53,"offset":1,"shift":17,"w":31,"x":518,"y":222,}, + "44":{"character":44,"h":53,"offset":1,"shift":8,"w":21,"x":255,"y":222,}, + "45":{"character":45,"h":53,"offset":1,"shift":9,"w":24,"x":278,"y":222,}, + "46":{"character":46,"h":53,"offset":2,"shift":8,"w":21,"x":304,"y":222,}, + "47":{"character":47,"h":53,"offset":0,"shift":11,"w":28,"x":327,"y":222,}, + "48":{"character":48,"h":53,"offset":1,"shift":17,"w":31,"x":357,"y":222,}, + "49":{"character":49,"h":53,"offset":2,"shift":17,"w":25,"x":390,"y":222,}, + "50":{"character":50,"h":53,"offset":1,"shift":17,"w":31,"x":417,"y":222,}, + "51":{"character":51,"h":53,"offset":1,"shift":17,"w":31,"x":450,"y":222,}, + "52":{"character":52,"h":53,"offset":0,"shift":17,"w":33,"x":483,"y":222,}, + "53":{"character":53,"h":53,"offset":1,"shift":17,"w":31,"x":895,"y":167,}, + "54":{"character":54,"h":53,"offset":1,"shift":17,"w":31,"x":190,"y":222,}, + "55":{"character":55,"h":53,"offset":1,"shift":17,"w":31,"x":862,"y":167,}, + "56":{"character":56,"h":53,"offset":1,"shift":17,"w":31,"x":428,"y":167,}, + "57":{"character":57,"h":53,"offset":1,"shift":17,"w":31,"x":138,"y":167,}, + "58":{"character":58,"h":53,"offset":2,"shift":8,"w":21,"x":171,"y":167,}, + "59":{"character":59,"h":53,"offset":0,"shift":8,"w":22,"x":194,"y":167,}, + "60":{"character":60,"h":53,"offset":1,"shift":17,"w":31,"x":218,"y":167,}, + "61":{"character":61,"h":53,"offset":1,"shift":17,"w":31,"x":251,"y":167,}, + "62":{"character":62,"h":53,"offset":1,"shift":17,"w":31,"x":284,"y":167,}, + "63":{"character":63,"h":53,"offset":0,"shift":13,"w":29,"x":317,"y":167,}, + "64":{"character":64,"h":53,"offset":1,"shift":26,"w":40,"x":348,"y":167,}, + "65":{"character":65,"h":53,"offset":0,"shift":19,"w":36,"x":390,"y":167,}, + "66":{"character":66,"h":53,"offset":2,"shift":19,"w":32,"x":461,"y":167,}, + "67":{"character":67,"h":53,"offset":1,"shift":19,"w":33,"x":786,"y":167,}, + "68":{"character":68,"h":53,"offset":2,"shift":22,"w":34,"x":495,"y":167,}, + "69":{"character":69,"h":53,"offset":2,"shift":16,"w":29,"x":531,"y":167,}, + "70":{"character":70,"h":53,"offset":2,"shift":15,"w":29,"x":562,"y":167,}, + "71":{"character":71,"h":53,"offset":1,"shift":21,"w":35,"x":593,"y":167,}, + "72":{"character":72,"h":53,"offset":2,"shift":22,"w":34,"x":630,"y":167,}, + "73":{"character":73,"h":53,"offset":1,"shift":10,"w":25,"x":666,"y":167,}, + "74":{"character":74,"h":53,"offset":-3,"shift":9,"w":25,"x":693,"y":167,}, + "75":{"character":75,"h":53,"offset":2,"shift":19,"w":33,"x":720,"y":167,}, + "76":{"character":76,"h":53,"offset":2,"shift":16,"w":29,"x":755,"y":167,}, + "77":{"character":77,"h":53,"offset":2,"shift":27,"w":39,"x":821,"y":167,}, + "78":{"character":78,"h":53,"offset":2,"shift":23,"w":34,"x":551,"y":222,}, + "79":{"character":79,"h":53,"offset":1,"shift":23,"w":37,"x":587,"y":222,}, + "80":{"character":80,"h":53,"offset":2,"shift":18,"w":31,"x":626,"y":222,}, + "81":{"character":81,"h":53,"offset":1,"shift":23,"w":37,"x":413,"y":277,}, + "82":{"character":82,"h":53,"offset":2,"shift":19,"w":33,"x":452,"y":277,}, + "83":{"character":83,"h":53,"offset":1,"shift":16,"w":30,"x":487,"y":277,}, + "84":{"character":84,"h":53,"offset":0,"shift":17,"w":33,"x":519,"y":277,}, + "85":{"character":85,"h":53,"offset":2,"shift":22,"w":34,"x":554,"y":277,}, + "86":{"character":86,"h":53,"offset":0,"shift":18,"w":35,"x":590,"y":277,}, + "87":{"character":87,"h":53,"offset":0,"shift":28,"w":44,"x":627,"y":277,}, + "88":{"character":88,"h":53,"offset":0,"shift":18,"w":34,"x":673,"y":277,}, + "89":{"character":89,"h":53,"offset":0,"shift":17,"w":34,"x":709,"y":277,}, + "90":{"character":90,"h":53,"offset":1,"shift":17,"w":31,"x":745,"y":277,}, + "91":{"character":91,"h":53,"offset":2,"shift":10,"w":23,"x":778,"y":277,}, + "92":{"character":92,"h":53,"offset":0,"shift":11,"w":28,"x":803,"y":277,}, + "93":{"character":93,"h":53,"offset":0,"shift":10,"w":24,"x":833,"y":277,}, + "94":{"character":94,"h":53,"offset":1,"shift":17,"w":31,"x":859,"y":277,}, + "95":{"character":95,"h":53,"offset":-1,"shift":13,"w":30,"x":892,"y":277,}, + "96":{"character":96,"h":53,"offset":1,"shift":9,"w":23,"x":924,"y":277,}, + "97":{"character":97,"h":53,"offset":1,"shift":17,"w":30,"x":949,"y":277,}, + "98":{"character":98,"h":53,"offset":2,"shift":18,"w":31,"x":981,"y":277,}, + "99":{"character":99,"h":53,"offset":1,"shift":14,"w":29,"x":2,"y":332,}, + "100":{"character":100,"h":53,"offset":1,"shift":18,"w":31,"x":33,"y":332,}, + "101":{"character":101,"h":53,"offset":1,"shift":17,"w":31,"x":66,"y":332,}, + "102":{"character":102,"h":53,"offset":0,"shift":10,"w":28,"x":383,"y":277,}, + "103":{"character":103,"h":53,"offset":1,"shift":18,"w":31,"x":350,"y":277,}, + "104":{"character":104,"h":53,"offset":2,"shift":18,"w":31,"x":317,"y":277,}, + "105":{"character":105,"h":53,"offset":2,"shift":8,"w":20,"x":943,"y":222,}, + "106":{"character":106,"h":53,"offset":-2,"shift":8,"w":24,"x":659,"y":222,}, + "107":{"character":107,"h":53,"offset":2,"shift":16,"w":31,"x":685,"y":222,}, + "108":{"character":108,"h":53,"offset":2,"shift":8,"w":20,"x":718,"y":222,}, + "109":{"character":109,"h":53,"offset":2,"shift":28,"w":40,"x":740,"y":222,}, + "110":{"character":110,"h":53,"offset":2,"shift":18,"w":31,"x":782,"y":222,}, + "111":{"character":111,"h":53,"offset":1,"shift":18,"w":32,"x":815,"y":222,}, + "112":{"character":112,"h":53,"offset":2,"shift":18,"w":31,"x":849,"y":222,}, + "113":{"character":113,"h":53,"offset":1,"shift":18,"w":31,"x":882,"y":222,}, + "114":{"character":114,"h":53,"offset":2,"shift":12,"w":26,"x":915,"y":222,}, + "115":{"character":115,"h":53,"offset":1,"shift":14,"w":28,"x":965,"y":222,}, + "116":{"character":116,"h":53,"offset":0,"shift":11,"w":27,"x":288,"y":277,}, + "117":{"character":117,"h":53,"offset":2,"shift":18,"w":31,"x":2,"y":277,}, + "118":{"character":118,"h":53,"offset":0,"shift":15,"w":32,"x":35,"y":277,}, + "119":{"character":119,"h":53,"offset":0,"shift":24,"w":40,"x":69,"y":277,}, + "120":{"character":120,"h":53,"offset":0,"shift":16,"w":32,"x":111,"y":277,}, + "121":{"character":121,"h":53,"offset":0,"shift":15,"w":32,"x":145,"y":277,}, + "122":{"character":122,"h":53,"offset":1,"shift":14,"w":28,"x":179,"y":277,}, + "123":{"character":123,"h":53,"offset":0,"shift":11,"w":27,"x":209,"y":277,}, + "124":{"character":124,"h":53,"offset":6,"shift":16,"w":20,"x":238,"y":277,}, + "125":{"character":125,"h":53,"offset":1,"shift":11,"w":26,"x":260,"y":277,}, + "126":{"character":126,"h":53,"offset":1,"shift":17,"w":31,"x":105,"y":167,}, + "160":{"character":160,"h":53,"offset":0,"shift":8,"w":0,"x":103,"y":167,}, + "161":{"character":161,"h":53,"offset":2,"shift":8,"w":21,"x":80,"y":167,}, + "162":{"character":162,"h":53,"offset":2,"shift":17,"w":29,"x":470,"y":57,}, + "163":{"character":163,"h":53,"offset":1,"shift":17,"w":31,"x":821,"y":2,}, + "164":{"character":164,"h":53,"offset":1,"shift":17,"w":31,"x":854,"y":2,}, + "165":{"character":165,"h":53,"offset":0,"shift":17,"w":33,"x":887,"y":2,}, + "166":{"character":166,"h":53,"offset":6,"shift":16,"w":20,"x":922,"y":2,}, + "167":{"character":167,"h":53,"offset":1,"shift":15,"w":29,"x":944,"y":2,}, + "168":{"character":168,"h":53,"offset":4,"shift":17,"w":25,"x":975,"y":2,}, + "169":{"character":169,"h":53,"offset":1,"shift":24,"w":38,"x":2,"y":57,}, + "170":{"character":170,"h":53,"offset":0,"shift":11,"w":26,"x":42,"y":57,}, + "171":{"character":171,"h":53,"offset":1,"shift":16,"w":30,"x":70,"y":57,}, + "172":{"character":172,"h":53,"offset":1,"shift":17,"w":31,"x":127,"y":57,}, + "173":{"character":173,"h":53,"offset":1,"shift":9,"w":24,"x":444,"y":57,}, + "174":{"character":174,"h":53,"offset":1,"shift":24,"w":38,"x":160,"y":57,}, + "175":{"character":175,"h":53,"offset":-1,"shift":15,"w":32,"x":200,"y":57,}, + "176":{"character":176,"h":53,"offset":1,"shift":13,"w":27,"x":234,"y":57,}, + "177":{"character":177,"h":53,"offset":1,"shift":17,"w":31,"x":263,"y":57,}, + "178":{"character":178,"h":53,"offset":0,"shift":11,"w":26,"x":296,"y":57,}, + "179":{"character":179,"h":53,"offset":0,"shift":11,"w":26,"x":324,"y":57,}, + "180":{"character":180,"h":53,"offset":1,"shift":9,"w":23,"x":352,"y":57,}, + "181":{"character":181,"h":53,"offset":2,"shift":19,"w":31,"x":377,"y":57,}, + "182":{"character":182,"h":53,"offset":1,"shift":19,"w":32,"x":410,"y":57,}, + "183":{"character":183,"h":53,"offset":2,"shift":8,"w":21,"x":798,"y":2,}, + "184":{"character":184,"h":53,"offset":0,"shift":6,"w":23,"x":102,"y":57,}, + "185":{"character":185,"h":53,"offset":1,"shift":11,"w":23,"x":773,"y":2,}, + "186":{"character":186,"h":53,"offset":0,"shift":11,"w":27,"x":351,"y":2,}, + "187":{"character":187,"h":53,"offset":1,"shift":16,"w":30,"x":12,"y":2,}, + "188":{"character":188,"h":53,"offset":0,"shift":23,"w":39,"x":44,"y":2,}, + "189":{"character":189,"h":53,"offset":0,"shift":23,"w":39,"x":85,"y":2,}, + "190":{"character":190,"h":53,"offset":0,"shift":23,"w":40,"x":126,"y":2,}, + "191":{"character":191,"h":53,"offset":0,"shift":13,"w":29,"x":168,"y":2,}, + "192":{"character":192,"h":53,"offset":0,"shift":19,"w":36,"x":199,"y":2,}, + "193":{"character":193,"h":53,"offset":0,"shift":19,"w":36,"x":237,"y":2,}, + "194":{"character":194,"h":53,"offset":0,"shift":19,"w":36,"x":275,"y":2,}, + "195":{"character":195,"h":53,"offset":0,"shift":19,"w":36,"x":313,"y":2,}, + "196":{"character":196,"h":53,"offset":0,"shift":19,"w":36,"x":380,"y":2,}, + "197":{"character":197,"h":53,"offset":0,"shift":19,"w":36,"x":707,"y":2,}, + "198":{"character":198,"h":53,"offset":-1,"shift":26,"w":42,"x":418,"y":2,}, + "199":{"character":199,"h":53,"offset":1,"shift":19,"w":33,"x":462,"y":2,}, + "200":{"character":200,"h":53,"offset":2,"shift":16,"w":29,"x":497,"y":2,}, + "201":{"character":201,"h":53,"offset":2,"shift":16,"w":29,"x":528,"y":2,}, + "202":{"character":202,"h":53,"offset":2,"shift":16,"w":29,"x":559,"y":2,}, + "203":{"character":203,"h":53,"offset":2,"shift":16,"w":29,"x":590,"y":2,}, + "204":{"character":204,"h":53,"offset":0,"shift":10,"w":26,"x":621,"y":2,}, + "205":{"character":205,"h":53,"offset":1,"shift":10,"w":26,"x":649,"y":2,}, + "206":{"character":206,"h":53,"offset":-1,"shift":10,"w":28,"x":677,"y":2,}, + "207":{"character":207,"h":53,"offset":0,"shift":10,"w":26,"x":745,"y":2,}, + "208":{"character":208,"h":53,"offset":0,"shift":22,"w":36,"x":501,"y":57,}, + "209":{"character":209,"h":53,"offset":2,"shift":23,"w":34,"x":235,"y":112,}, + "210":{"character":210,"h":53,"offset":1,"shift":23,"w":37,"x":539,"y":57,}, + "211":{"character":211,"h":53,"offset":1,"shift":23,"w":37,"x":335,"y":112,}, + "212":{"character":212,"h":53,"offset":1,"shift":23,"w":37,"x":374,"y":112,}, + "213":{"character":213,"h":53,"offset":1,"shift":23,"w":37,"x":413,"y":112,}, + "214":{"character":214,"h":53,"offset":1,"shift":23,"w":37,"x":452,"y":112,}, + "215":{"character":215,"h":53,"offset":1,"shift":17,"w":30,"x":491,"y":112,}, + "216":{"character":216,"h":53,"offset":1,"shift":23,"w":37,"x":523,"y":112,}, + "217":{"character":217,"h":53,"offset":2,"shift":22,"w":34,"x":562,"y":112,}, + "218":{"character":218,"h":53,"offset":2,"shift":22,"w":34,"x":598,"y":112,}, + "219":{"character":219,"h":53,"offset":2,"shift":22,"w":34,"x":634,"y":112,}, + "220":{"character":220,"h":53,"offset":2,"shift":22,"w":34,"x":703,"y":112,}, + "221":{"character":221,"h":53,"offset":0,"shift":17,"w":34,"x":44,"y":167,}, + "222":{"character":222,"h":53,"offset":2,"shift":18,"w":31,"x":739,"y":112,}, + "223":{"character":223,"h":53,"offset":2,"shift":19,"w":32,"x":772,"y":112,}, + "224":{"character":224,"h":53,"offset":1,"shift":17,"w":30,"x":806,"y":112,}, + "225":{"character":225,"h":53,"offset":1,"shift":17,"w":30,"x":838,"y":112,}, + "226":{"character":226,"h":53,"offset":1,"shift":17,"w":30,"x":870,"y":112,}, + "227":{"character":227,"h":53,"offset":1,"shift":17,"w":30,"x":902,"y":112,}, + "228":{"character":228,"h":53,"offset":1,"shift":17,"w":30,"x":934,"y":112,}, + "229":{"character":229,"h":53,"offset":1,"shift":17,"w":30,"x":966,"y":112,}, + "230":{"character":230,"h":53,"offset":1,"shift":26,"w":40,"x":2,"y":167,}, + "231":{"character":231,"h":53,"offset":1,"shift":14,"w":29,"x":304,"y":112,}, + "232":{"character":232,"h":53,"offset":1,"shift":17,"w":31,"x":670,"y":112,}, + "233":{"character":233,"h":53,"offset":1,"shift":17,"w":31,"x":271,"y":112,}, + "234":{"character":234,"h":53,"offset":1,"shift":17,"w":31,"x":855,"y":57,}, + "235":{"character":235,"h":53,"offset":1,"shift":17,"w":31,"x":578,"y":57,}, + "236":{"character":236,"h":53,"offset":-1,"shift":8,"w":24,"x":611,"y":57,}, + "237":{"character":237,"h":53,"offset":2,"shift":8,"w":23,"x":637,"y":57,}, + "238":{"character":238,"h":53,"offset":-2,"shift":8,"w":28,"x":662,"y":57,}, + "239":{"character":239,"h":53,"offset":-1,"shift":8,"w":26,"x":692,"y":57,}, + "240":{"character":240,"h":53,"offset":1,"shift":18,"w":32,"x":720,"y":57,}, + "241":{"character":241,"h":53,"offset":2,"shift":18,"w":31,"x":754,"y":57,}, + "242":{"character":242,"h":53,"offset":1,"shift":18,"w":32,"x":787,"y":57,}, + "243":{"character":243,"h":53,"offset":1,"shift":18,"w":32,"x":821,"y":57,}, + "244":{"character":244,"h":53,"offset":1,"shift":18,"w":32,"x":888,"y":57,}, + "245":{"character":245,"h":53,"offset":1,"shift":18,"w":32,"x":201,"y":112,}, + "246":{"character":246,"h":53,"offset":1,"shift":18,"w":32,"x":922,"y":57,}, + "247":{"character":247,"h":53,"offset":1,"shift":17,"w":31,"x":956,"y":57,}, + "248":{"character":248,"h":53,"offset":1,"shift":18,"w":32,"x":989,"y":57,}, + "249":{"character":249,"h":53,"offset":2,"shift":18,"w":31,"x":2,"y":112,}, + "250":{"character":250,"h":53,"offset":2,"shift":18,"w":31,"x":35,"y":112,}, + "251":{"character":251,"h":53,"offset":2,"shift":18,"w":31,"x":68,"y":112,}, + "252":{"character":252,"h":53,"offset":2,"shift":18,"w":31,"x":101,"y":112,}, + "253":{"character":253,"h":53,"offset":0,"shift":15,"w":32,"x":134,"y":112,}, + "254":{"character":254,"h":53,"offset":2,"shift":18,"w":31,"x":168,"y":112,}, + "255":{"character":255,"h":53,"offset":0,"shift":15,"w":32,"x":99,"y":332,}, + "9647":{"character":9647,"h":53,"offset":5,"shift":28,"w":34,"x":133,"y":332,}, }, "hinting":0, "includeTTF":false, @@ -124,7 +220,7 @@ }, "pointRounding":0, "ranges":[ - {"lower":32,"upper":127,}, + {"lower":32,"upper":255,}, {"lower":9647,"upper":9647,}, ], "regenerateBitmap":false, diff --git a/fonts/_f_sdf_medium/_f_sdf_medium.png b/fonts/_f_sdf_medium/_f_sdf_medium.png index eb51d53be..8f4e71b16 100644 Binary files a/fonts/_f_sdf_medium/_f_sdf_medium.png and b/fonts/_f_sdf_medium/_f_sdf_medium.png differ diff --git a/fonts/_f_sdf_medium/_f_sdf_medium.yy b/fonts/_f_sdf_medium/_f_sdf_medium.yy index e82b42a20..aebbbfa82 100644 --- a/fonts/_f_sdf_medium/_f_sdf_medium.yy +++ b/fonts/_f_sdf_medium/_f_sdf_medium.yy @@ -216,7 +216,7 @@ "name":"_f_sdf_medium", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "pointRounding":0, "ranges":[ diff --git a/objects/_addon_custom/_addon_custom.yy b/objects/_addon_custom/_addon_custom.yy index 71a05d42c..4966a809f 100644 --- a/objects/_addon_custom/_addon_custom.yy +++ b/objects/_addon_custom/_addon_custom.yy @@ -13,7 +13,7 @@ "overriddenProperties":[], "parent":{ "name":"custom", - "path":"folders/addons/custom.yy", + "path":"folders/misc/addons/custom.yy", }, "parentObjectId":{ "name":"addon", diff --git a/objects/addon/addon.yy b/objects/addon/addon.yy index ce4cfabee..d3be6de1e 100644 --- a/objects/addon/addon.yy +++ b/objects/addon/addon.yy @@ -9,7 +9,7 @@ "overriddenProperties":[], "parent":{ "name":"addons", - "path":"folders/addons.yy", + "path":"folders/misc/addons.yy", }, "parentObjectId":null, "persistent":false, diff --git a/objects/addon_key_displayer/addon_key_displayer.yy b/objects/addon_key_displayer/addon_key_displayer.yy index ec549f861..2b27633ec 100644 --- a/objects/addon_key_displayer/addon_key_displayer.yy +++ b/objects/addon_key_displayer/addon_key_displayer.yy @@ -11,7 +11,7 @@ "overriddenProperties":[], "parent":{ "name":"key_displayer", - "path":"folders/addons/key_displayer.yy", + "path":"folders/misc/addons/key_displayer.yy", }, "parentObjectId":{ "name":"addon", diff --git a/objects/o_dialog_about/Draw_64.gml b/objects/o_dialog_about/Draw_64.gml index fcfcfb714..90211dc3d 100644 --- a/objects/o_dialog_about/Draw_64.gml +++ b/objects/o_dialog_about/Draw_64.gml @@ -11,11 +11,10 @@ if !ready exit; var ly = dialog_y + ui(96); draw_sprite_ui_uniform(THEME.icon_64, 0, cx, dialog_y + ui(56)); - draw_set_text(_f_ico_h5, fa_center, fa_top, COLORS._main_text_accent); - draw_text(cx, ly, "Pixel Composer"); - ly += string_height("l"); + draw_sprite_ui_uniform(s_title, 0, cx - ui(256 * .4), ly, .4); + ly += ui(32); - draw_set_font(f_p3); + draw_set_text(f_p3, fa_center, fa_top); draw_set_color(COLORS._main_text_sub); draw_text(cx, ly - ui(4), code_is_compiled()? "Native build" : "VM build"); ly += string_height("l"); diff --git a/objects/o_dialog_gradient/Create_0.gml b/objects/o_dialog_gradient/Create_0.gml index bf06dcd43..ac83e5903 100644 --- a/objects/o_dialog_gradient/Create_0.gml +++ b/objects/o_dialog_gradient/Create_0.gml @@ -22,11 +22,8 @@ event_inherited(); destroy_on_click_out = true; - sl_position = slider(0, 100, 0.1, function(val) { - if(!interactable) return; - if(key_selecting == noone) return; - setKeyPosition(key_selecting, val / 100); - }, function() { removeKeyOverlap(key_selecting); }).setLabel(__txt("Position")); + sl_position = slider(0, 100, 0.1, function(val) /*=>*/ { if(!interactable || key_selecting == noone) return; setKeyPosition(key_selecting, val / 100); }, + function() /*=>*/ {return removeKeyOverlap(key_selecting)}).setLabel(__txt("Position")); setColor = function(color) { if(key_selecting == noone) return; @@ -53,16 +50,12 @@ event_inherited(); previous_gradient = grad.clone(); } - b_cancel = button(function() { - onApply(previous_gradient); - instance_destroy(); - }).setIcon(THEME.undo, 0, COLORS._main_icon) - .setTooltip(__txtx("dialog_revert_and_exit", "Revert and exit")); + b_cancel = button(function() /*=>*/ { onApply(previous_gradient); instance_destroy(); }) + .setIcon(THEME.undo, 0, COLORS._main_icon) + .setTooltip(__txtx("dialog_revert_and_exit", "Revert and exit")); - b_apply = button(function() { - onApply(gradient); - instance_destroy(); - }).setIcon(THEME.accept, 0, COLORS._main_icon_dark); + b_apply = button(function() /*=>*/ { onApply(gradient); instance_destroy(); }) + .setIcon(THEME.accept, 0, COLORS._main_icon_dark); function setKeyPosition(key, position) { key.time = position; @@ -150,7 +143,6 @@ event_inherited(); return hh; }); - #endregion #region palette diff --git a/objects/o_dialog_gradient/Draw_64.gml b/objects/o_dialog_gradient/Draw_64.gml index db11d3ab8..f2549e116 100644 --- a/objects/o_dialog_gradient/Draw_64.gml +++ b/objects/o_dialog_gradient/Draw_64.gml @@ -273,7 +273,7 @@ draggable = true; sl_position.setFocusHover(sFOCUS, sHOVER); sl_position.register(); sl_position.setFont(f_p2); - sl_position.draw(op_x, op_y, ui(content_w - 40), ui(24), txt, mouse_ui); + sl_position.draw(op_x, op_y, content_w - ui(40), ui(24), txt, mouse_ui); #endregion #region selector diff --git a/objects/o_dialog_scrollbox/Create_0.gml b/objects/o_dialog_scrollbox/Create_0.gml index 592455a70..73ae552d8 100644 --- a/objects/o_dialog_scrollbox/Create_0.gml +++ b/objects/o_dialog_scrollbox/Create_0.gml @@ -147,7 +147,7 @@ event_inherited(); draw_sprite_ext(_txt, i, _dw / 2, _yy); } - if(_spr) draw_sprite_ext(_val.spr, _val.spr_ind, ui(8) + hght / 2, _yy, 1, 1, 0, _val.spr_blend, 1); + if(_spr) draw_sprite_ui(_val.spr, _val.spr_ind, ui(8) + hght / 2, _yy, 1, 1, 0, _val.spr_blend); _ly += hght; _h += hght; diff --git a/objects/o_dialog_scrollbox_horizontal/Create_0.gml b/objects/o_dialog_scrollbox_horizontal/Create_0.gml index aad493f71..2d45c3b15 100644 --- a/objects/o_dialog_scrollbox_horizontal/Create_0.gml +++ b/objects/o_dialog_scrollbox_horizontal/Create_0.gml @@ -216,7 +216,7 @@ event_inherited(); } else if(align == fa_left) draw_text_add(_tpad + _lx + (_spr != noone) * (_tpad * 2 + hght), _ly + hght / 2, _txt); - if(_spr) draw_sprite_ext(_val.spr, _val.spr_ind, _lx + ui(8) + hght / 2, _ly + hght / 2, 1, 1, 0, _val.spr_blend, 1); + if(_spr) draw_sprite_ui(_val.spr, _val.spr_ind, _lx + ui(8) + hght / 2, _ly + hght / 2, 1, 1, 0, _val.spr_blend); _ly += hght; _lh += hght; diff --git a/objects/o_dialog_splash/Draw_64.gml b/objects/o_dialog_splash/Draw_64.gml index 8d7b4abe5..57a55630f 100644 --- a/objects/o_dialog_splash/Draw_64.gml +++ b/objects/o_dialog_splash/Draw_64.gml @@ -8,8 +8,7 @@ if !ready exit; #region content draw_sprite_ui_uniform(THEME.icon_64, 0, dialog_x + ui(56), dialog_y + ui(56)); - draw_set_text(_f_ico_h5, fa_left, fa_bottom, COLORS._main_text_accent); - draw_text(dialog_x + ui(56 + 48), dialog_y + ui(56 + 4), "Pixel Composer"); + draw_sprite_ui_uniform(s_title, 0, dialog_x + ui(56 + 48 - 4), dialog_y + ui(56 + 4 - 32), .4); draw_set_text(f_p0, fa_left, fa_top, COLORS._main_text_sub); var bx = dialog_x + ui(56 + 48); diff --git a/pre_build_step.bat b/pre_build_step.bat index 3032b29cf..a202a96cd 100644 --- a/pre_build_step.bat +++ b/pre_build_step.bat @@ -1,3 +1,3 @@ py "%~dp0datafiles/Shaders/shader_replace.py" -C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe "%~dp0datafiles/data/Nodes/Update.ps1" -C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe "D:/Project/MakhamDev/LTS-PixelComposer/RESOURCE/data/Update.ps1" \ No newline at end of file +py "D:/Project/MakhamDev/LTS-PixelComposer/PixelComposer/datafiles/data/Nodes/update.py" +py "D:/Project/MakhamDev/LTS-PixelComposer/RESOURCE/data/update.py" \ No newline at end of file diff --git a/scripts/__initAddon/__initAddon.yy b/scripts/__initAddon/__initAddon.yy index bf8826940..7cfc83676 100644 --- a/scripts/__initAddon/__initAddon.yy +++ b/scripts/__initAddon/__initAddon.yy @@ -6,7 +6,7 @@ "name":"__initAddon", "parent":{ "name":"custom", - "path":"folders/addons/custom.yy", + "path":"folders/misc/addons/custom.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/addonPanel/addonPanel.yy b/scripts/addonPanel/addonPanel.yy index fb227cad6..0db5c9be5 100644 --- a/scripts/addonPanel/addonPanel.yy +++ b/scripts/addonPanel/addonPanel.yy @@ -6,7 +6,7 @@ "name":"addonPanel", "parent":{ "name":"custom", - "path":"folders/addons/custom.yy", + "path":"folders/misc/addons/custom.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/addon_function/addon_function.yy b/scripts/addon_function/addon_function.yy index 5d7692052..74eefdf38 100644 --- a/scripts/addon_function/addon_function.yy +++ b/scripts/addon_function/addon_function.yy @@ -6,7 +6,7 @@ "name":"addon_function", "parent":{ "name":"custom", - "path":"folders/addons/custom.yy", + "path":"folders/misc/addons/custom.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/addon_lua_constant/addon_lua_constant.yy b/scripts/addon_lua_constant/addon_lua_constant.yy index 5137e265a..2450fd70a 100644 --- a/scripts/addon_lua_constant/addon_lua_constant.yy +++ b/scripts/addon_lua_constant/addon_lua_constant.yy @@ -6,7 +6,7 @@ "name":"addon_lua_constant", "parent":{ "name":"custom", - "path":"folders/addons/custom.yy", + "path":"folders/misc/addons/custom.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/addon_lua_function/addon_lua_function.yy b/scripts/addon_lua_function/addon_lua_function.yy index d14db8060..b6cbcb7eb 100644 --- a/scripts/addon_lua_function/addon_lua_function.yy +++ b/scripts/addon_lua_function/addon_lua_function.yy @@ -6,7 +6,7 @@ "name":"addon_lua_function", "parent":{ "name":"custom", - "path":"folders/addons/custom.yy", + "path":"folders/misc/addons/custom.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/addon_lua_widget/addon_lua_widget.yy b/scripts/addon_lua_widget/addon_lua_widget.yy index 0b244ec55..462883b0e 100644 --- a/scripts/addon_lua_widget/addon_lua_widget.yy +++ b/scripts/addon_lua_widget/addon_lua_widget.yy @@ -6,7 +6,7 @@ "name":"addon_lua_widget", "parent":{ "name":"custom", - "path":"folders/addons/custom.yy", + "path":"folders/misc/addons/custom.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/font_loader/font_loader.gml b/scripts/font_loader/font_loader.gml index 450806524..e29634ae8 100644 --- a/scripts/font_loader/font_loader.gml +++ b/scripts/font_loader/font_loader.gml @@ -211,7 +211,9 @@ function loadFonts() { f_p1 = _font_load_from_struct(fontDef, "p1", _f_p1); f_p1b = _font_load_from_struct(fontDef, "p1b", _f_p1b); - f_p2 = _font_load_from_struct(fontDef, "p2", _f_p2); + f_p2 = _font_load_from_struct(fontDef, "p2", _f_p2); + f_p2b = _font_load_from_struct(fontDef, "p2b", _f_p2b); + f_p3 = _font_load_from_struct(fontDef, "p3", _f_p3); f_p4 = _font_load_from_struct(fontDef, "p4", _f_p4); diff --git a/scripts/font_loader/font_loader.yy b/scripts/font_loader/font_loader.yy index 9435dcfdd..a6edb419b 100644 --- a/scripts/font_loader/font_loader.yy +++ b/scripts/font_loader/font_loader.yy @@ -6,7 +6,7 @@ "name":"font_loader", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/font_sprite_loader/font_sprite_loader.yy b/scripts/font_sprite_loader/font_sprite_loader.yy index 54c8816a2..17c93597c 100644 --- a/scripts/font_sprite_loader/font_sprite_loader.yy +++ b/scripts/font_sprite_loader/font_sprite_loader.yy @@ -6,7 +6,7 @@ "name":"font_sprite_loader", "parent":{ "name":"font", - "path":"folders/sprites/font.yy", + "path":"folders/font.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_ase_tag/node_ase_tag.gml b/scripts/node_ase_tag/node_ase_tag.gml index 8fb85774b..040eec557 100644 --- a/scripts/node_ase_tag/node_ase_tag.gml +++ b/scripts/node_ase_tag/node_ase_tag.gml @@ -45,8 +45,7 @@ function Node_ASE_Tag(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[1].setValue(tName); } - if(tName == _tag) - cc = COLORS._main_text_accent; + if(tName == _tag) cc = COLORS._main_text_accent; draw_set_text(f_p2, fa_left, fa_center, cc); draw_text_add(_bx + ui(16), _yy + hh / 2, tName); @@ -113,7 +112,6 @@ function Node_ASE_Tag(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c } surface_set_shader(_outSurf); - DRAW_CLEAR draw_surface_safe(temp_surface[!bg]); surface_reset_shader(); diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index d8cbeb83c..510168be9 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -1629,10 +1629,11 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { if(_name == "") return; draw_name = true; + var _si = _s// / UI_SCALE; var aa = (.25 + .5 * renderActive) * (.25 + .75 * isHighlightingInGraph()); var cc = getColor(); - var nh = previewable? name_height * _s : h * _s; + var nh = previewable? name_height * _si : h * _si; var ba = aa; if(_panel && _panel.node_hovering == self) ba = .1; @@ -1644,21 +1645,21 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { aa += 0.25; - var tx = xx + 6 * _s; - var tw = w * _s - 8 * _s; + var tx = xx + 6 * _si; + var tw = w * _s - 8 * _si; if(_panel && _panel.is_searching && _panel.search_string != "" && search_match == -9999) aa *= .15; if(icon) { - tx += _s * 6; - draw_sprite_ui_uniform(icon, 0, round(tx) + 1, round(yy + nh / 2) + 1, _s, c_black, 1); - draw_sprite_ui_uniform(icon, 0, round(tx), round(yy + nh / 2), _s, icon_blend, 1); - tx += _s * 12; - tw -= _s * (12 + 6); + tx += _si * 6; + draw_sprite_ui_uniform(icon, 0, round(tx) + 1, round(yy + nh / 2) + 1, _si, c_black, 1); + draw_sprite_ui_uniform(icon, 0, round(tx), round(yy + nh / 2), _si, icon_blend, 1); + tx += _si * 12; + tw -= _si * (12 + 6); } - var _ts = _s * 0.275; + var _ts = _si * 0.275; var _tx = round(tx); var _ty = round(yy + nh / 2 + 1); diff --git a/scripts/panel_animation/panel_animation.gml b/scripts/panel_animation/panel_animation.gml index c0819cdd0..0f0ec7c36 100644 --- a/scripts/panel_animation/panel_animation.gml +++ b/scripts/panel_animation/panel_animation.gml @@ -2701,7 +2701,7 @@ function Panel_Animation() : PanelContent() constructor { } function drawContent(panel) { // >>>>>>>>>>>>>>>>>>>> MAIN DRAW <<<<<<<<<<<<<<<<<<<< - draw_clear_alpha(COLORS.panel_bg_clear, 0); + draw_clear_alpha(COLORS.panel_bg_clear, 1); if(!PROJECT.active) return; if(tool_width_drag) { diff --git a/scripts/preview_overlay_area/preview_overlay_area.gml b/scripts/preview_overlay_area/preview_overlay_area.gml index e65b708b8..4de5d5801 100644 --- a/scripts/preview_overlay_area/preview_overlay_area.gml +++ b/scripts/preview_overlay_area/preview_overlay_area.gml @@ -34,6 +34,8 @@ function preview_overlay_area_padding(interact, active, _x, _y, _s, _mx, _my, _s var drawPos = _flag & 0b0001; var drawSize = _flag & 0b0010; + var _rr = ui(16); + if(drawSize) { draw_set_color(COLORS._main_accent); draw_set_circle_precision(32); @@ -75,7 +77,7 @@ function preview_overlay_area_padding(interact, active, _x, _y, _s, _mx, _my, _s } } - if(drawSize && point_in_circle(_mx, _my, xc, y0, 16)) { + if(drawSize && point_in_circle(_mx, _my, xc, y0, _rr)) { _hov[0] = 1; hover = 1; @@ -84,7 +86,7 @@ function preview_overlay_area_padding(interact, active, _x, _y, _s, _mx, _my, _s drag_sy = _t; drag_my = _my; } - } else if(drawSize && point_in_circle(_mx, _my, xc, y1, 16)) { + } else if(drawSize && point_in_circle(_mx, _my, xc, y1, _rr)) { _hov[1] = 1; hover = 3; @@ -93,7 +95,7 @@ function preview_overlay_area_padding(interact, active, _x, _y, _s, _mx, _my, _s drag_sy = _b; drag_my = _my; } - } else if(drawSize && point_in_circle(_mx, _my, x0, yc, 16)) { + } else if(drawSize && point_in_circle(_mx, _my, x0, yc, _rr)) { _hov[2] = 1; hover = 0; @@ -102,7 +104,7 @@ function preview_overlay_area_padding(interact, active, _x, _y, _s, _mx, _my, _s drag_sx = _l; drag_mx = _mx; } - } else if(drawSize && point_in_circle(_mx, _my, x1, yc, 16)) { + } else if(drawSize && point_in_circle(_mx, _my, x1, yc, _rr)) { _hov[3] = 1; hover = 2; @@ -118,15 +120,12 @@ function preview_overlay_area_padding(interact, active, _x, _y, _s, _mx, _my, _s __overlay_hover[i] = lerp_float(__overlay_hover[i], _hov[i], 4); if(drawSize) { - if(drag_type == 0 || drag_type == 2) draw_anchor_line(__overlay_hover[0], xc, y0, 16, 0); - if(drag_type == 0 || drag_type == 4) draw_anchor_line(__overlay_hover[1], xc, y1, 16, 0); - if(drag_type == 0 || drag_type == 3) draw_anchor_line(__overlay_hover[2], x0, yc, 16, 90); - if(drag_type == 0 || drag_type == 1) draw_anchor_line(__overlay_hover[3], x1, yc, 16, 90); + if(drag_type == 0 || drag_type == 2) draw_anchor_line(__overlay_hover[0], xc, y0, _rr, 0); + if(drag_type == 0 || drag_type == 4) draw_anchor_line(__overlay_hover[1], xc, y1, _rr, 0); + if(drag_type == 0 || drag_type == 3) draw_anchor_line(__overlay_hover[2], x0, yc, _rr, 90); + if(drag_type == 0 || drag_type == 1) draw_anchor_line(__overlay_hover[3], x1, yc, _rr, 90); } - //draw_set_text(_f_p2b, fa_center, fa_center, COLORS._main_accent); - //draw_text_add((x0 + x1) / 2, (y0 + y1) / 2, name); - return hover; } @@ -165,7 +164,7 @@ function preview_overlay_area_two_point(interact, active, _x, _y, _s, _mx, _my, } var _hov = [ 0, 0, 0 ]; - var _r = 10; + var _r = ui(10); if(interact) { if(drag_type) { @@ -227,7 +226,7 @@ function preview_overlay_area_two_point(interact, active, _x, _y, _s, _mx, _my, } } - if(drawSize && point_in_circle(_mx, _my, x0, y0, 8)) { + if(drawSize && point_in_circle(_mx, _my, x0, y0, ui(8))) { _hov[1] = 1; hover = 1; @@ -238,7 +237,7 @@ function preview_overlay_area_two_point(interact, active, _x, _y, _s, _mx, _my, drag_mx = _mx; drag_my = _my; } - } else if(drawSize && point_in_circle(_mx, _my, x1, y1, 8)) { + } else if(drawSize && point_in_circle(_mx, _my, x1, y1, ui(8))) { _hov[2] = 1; hover = 2; @@ -266,13 +265,13 @@ function preview_overlay_area_two_point(interact, active, _x, _y, _s, _mx, _my, for( var i = 0; i < 3; i++ ) __overlay_hover[i] = lerp_float(__overlay_hover[i], _hov[i], 4); - if(drawPos && (drag_type == 0 || drag_type == 3)) draw_anchor_cross(__overlay_hover[0], xc, yc, _r + 4); + if(drawPos && (drag_type == 0 || drag_type == 3)) draw_anchor_cross(__overlay_hover[0], xc, yc, _r + ui(4)); if(drawSize) { if(drag_type == 0 || drag_type == 1) draw_anchor(__overlay_hover[1], x0, y0, _r); if(drag_type == 0 || drag_type == 2) draw_anchor(__overlay_hover[2], x1, y1, _r); } - //draw_set_text(_f_p2b, fa_center, fa_center, COLORS._main_accent); + //draw_set_text(f_p2b, fa_center, fa_center, COLORS._main_accent); //draw_text_add((x0 + x1) / 2, (y0 + y1) / 2 - 4, name); return hover; @@ -307,7 +306,7 @@ function preview_overlay_area_span(interact, active, _x, _y, _s, _mx, _my, _snx, } var _hov = [ 0, 0 ]; - var _r = 10; + var _r = ui(10); if(point_in_circle(_mx, _my, _ax + _aw, _ay + _ah, _r)) _hov[1] = 1; @@ -317,7 +316,7 @@ function preview_overlay_area_span(interact, active, _x, _y, _s, _mx, _my, _snx, __overlay_hover[0] = lerp_float(__overlay_hover[0], _hov[0], 4); __overlay_hover[1] = lerp_float(__overlay_hover[1], _hov[1], 4); - if((drag_type == 0 || drag_type == 1) && drawPos) draw_anchor_cross(__overlay_hover[0], _ax, _ay, _r + 4); + if((drag_type == 0 || drag_type == 1) && drawPos) draw_anchor_cross(__overlay_hover[0], _ax, _ay, _r + ui(4)); if((drag_type == 0 || drag_type == 2) && drawSize) draw_anchor(__overlay_hover[1], _ax + _aw, _ay + _ah, _r); if(!interact) return -1; @@ -377,7 +376,7 @@ function preview_overlay_area_span(interact, active, _x, _y, _s, _mx, _my, _snx, } } - if(drawSize && point_in_circle(_mx, _my, _ax + _aw, _ay + _ah, 8)) { + if(drawSize && point_in_circle(_mx, _my, _ax + _aw, _ay + _ah, ui(8))) { hover = 2; if(mouse_press(mb_left, active)) { diff --git a/scripts/preview_overlay_gradient_range/preview_overlay_gradient_range.gml b/scripts/preview_overlay_gradient_range/preview_overlay_gradient_range.gml index ecd5a5da3..639f86e22 100644 --- a/scripts/preview_overlay_gradient_range/preview_overlay_gradient_range.gml +++ b/scripts/preview_overlay_gradient_range/preview_overlay_gradient_range.gml @@ -21,7 +21,7 @@ function preview_overlay_gradient_range(interact, active, _x, _y, _s, _mx, _my, var _ay1 = __y1 * _s + _y; var cc = COLORS.labels[2]; - var _r = 10; + var _r = ui(10); __overlay_hover = array_verify(__overlay_hover, 2); if(surface_exists(_surf) && (__overlay_hover[0] > 0 || __overlay_hover[1] > 0)) @@ -44,11 +44,11 @@ function preview_overlay_gradient_range(interact, active, _x, _y, _s, _mx, _my, var dir = point_direction(tx0, ty0, tx1, ty1); var dis = point_distance( tx0, ty0, tx1, ty1); - draw_set_text(_f_p2b, fa_center, fa_center, cc); - var txt = string_cut(mappedJunc.name, dis - 16); + draw_set_text(f_p2b, fa_center, fa_center, cc); + var txt = string_cut(mappedJunc.name, dis - ui(16)); draw_text_transformed((tx0 + tx1) / 2, (ty0 + ty1) / 2, txt, 1, 1, dir); - var _tw = string_width(txt) + 16; + var _tw = string_width(txt) + ui(16); draw_set_color(cc); draw_line_round(tx0, ty0, tx0 + lengthdir_x(dis / 2 - _tw / 2, dir), ty0 + lengthdir_y(dis / 2 - _tw / 2, dir), 2); @@ -81,7 +81,7 @@ function preview_overlay_gradient_range(interact, active, _x, _y, _s, _mx, _my, } } else if(interact && active) { - if(point_in_circle(_mx, _my, _ax0, _ay0, 8)) { + if(point_in_circle(_mx, _my, _ax0, _ay0, ui(8))) { d0 = true; hover = 1; @@ -92,7 +92,7 @@ function preview_overlay_gradient_range(interact, active, _x, _y, _s, _mx, _my, drag_sx = _ax0; drag_sy = _ay0; } - } else if(point_in_circle(_mx, _my, _ax1, _ay1, 8)) { + } else if(point_in_circle(_mx, _my, _ax1, _ay1, ui(8))) { d1 = true; hover = 2; diff --git a/scripts/preview_overlay_puppet/preview_overlay_puppet.gml b/scripts/preview_overlay_puppet/preview_overlay_puppet.gml index a976130bc..b426628b5 100644 --- a/scripts/preview_overlay_puppet/preview_overlay_puppet.gml +++ b/scripts/preview_overlay_puppet/preview_overlay_puppet.gml @@ -25,7 +25,7 @@ function preview_overlay_puppet(interact, active, _x, _y, _s, _mx, _my, _snx, _s draw_sprite_colored(THEME.anchor_selector, 0, _ax, _ay); draw_sprite_colored(THEME.anchor_selector, 2, _ax1, _ay1); - if(point_in_circle(_mx, _my, _ax + __wd * _s, _ay, 8)) { + if(point_in_circle(_mx, _my, _ax + __wd * _s, _ay, ui(8))) { hover = 3; draw_sprite_colored(THEME.anchor_scale_hori, 1, _ax + __wd * _s, _ay); if(mouse_press(mb_left, active)) { @@ -64,7 +64,7 @@ function preview_overlay_puppet(interact, active, _x, _y, _s, _mx, _my, _snx, _s draw_line(_l1x0, _l1y0, _l1x1, _l1y1); draw_sprite_colored(THEME.anchor_selector, 0, _ax, _ay); - if(point_in_circle(_mx, _my, _l0x, _l0y, 8)) { + if(point_in_circle(_mx, _my, _l0x, _l0y, ui(8))) { hover = 4; draw_sprite_colored(THEME.anchor_scale_hori, 1, _l0x, _l0y,, dir + 90); if(mouse_press(mb_left, active)) { @@ -75,7 +75,7 @@ function preview_overlay_puppet(interact, active, _x, _y, _s, _mx, _my, _snx, _s } else draw_sprite_colored(THEME.anchor_scale_hori, drag_type == 4, _l0x, _l0y,, dir + 90); - if(point_in_circle(_mx, _my, _lx, _ly, 8)) { + if(point_in_circle(_mx, _my, _lx, _ly, ui(8))) { hover = 5; draw_sprite_colored(THEME.anchor_scale_hori, 1, _lx, _ly,, dir); if(mouse_press(mb_left, active)) { @@ -89,7 +89,7 @@ function preview_overlay_puppet(interact, active, _x, _y, _s, _mx, _my, _snx, _s var rx = _ax + lengthdir_x(64, dir + 45); var ry = _ay + lengthdir_y(64, dir + 45); - if(point_in_circle(_mx, _my, rx, ry, 8)) { + if(point_in_circle(_mx, _my, rx, ry, ui(8))) { draw_set_color(COLORS._main_accent); draw_circle_prec(_ax, _ay, 64, true); @@ -175,7 +175,7 @@ function preview_overlay_puppet(interact, active, _x, _y, _s, _mx, _my, _snx, _s } } - if(interact && active && point_in_circle(_mx, _my, _ax, _ay, 8)) { + if(interact && active && point_in_circle(_mx, _my, _ax, _ay, ui(8))) { hover = 1; draw_sprite_colored(THEME.anchor_selector, 1, _ax, _ay); if(mouse_press(mb_left, active)) { @@ -189,7 +189,7 @@ function preview_overlay_puppet(interact, active, _x, _y, _s, _mx, _my, _snx, _s var _mode = _val[PUPPET_CONTROL.mode]; - if(interact && active && (_mode == PUPPET_FORCE_MODE.move || _mode == PUPPET_FORCE_MODE.puppet) && point_in_circle(_mx, _my, _ax1, _ay1, 8)) { + if(interact && active && (_mode == PUPPET_FORCE_MODE.move || _mode == PUPPET_FORCE_MODE.puppet) && point_in_circle(_mx, _my, _ax1, _ay1, ui(8))) { hover = 2; draw_sprite_colored(THEME.anchor_selector, 0, _ax1, _ay1); diff --git a/scripts/preview_overlay_rotation/preview_overlay_rotation.gml b/scripts/preview_overlay_rotation/preview_overlay_rotation.gml index 3f0ecb60f..f6c567029 100644 --- a/scripts/preview_overlay_rotation/preview_overlay_rotation.gml +++ b/scripts/preview_overlay_rotation/preview_overlay_rotation.gml @@ -6,7 +6,7 @@ function preview_overlay_rotation(interact, active, _x, _y, _s, _mx, _my, _snx, var _ax = _x + lengthdir_x(_rad, _val); var _ay = _y + lengthdir_y(_rad, _val); var index = 0; - var _r = 10; + var _r = ui(10); if(drag_type) { index = 1; @@ -52,15 +52,15 @@ function preview_overlay_rotation(interact, active, _x, _y, _s, _mx, _my, _snx, shader_set_f("index", __overlay_hover[0]); shader_set_f("angle", degtorad(_val + 90)); - var _arx = _x + lengthdir_x(_rad - 4, _val); - var _ary = _y + lengthdir_y(_rad - 4, _val); + var _arx = _x + lengthdir_x(_rad - ui(4), _val); + var _ary = _y + lengthdir_y(_rad - ui(4), _val); draw_sprite_stretched(s_fx_pixel, 0, _arx - _r * 2, _ary - _r * 2, _r * 4, _r * 4); shader_reset(); //draw_sprite_colored(THEME.anchor_rotate, index, _ax, _ay, 1, _val - 90); - draw_set_text(_f_p2b, fa_center, fa_bottom, COLORS._main_accent); - draw_text_add(round(_ax), round(_ay - 4), name); + draw_set_text(f_p2b, fa_center, fa_bottom, COLORS._main_accent); + draw_text_add(round(_ax), round(_ay - ui(4)), name); return hover; } \ No newline at end of file diff --git a/scripts/preview_overlay_scalar/preview_overlay_scalar.gml b/scripts/preview_overlay_scalar/preview_overlay_scalar.gml index c207dd129..280a1cf5f 100644 --- a/scripts/preview_overlay_scalar/preview_overlay_scalar.gml +++ b/scripts/preview_overlay_scalar/preview_overlay_scalar.gml @@ -4,9 +4,9 @@ function preview_overlay_scalar(interact, active, _x, _y, _s, _mx, _my, _snx, _s if(!is_real(_val)) return hover; var index = 0; - var __ax = lengthdir_x(_val * _scale, _angle); - var __ay = lengthdir_y(_val * _scale, _angle); - var _r = 10; + var __ax = lengthdir_x(_val * _scale, _angle); + var __ay = lengthdir_y(_val * _scale, _angle); + var _r = ui(10); var _ax = _x + __ax * _s; var _ay = _y + __ay * _s; @@ -48,12 +48,12 @@ function preview_overlay_scalar(interact, active, _x, _y, _s, _mx, _my, _snx, _s if(overlay_draw_text) { if(overlay_text_valign == fa_top) { - draw_set_text(_f_p2b, fa_center, fa_bottom, COLORS._main_accent); - draw_text_add(round(_ax), round(_ay - 4), name); + draw_set_text(f_p2b, fa_center, fa_bottom, COLORS._main_accent); + draw_text_add(round(_ax), round(_ay - ui(4)), name); } else if(overlay_text_valign == fa_bottom) { - draw_set_text(_f_p2b, fa_center, fa_top, COLORS._main_accent); - draw_text_add(round(_ax), round(_ay + 4), name); + draw_set_text(f_p2b, fa_center, fa_top, COLORS._main_accent); + draw_text_add(round(_ax), round(_ay + ui(4)), name); } } diff --git a/scripts/preview_overlay_vector/preview_overlay_vector.gml b/scripts/preview_overlay_vector/preview_overlay_vector.gml index a4d710f92..760a3bab2 100644 --- a/scripts/preview_overlay_vector/preview_overlay_vector.gml +++ b/scripts/preview_overlay_vector/preview_overlay_vector.gml @@ -6,7 +6,7 @@ function preview_overlay_vector(interact, active, _x, _y, _s, _mx, _my, _snx, _s var __ax = _val[0]; var __ay = _val[1]; - var _r = 10; + var _r = ui(10); var _ax = __ax * _s * _scale[0] + _x; var _ay = __ay * _s * _scale[1] + _y; @@ -68,8 +68,8 @@ function preview_overlay_vector(interact, active, _x, _y, _s, _mx, _my, _snx, _s draw_anchor(__overlay_hover[0], _ax, _ay, _r, _type); if(overlay_draw_text) { - draw_set_text(_f_p2b, fa_center, fa_bottom, COLORS._main_accent); - draw_text_add(round(_ax), round(_ay - 4), name); + draw_set_text(f_p2b, fa_center, fa_bottom, COLORS._main_accent); + draw_text_add(round(_ax), round(_ay - ui(4)), name); } return hover; diff --git a/scripts/scrollBox/scrollBox.gml b/scripts/scrollBox/scrollBox.gml index 6dff16e67..ad7406bb6 100644 --- a/scripts/scrollBox/scrollBox.gml +++ b/scripts/scrollBox/scrollBox.gml @@ -171,7 +171,7 @@ function scrollBox(_data, _onModify, update_hover = true) : widget() constructor } } - if(_spr) draw_sprite_ext(_selVal.spr, _selVal.spr_ind, _x + ui(16) * _sps, _yc, _sps, _sps, 0, _selVal.spr_blend, 1); + if(_spr) draw_sprite_ui(_selVal.spr, _selVal.spr_ind, _x + ui(16) * _sps, _yc, _sps, _sps, 0, _selVal.spr_blend); if(type == 0) draw_sprite_ui_uniform(arrow_spr, arrow_ind, _x1 + _arw / 2, _yc, _ars, COLORS._main_icon, 0.5 + 0.5 * interactable); if(type == 1) draw_sprite_ui_uniform(arrow_spr, arrow_ind, _tx1 + ui(16), _yc, _ars, COLORS._main_icon, 0.5 + 0.5 * interactable); diff --git a/shaders/sh_displace/sh_displace.fsh b/shaders/sh_displace/sh_displace.fsh index b83e53afd..1cdd8fbb9 100644 --- a/shaders/sh_displace/sh_displace.fsh +++ b/shaders/sh_displace/sh_displace.fsh @@ -124,8 +124,10 @@ vec2 shiftMap(in vec2 pos, in float str) { vec2 _disp; if(mode == 0) { - _str = (bright(disP) - middle) * str; - sam_pos = pos + _str * raw_displace; + _str = (bright(disP) - middle) * str; + _disp = _str * raw_displace; + + sam_pos = pos + _disp; } else if(mode == 1) { if(sepAxis == 0) diff --git a/sprites/s_key_display_mouse/s_key_display_mouse.yy b/sprites/s_key_display_mouse/s_key_display_mouse.yy index 5434746fd..649644062 100644 --- a/sprites/s_key_display_mouse/s_key_display_mouse.yy +++ b/sprites/s_key_display_mouse/s_key_display_mouse.yy @@ -29,7 +29,7 @@ "origin":8, "parent":{ "name":"key_displayer", - "path":"folders/addons/key_displayer.yy", + "path":"folders/misc/addons/key_displayer.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", diff --git a/sprites/s_title/67b8add1-6506-4095-9a04-98fd540eed49.png b/sprites/s_title/67b8add1-6506-4095-9a04-98fd540eed49.png new file mode 100644 index 000000000..56c75600c Binary files /dev/null and b/sprites/s_title/67b8add1-6506-4095-9a04-98fd540eed49.png differ diff --git a/sprites/s_title/layers/67b8add1-6506-4095-9a04-98fd540eed49/ee62e2c9-dd7d-4e0a-8784-2ccd0b6c31dd.png b/sprites/s_title/layers/67b8add1-6506-4095-9a04-98fd540eed49/ee62e2c9-dd7d-4e0a-8784-2ccd0b6c31dd.png new file mode 100644 index 000000000..56c75600c Binary files /dev/null and b/sprites/s_title/layers/67b8add1-6506-4095-9a04-98fd540eed49/ee62e2c9-dd7d-4e0a-8784-2ccd0b6c31dd.png differ diff --git a/sprites/s_title/s_title.yy b/sprites/s_title/s_title.yy new file mode 100644 index 000000000..61e621f04 --- /dev/null +++ b/sprites/s_title/s_title.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"", + "%Name":"s_title", + "bboxMode":0, + "bbox_bottom":70, + "bbox_left":13, + "bbox_right":500, + "bbox_top":10, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"67b8add1-6506-4095-9a04-98fd540eed49","name":"67b8add1-6506-4095-9a04-98fd540eed49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":80, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"ee62e2c9-dd7d-4e0a-8784-2ccd0b6c31dd","blendMode":0,"displayName":"default","isLocked":false,"name":"ee62e2c9-dd7d-4e0a-8784-2ccd0b6c31dd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_title", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"meta", + "path":"folders/sprites/meta.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_title", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_title", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67b8add1-6506-4095-9a04-98fd540eed49","path":"sprites/s_title/s_title.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a92b52d0-7e35-4ee3-a9e0-528bc73e6ea8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":512, +} \ No newline at end of file