diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order
index 288a0dc5e..8d5943666 100644
--- a/PixelComposer.resource_order
+++ b/PixelComposer.resource_order
@@ -117,6 +117,7 @@
{"name":"overlay","order":2,"path":"folders/panels/preview/overlay.yy",},
{"name":"sprites","order":3,"path":"folders/panels/preview/sprites.yy",},
{"name":"shader","order":8,"path":"folders/shader.yy",},
+ {"name":"_helper","order":49,"path":"folders/shader/_helper.yy",},
{"name":"3d","order":29,"path":"folders/shader/3d.yy",},
{"name":"blend","order":18,"path":"folders/shader/blend.yy",},
{"name":"blur","order":38,"path":"folders/shader/blur.yy",},
@@ -127,6 +128,7 @@
{"name":"flood fill","order":47,"path":"folders/shader/flood fill.yy",},
{"name":"generator","order":19,"path":"folders/shader/generator.yy",},
{"name":"mask","order":45,"path":"folders/shader/mask.yy",},
+ {"name":"misc","order":50,"path":"folders/shader/misc.yy",},
{"name":"shape seperator","order":35,"path":"folders/shader/shape seperator.yy",},
{"name":"sprites","order":20,"path":"folders/shader/sprites.yy",},
{"name":"warp","order":41,"path":"folders/shader/warp.yy",},
@@ -141,7 +143,7 @@
{"name":"node_time_remap","order":3,"path":"scripts/node_time_remap/node_time_remap.yy",},
{"name":"sh_perlin","order":1,"path":"shaders/sh_perlin/sh_perlin.yy",},
{"name":"node_tool","order":10,"path":"scripts/node_tool/node_tool.yy",},
- {"name":"sh_find_pixel","order":46,"path":"shaders/sh_find_pixel/sh_find_pixel.yy",},
+ {"name":"sh_find_pixel","order":3,"path":"shaders/sh_find_pixel/sh_find_pixel.yy",},
{"name":"panel_preview_window","order":1,"path":"scripts/panel_preview_window/panel_preview_window.yy",},
{"name":"sh_scale3x","order":29,"path":"shaders/sh_scale3x/sh_scale3x.yy",},
{"name":"node_csv_file_write","order":13,"path":"scripts/node_csv_file_write/node_csv_file_write.yy",},
@@ -231,7 +233,7 @@
{"name":"_3D","order":6,"path":"scripts/_3D/_3D.yy",},
{"name":"sh_corner_erode","order":48,"path":"shaders/sh_corner_erode/sh_corner_erode.yy",},
{"name":"node_outline","order":11,"path":"scripts/node_outline/node_outline.yy",},
- {"name":"sh_mesh_generation","order":44,"path":"shaders/sh_mesh_generation/sh_mesh_generation.yy",},
+ {"name":"sh_mesh_generation","order":4,"path":"shaders/sh_mesh_generation/sh_mesh_generation.yy",},
{"name":"math_function","order":7,"path":"scripts/math_function/math_function.yy",},
{"name":"__point","order":4,"path":"scripts/__point/__point.yy",},
{"name":"scrollBox","order":13,"path":"scripts/scrollBox/scrollBox.yy",},
@@ -586,6 +588,7 @@
{"name":"node_VFX_spawner","order":1,"path":"scripts/node_VFX_spawner/node_VFX_spawner.yy",},
{"name":"_draw_defines","order":21,"path":"scripts/_draw_defines/_draw_defines.yy",},
{"name":"sh_color_replace","order":8,"path":"shaders/sh_color_replace/sh_color_replace.yy",},
+ {"name":"__surface","order":8,"path":"scripts/__surface/__surface.yy",},
{"name":"rotator","order":11,"path":"scripts/rotator/rotator.yy",},
{"name":"s_node_edge_detect","order":20,"path":"sprites/s_node_edge_detect/s_node_edge_detect.yy",},
{"name":"node_fluid_add_collider","order":6,"path":"scripts/node_fluid_add_collider/node_fluid_add_collider.yy",},
@@ -694,7 +697,6 @@
{"name":"sh_fd_turbulence","order":22,"path":"shaders/sh_fd_turbulence/sh_fd_turbulence.yy",},
{"name":"s_node_compare","order":1,"path":"sprites/s_node_compare/s_node_compare.yy",},
{"name":"s_node_fluidSim_domain_queue","order":9,"path":"sprites/s_node_fluidSim_domain_queue/s_node_fluidSim_domain_queue.yy",},
- {"name":"sh_camera","order":43,"path":"shaders/sh_camera/sh_camera.yy",},
{"name":"s_node_vfx_spawn","order":2,"path":"sprites/s_node_vfx_spawn/s_node_vfx_spawn.yy",},
{"name":"texture_set_repeat","order":1,"path":"scripts/texture_set_repeat/texture_set_repeat.yy",},
{"name":"fd_rectangle_update_velocity","order":22,"path":"scripts/fd_rectangle_update_velocity/fd_rectangle_update_velocity.yy",},
@@ -720,7 +722,7 @@
{"name":"s_node_fluidSim_vortex","order":8,"path":"sprites/s_node_fluidSim_vortex/s_node_fluidSim_vortex.yy",},
{"name":"string_hexadecimal","order":1,"path":"scripts/string_hexadecimal/string_hexadecimal.yy",},
{"name":"s_node_camera","order":3,"path":"sprites/s_node_camera/s_node_camera.yy",},
- {"name":"sh_find_boundary","order":48,"path":"shaders/sh_find_boundary/sh_find_boundary.yy",},
+ {"name":"sh_find_boundary","order":2,"path":"shaders/sh_find_boundary/sh_find_boundary.yy",},
{"name":"_node_strand_affector","order":10,"path":"scripts/_node_strand_affector/_node_strand_affector.yy",},
{"name":"sh_vertex_pnt_light","order":4,"path":"shaders/sh_vertex_pnt_light/sh_vertex_pnt_light.yy",},
{"name":"surfaceBox","order":22,"path":"scripts/surfaceBox/surfaceBox.yy",},
@@ -795,7 +797,7 @@
{"name":"steam_ugc_project","order":1,"path":"scripts/steam_ugc_project/steam_ugc_project.yy",},
{"name":"sh_fd_visualize_pixel_art_fire_glsl","order":15,"path":"shaders/sh_fd_visualize_pixel_art_fire_glsl/sh_fd_visualize_pixel_art_fire_glsl.yy",},
{"name":"struct_functions","order":4,"path":"scripts/struct_functions/struct_functions.yy",},
- {"name":"sh_content_sampler","order":34,"path":"shaders/sh_content_sampler/sh_content_sampler.yy",},
+ {"name":"sh_content_sampler","order":1,"path":"shaders/sh_content_sampler/sh_content_sampler.yy",},
{"name":"fd_rectangle_get_repeat","order":19,"path":"scripts/fd_rectangle_get_repeat/fd_rectangle_get_repeat.yy",},
{"name":"s_menu_white","order":1,"path":"sprites/s_menu_white/s_menu_white.yy",},
{"name":"color_loader","order":13,"path":"scripts/color_loader/color_loader.yy",},
diff --git a/PixelComposer.yyp b/PixelComposer.yyp
index fd328f75d..f8d875425 100644
--- a/PixelComposer.yyp
+++ b/PixelComposer.yyp
@@ -144,6 +144,7 @@
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"overlay","folderPath":"folders/panels/preview/overlay.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"sprites","folderPath":"folders/panels/preview/sprites.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"shader","folderPath":"folders/shader.yy",},
+ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"_helper","folderPath":"folders/shader/_helper.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"3d","folderPath":"folders/shader/3d.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"blend","folderPath":"folders/shader/blend.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"blur","folderPath":"folders/shader/blur.yy",},
@@ -154,6 +155,7 @@
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"flood fill","folderPath":"folders/shader/flood fill.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"generator","folderPath":"folders/shader/generator.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"mask","folderPath":"folders/shader/mask.yy",},
+ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"misc","folderPath":"folders/shader/misc.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"shape seperator","folderPath":"folders/shader/shape seperator.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"sprites","folderPath":"folders/shader/sprites.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"warp","folderPath":"folders/shader/warp.yy",},
@@ -278,6 +280,10 @@
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_noti_icon_warning_strip2.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_padding_link_strip2.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_panel_active_split.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_panel_animation.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_panel_graph.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_panel_inspector.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_panel_preview.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_paste.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_pin.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_play_all.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
@@ -293,6 +299,7 @@
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_sequence_control_strip7.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_slider.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_sort_24.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_star.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_steam_creator.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_steam.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_strandSim.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
@@ -644,7 +651,7 @@
{"id":{"name":"node_polygonal_shape","path":"scripts/node_polygonal_shape/node_polygonal_shape.yy",},},
{"id":{"name":"fd_rectangle_get_collision_mask_sprite","path":"scripts/fd_rectangle_get_collision_mask_sprite/fd_rectangle_get_collision_mask_sprite.yy",},},
{"id":{"name":"node_flip","path":"scripts/node_flip/node_flip.yy",},},
- {"id":{"name":"shader_set_functions","path":"scripts/shader_set_functions/shader_set_functions.yy",},},
+ {"id":{"name":"shader_functions","path":"scripts/shader_functions/shader_functions.yy",},},
{"id":{"name":"node_gradient_points","path":"scripts/node_gradient_points/node_gradient_points.yy",},},
{"id":{"name":"_f_code","path":"fonts/_f_code/_f_code.yy",},},
{"id":{"name":"sh_combine_rgb","path":"shaders/sh_combine_rgb/sh_combine_rgb.yy",},},
@@ -1041,6 +1048,7 @@
{"id":{"name":"s_node_equation","path":"sprites/s_node_equation/s_node_equation.yy",},},
{"id":{"name":"_draw_defines","path":"scripts/_draw_defines/_draw_defines.yy",},},
{"id":{"name":"sh_color_replace","path":"shaders/sh_color_replace/sh_color_replace.yy",},},
+ {"id":{"name":"__surface","path":"scripts/__surface/__surface.yy",},},
{"id":{"name":"rotator","path":"scripts/rotator/rotator.yy",},},
{"id":{"name":"s_node_edge_detect","path":"sprites/s_node_edge_detect/s_node_edge_detect.yy",},},
{"id":{"name":"node_fluid_add_collider","path":"scripts/node_fluid_add_collider/node_fluid_add_collider.yy",},},
@@ -1443,6 +1451,7 @@
{"id":{"name":"buttonGradient","path":"scripts/buttonGradient/buttonGradient.yy",},},
{"id":{"name":"sh_draw_downsample","path":"shaders/sh_draw_downsample/sh_draw_downsample.yy",},},
{"id":{"name":"__view_get","path":"scripts/__view_get/__view_get.yy",},},
+ {"id":{"name":"sh_sample","path":"shaders/sh_sample/sh_sample.yy",},},
{"id":{"name":"s_node_texture_map","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},},
{"id":{"name":"fd_rectangle_create","path":"scripts/fd_rectangle_create/fd_rectangle_create.yy",},},
{"id":{"name":"s_node_level_selector","path":"sprites/s_node_level_selector/s_node_level_selector.yy",},},
diff --git a/datafiles/data/themes/default.zip b/datafiles/data/themes/default.zip
index 82c9bd0eb..2c963278d 100644
Binary files a/datafiles/data/themes/default.zip and b/datafiles/data/themes/default.zip differ
diff --git a/datafiles/data/themes/default/graphics/graphics.json b/datafiles/data/themes/default/graphics/graphics.json
index 536dac069..f4d5506e0 100644
--- a/datafiles/data/themes/default/graphics/graphics.json
+++ b/datafiles/data/themes/default/graphics/graphics.json
@@ -878,6 +878,41 @@
"yorigin": 16,
"slice": null
},
+ "star": {
+ "path": "./icon/s_star.png",
+ "subimages": 1,
+ "xorigin": 16,
+ "yorigin": 16,
+ "slice": null
+ },
+ "panel_graph": {
+ "path": "./icon/s_panel_graph.png",
+ "subimages": 1,
+ "xorigin": 16,
+ "yorigin": 16,
+ "slice": null
+ },
+ "panel_preview": {
+ "path": "./icon/s_panel_preview.png",
+ "subimages": 1,
+ "xorigin": 16,
+ "yorigin": 16,
+ "slice": null
+ },
+ "panel_inspector": {
+ "path": "./icon/s_panel_inspector.png",
+ "subimages": 1,
+ "xorigin": 16,
+ "yorigin": 16,
+ "slice": null
+ },
+ "panel_animation": {
+ "path": "./icon/s_panel_animation.png",
+ "subimages": 1,
+ "xorigin": 16,
+ "yorigin": 16,
+ "slice": null
+ },
"inspector_area": {
"path": "./inspector/s_inspector_area_strip2.png",
"subimages": 2,
diff --git a/datafiles/data/themes/default/graphics/icon/graphics x2.ai b/datafiles/data/themes/default/graphics/icon/graphics x2.ai
index 26173002f..a15b2e212 100644
--- a/datafiles/data/themes/default/graphics/icon/graphics x2.ai
+++ b/datafiles/data/themes/default/graphics/icon/graphics x2.ai
@@ -24,8 +24,8 @@
Adobe Illustrator 27.0 (Windows)
2022-11-26T09:16:08+07:00
- 2023-03-14T14:05:18+07:00
- 2023-03-14T14:05:18+07:00
+ 2023-03-19T20:40:21+07:00
+ 2023-03-19T20:40:21+07:00
@@ -39,7 +39,7 @@
default
uuid:65E6390686CF11DBA6E2D887CEACB407
xmp.did:7647d1b0-ea83-ca49-b85e-bbc9513ca4bb
- uuid:4ad51ef4-4b0c-43bf-9927-aa51a3b88258
+ uuid:2c75ac60-16fc-4762-a1fd-3b92cae2ecf7
uuid:673f9e21-4d80-48ad-ba53-812ef9241a78
xmp.did:efa7ff44-b17d-d449-8cbc-4cf525bcc8d1
@@ -322,17 +322,17 @@
-endstream
endobj
3 0 obj
<>
endobj
35 0 obj
<>
endobj
37 0 obj
<>
endobj
5 0 obj
<>>>/Thumb 3530 0 R/TrimBox[0.0 0.0 16.0 16.0]/Type/Page/PieceInfo<>>>
endobj
3527 0 obj
<>stream
+endstream
endobj
3 0 obj
<>
endobj
35 0 obj
<>
endobj
37 0 obj
<>
endobj
5 0 obj
<>>>/Thumb 3644 0 R/TrimBox[0.0 0.0 16.0 16.0]/Type/Page/PieceInfo<>>>
endobj
3641 0 obj
<>stream
H10ݧjqvR Ƃ*
N[t-Z ZYŁzloZSP7E6H(6^\SftHfsF33Ü Y
-endstream
endobj
3528 0 obj
<>
endobj
3530 0 obj
<>stream
+endstream
endobj
3642 0 obj
<>
endobj
3644 0 obj
<>stream
8;Xp,rVCYe!!<3,C'.`~>
-endstream
endobj
3531 0 obj
<>
endobj
3533 0 obj
<>
endobj
3534 0 obj
<>stream
+endstream
endobj
3645 0 obj
<>
endobj
3647 0 obj
<>
endobj
3648 0 obj
<>stream
%!PS-Adobe-3.0
%%Creator: Adobe Illustrator(R) 24.0
%%AI8_CreatorVersion: 27.3.1
%%For: (Makham) ()
%%Title: (graphics x2.ai)
-%%CreationDate: 3/14/2023 2:05 PM
+%%CreationDate: 3/19/2023 8:40 PM
%%Canvassize: 16383
%%BoundingBox: -48 -241 604 0
%%HiResBoundingBox: -47.3922855564306 -241 603.17639088057 0
@@ -362,9 +362,9 @@ endstream
endobj
3531 0 obj
<>stream
-%AI24_ZStandard_Data(/ Xn.+Kd*/ }ig`[wr:8;;;^H"J>qtQ^iH^Z5OLSeIJ&GI=gf4}dɽ120P(<0*8Y,4a;)gDc'+Qz5c,"
^>,uc,w)@t=MuW/wg$Q^;4I(>-5q
*M,gGVOze.mАgJAhZlGb6n_ 2Lj8I6$$jbhD~(C"@ 1@e`h0 DC " $&"",
Tpwx!b, ! d
113RjuM>4!,З]A
24R14Ԕ14
E8 N8aDFLD04LHD04@$#,""(#q24"@w'R"!.-)'Jf`5?EʛL"LmfF3UK!UQ5` >ԃP)qKC`p0p9H
-⧓!ƌ dVTkXiKf̶]eMffF~R-xxx@VVZ2489w|Cg#0]؉8i4ZM:","h"& & $ " aCDAT'$$?C=CUF C3",Ѐu(H@<)\ LB)7ګz^u.3~~6f"{g%CksdF_39W3Mab"FbN&QGdE$C$"p Eq䑢'Vm7nzTǍ:̨jfW>an|yoYv&& "$&P*14`"Bb@er((Z
--`a&a6a&mv`hp%< |wxy?8"a18tbf>!!R"'r>>;8ԡ{`h?<<@ "(#1QJ\A"BbB5 DCACC
DCÄÄCÃC$R''% h4246"H_A
,14ʡfB"3uB$P%j\'l"
-Q
.{ph2404!l@ V`hpgf^^:8qL̚8#;2I9UD=CTDn
Ѐ`+z`h