From 4368e8ddb8f4d4886c3902f8c56941b716265e08 Mon Sep 17 00:00:00 2001 From: Tanasart Date: Sun, 18 Feb 2024 11:41:15 +0700 Subject: [PATCH] 1.16.6 --- PixelComposer.yyp | 2 +- datafiles/{pxc => pxc.exe} | Bin 7750166 -> 7750170 bytes fonts/_f_sdf/_f_sdf.old.png | Bin 82361 -> 82361 bytes fonts/_f_sdf/_f_sdf.png | Bin 82361 -> 82361 bytes fonts/_f_sdf_medium/_f_sdf_medium.old.png | Bin 59906 -> 59906 bytes fonts/_f_sdf_medium/_f_sdf_medium.png | Bin 59906 -> 59906 bytes scripts/color_function/color_function.gml | 6 +-- scripts/node_color_mix/node_color_mix.gml | 13 +++--- scripts/node_image/node_image.gml | 2 +- scripts/node_region_fill/node_region_fill.gml | 10 ++--- scripts/node_registry/node_registry.gml | 2 +- .../sh_region_fill_coordinate.fsh | 42 +++++------------- .../sh_region_fill_rg_map.fsh | 1 - 13 files changed, 31 insertions(+), 47 deletions(-) rename datafiles/{pxc => pxc.exe} (99%) diff --git a/PixelComposer.yyp b/PixelComposer.yyp index a319e792c..4257d2f7e 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -417,7 +417,7 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"mf.dll","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"mfcore.dll","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"mfplat.dll","CopyToMask":-1,"filePath":"datafiles",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"pxc","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"pxc.exe","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"README.txt","ConfigValues":{"Itch":{"CopyToMask":"0",},},"CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"data.win","CopyToMask":-1,"filePath":"datafiles/report",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"execute_shell_simple_ext_x64.dll","CopyToMask":-1,"filePath":"datafiles/report",}, diff --git a/datafiles/pxc b/datafiles/pxc.exe similarity index 99% rename from datafiles/pxc rename to datafiles/pxc.exe index ed19e3507a075c1079456aaab46e91165c88e0e6..ebdbccff85a6aaee14b1a7c27fb67f188c72dd8f 100644 GIT binary patch delta 3639 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 delta 3652 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 La|irMC(_`5;B2qJ diff --git a/fonts/_f_sdf/_f_sdf.old.png b/fonts/_f_sdf/_f_sdf.old.png index 3ae3cda1d286d9e04260fe3744c520cc1e77ca8e..d2f452d630470546c5521787086088d0cad5b650 100644 GIT binary patch delta 96 zcmdnl%(}CgwP6dRiKB>lh=HM%si~Ebv9^JMm4QL}=j5>I9*&H%7&2n(Zoisd>By*{ WfUd`J_b*chAnKfVr delta 96 zcmdnl%(}CgwP6dRiKB>Fh=HM%k%5)5rM7{Am4QKCaPfud9*&H%7&7vFr*o!PIx;FK WpzHCFezlna2s~Z=T-G@yGywqeAQ^Q4 diff --git a/fonts/_f_sdf/_f_sdf.png b/fonts/_f_sdf/_f_sdf.png index 885a319b83665d6a73073fff57e03cf7cb3ec270..8f3b84a30e7957249d2cf490894ae48aba646260 100644 GIT binary patch delta 96 zcmdnl%(}CgwP6dRiKB=`h=HM%fu)tPk+y+>m4U&F_0C<>JscTjF=S?b`fWD7(veX? W0bS3z=eJ%m0D-5gpUXO@geCx78XT(t delta 96 zcmdnl%(}CgwP6dRiKB>Fh=G}vfuWU&g|>l#m4N|=&C*-bJscTjF=Q$eWz(itIx;FK VpzF~qvDwK01fH&bF6*2UngHEl7|;L! diff --git a/fonts/_f_sdf_medium/_f_sdf_medium.old.png b/fonts/_f_sdf_medium/_f_sdf_medium.old.png index bba9d0823306d55e6a126ddf5d2c6dcdac65a5cd..246de4bd4457cbeceea4e06013a92085a7658cbe 100644 GIT binary patch delta 119 zcmZp=!rXL)c|+|>5%UlOLn~8LDtMdKf%i{an^LB{Ts5_lYDP delta 119 zcmZp=!rXL)c|+|>5wj2jLn|W#D`QJ-0|P4qgS_D43zH|llnp_bkmoy{!@$6xQQ{g= ul9E`GYE_b%n_66wm|MVLWME{XYha{nh_1&&`qgHj9tKZWKbLh*2~7Z?FCw`B diff --git a/fonts/_f_sdf_medium/_f_sdf_medium.png b/fonts/_f_sdf_medium/_f_sdf_medium.png index a2d3ab2f0bc9b31b53b46e0ab2817d2b54d5a9c5..8e6c81e9c7c20be8eb18a78f98de6f8b14dadb4a 100644 GIT binary patch delta 119 zcmZp=!rXL)c|+|>5sMH5Ln{MID`O*V0|P4qgBR~RsLv%gop5J;2)WhKE>gTe~DWM4fHs2-h delta 119 zcmZp=!rXL)c|+|>5wj2jGb;l_D-%m?0|P4qgLU5P@+MDwDI0<=abHaA5(5K+Mu}@g uNlIc#s#Qs5ZfbE!Vr~J0k%5tku7Q!RA-bLpW^-Pk9tKZWKbLh*2~7aI^dcbu diff --git a/scripts/color_function/color_function.gml b/scripts/color_function/color_function.gml index 9217e3604..e61f867ba 100644 --- a/scripts/color_function/color_function.gml +++ b/scripts/color_function/color_function.gml @@ -28,9 +28,9 @@ k.z = power(k.z, 3); var rg = global.CVTMAT_OKLAB_RGB.multiplyVector(k); - rg.x = power(rg.x, 1 / 2.2); - rg.y = power(rg.y, 1 / 2.2); - rg.z = power(rg.z, 1 / 2.2); + rg.x = power(rg.x, 1 / 2.2) * 255; + rg.y = power(rg.y, 1 / 2.2) * 255; + rg.z = power(rg.z, 1 / 2.2) * 255; return make_color_rgba(rg.x, rg.y, rg.z, a); } #endregion diff --git a/scripts/node_color_mix/node_color_mix.gml b/scripts/node_color_mix/node_color_mix.gml index 3f73172a8..e62037157 100644 --- a/scripts/node_color_mix/node_color_mix.gml +++ b/scripts/node_color_mix/node_color_mix.gml @@ -17,15 +17,18 @@ function Node_Color_Mix(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) input_display_list = [ 3, 0, 1, 2 ]; static processData = function(_output, _data, _output_index, _array_index = 0) { + var c = c_black; + switch(_data[3]) { - case 0 : return merge_color_ext(_data[0], _data[1], _data[2]); - case 1 : return merge_color_hsv(_data[0], _data[1], _data[2]); - case 2 : return merge_color_oklab(_data[0], _data[1], _data[2]); + case 0 : c = merge_color_ext( _data[0], _data[1], _data[2]); break; + case 1 : c = merge_color_hsv( _data[0], _data[1], _data[2]); break; + case 2 : c = merge_color_oklab(_data[0], _data[1], _data[2]); break; } + return c; } - static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { + static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { #region var bbox = drawGetBbox(xx, yy, _s); if(bbox.h < 1) return; @@ -37,5 +40,5 @@ function Node_Color_Mix(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) } drawColor(col, bbox.x0, bbox.y0, bbox.w, bbox.h); - } + } #endregion } \ No newline at end of file diff --git a/scripts/node_image/node_image.gml b/scripts/node_image/node_image.gml index dd5c66e95..06b019969 100644 --- a/scripts/node_image/node_image.gml +++ b/scripts/node_image/node_image.gml @@ -117,7 +117,7 @@ function Node_Image(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { if(array_empty(spr)) return; - var _arr = is_array(spr); + var _arr = is_array(spr) && array_length(spr) > 1; var _outsurf = outputs[| 0].getValue(); if(!is_array(_outsurf)) _outsurf = [ _outsurf ]; diff --git a/scripts/node_region_fill/node_region_fill.gml b/scripts/node_region_fill/node_region_fill.gml index 5cfb2ca3c..6e52c93c7 100644 --- a/scripts/node_region_fill/node_region_fill.gml +++ b/scripts/node_region_fill/node_region_fill.gml @@ -98,13 +98,13 @@ function Node_Region_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou draw_surface_safe(temp_surface[1]); surface_reset_shader(); } - - surface_set_shader(temp_surface[base], sh_region_fill_coordinate_init); - draw_surface_safe(temp_surface[2]); - surface_reset_shader(); #endregion #region coordinate + surface_set_shader(temp_surface[base], sh_region_fill_coordinate_init); + draw_surface_safe(temp_surface[2]); + surface_reset_shader(); + base = !base; var amo = _sw + _sh; @@ -120,7 +120,7 @@ function Node_Region_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou } surface_set_shader(temp_surface[base], sh_region_fill_border); - shader_set_f("dimension", _sw, _sh); + shader_set_f("dimension", _sw, _sh); shader_set_surface("original", _surf); draw_surface_safe(temp_surface[!base]); diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index 698238463..e6ddb83e3 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -715,7 +715,7 @@ function __initNodes() { addNodeObject(generator, "StrandSim", s_node_strandSim, "Node_Strand_Group_Inline", [1, Node_Strand_Group_Inline], ["hair"], "Create group for hair simulation.").setVersion(1140); addNodeObject(generator, "Diffuse", s_node_diffuse, "Node_Diffuse", [1, Node_Diffuse],, "Simulate diffusion like simulation.").setVersion(11640); addNodeObject(generator, "Reaction Diffusion", s_node_reaction_diffusion, "Node_RD", [1, Node_RD],, "Simulate reaction diffusion effect.").setVersion(11630); - + ds_list_add(generator, "Region"); addNodeObject(generator, "Separate Shape", s_node_sepearte_shape, "Node_Seperate_Shape", [1, Node_Seperate_Shape],, "Separate disconnected pixel each into an image in an image array."); addNodeObject(generator, "Region Fill", s_node_region_fill, "Node_Region_Fill", [1, Node_Region_Fill],, "Fill connected pixel with colors.").setVersion(1147); diff --git a/shaders/sh_region_fill_coordinate/sh_region_fill_coordinate.fsh b/shaders/sh_region_fill_coordinate/sh_region_fill_coordinate.fsh index 0e44d1c75..c3251c420 100644 --- a/shaders/sh_region_fill_coordinate/sh_region_fill_coordinate.fsh +++ b/shaders/sh_region_fill_coordinate/sh_region_fill_coordinate.fsh @@ -6,24 +6,6 @@ varying vec4 v_vColour; uniform sampler2D base; uniform vec2 dimension; -vec2 less ( vec2 a, vec2 b ) { #region - if(b == vec2(0.)) return a; - if(a == vec2(0.)) return b; - - if(a.y < b.y) return a; - else if(a.y > b.y) return b; - else return a.x < b.x? a : b; -} #endregion - -vec2 more ( vec2 a, vec2 b ) { #region - if(b == vec2(0.)) return a; - if(a == vec2(0.)) return b; - - if(a.y > b.y) return a; - else if(a.y < b.y) return b; - else return a.x > b.x? a : b; -} #endregion - void main() { vec2 tx = 1. / dimension; vec4 c = texture2D( gm_BaseTexture, v_vTexcoord ); @@ -40,12 +22,12 @@ void main() { if(x.x < 0. || x.y < 0. || x.x > 1. || x.y > 1.) break; vec4 s = texture2D( gm_BaseTexture, x ); - vec4 b = texture2D( base, x ); + vec4 b = texture2D( base, x ); if(b.a == 0.) break; - gl_FragColor.xy = less( gl_FragColor.xy, s.xy ); - gl_FragColor.zw = more( gl_FragColor.zw, s.zw ); + gl_FragColor.xy = min( gl_FragColor.xy, s.xy ); + gl_FragColor.zw = max( gl_FragColor.zw, s.zw ); } for( float i = 1.; i < ITERATION; i++ ) { @@ -53,12 +35,12 @@ void main() { if(x.x < 0. || x.y < 0. || x.x > 1. || x.y > 1.) break; vec4 s = texture2D( gm_BaseTexture, x ); - vec4 b = texture2D( base, x ); + vec4 b = texture2D( base, x ); if(b.a == 0.) break; - gl_FragColor.xy = less( gl_FragColor.xy, s.xy ); - gl_FragColor.zw = more( gl_FragColor.zw, s.zw ); + gl_FragColor.xy = min( gl_FragColor.xy, s.xy ); + gl_FragColor.zw = max( gl_FragColor.zw, s.zw ); } for( float i = 1.; i < ITERATION; i++ ) { @@ -66,12 +48,12 @@ void main() { if(x.x < 0. || x.y < 0. || x.x > 1. || x.y > 1.) break; vec4 s = texture2D( gm_BaseTexture, x ); - vec4 b = texture2D( base, x ); + vec4 b = texture2D( base, x ); if(b.a == 0.) break; - gl_FragColor.xy = less( gl_FragColor.xy, s.xy ); - gl_FragColor.zw = more( gl_FragColor.zw, s.zw ); + gl_FragColor.xy = min( gl_FragColor.xy, s.xy ); + gl_FragColor.zw = max( gl_FragColor.zw, s.zw ); } for( float i = 1.; i < ITERATION; i++ ) { @@ -79,11 +61,11 @@ void main() { if(x.x < 0. || x.y < 0. || x.x > 1. || x.y > 1.) break; vec4 s = texture2D( gm_BaseTexture, x ); - vec4 b = texture2D( base, x ); + vec4 b = texture2D( base, x ); if(b.a == 0.) break; - gl_FragColor.xy = less( gl_FragColor.xy, s.xy ); - gl_FragColor.zw = more( gl_FragColor.zw, s.zw ); + gl_FragColor.xy = min( gl_FragColor.xy, s.xy ); + gl_FragColor.zw = max( gl_FragColor.zw, s.zw ); } } diff --git a/shaders/sh_region_fill_rg_map/sh_region_fill_rg_map.fsh b/shaders/sh_region_fill_rg_map/sh_region_fill_rg_map.fsh index b99478e2d..fafe119e5 100644 --- a/shaders/sh_region_fill_rg_map/sh_region_fill_rg_map.fsh +++ b/shaders/sh_region_fill_rg_map/sh_region_fill_rg_map.fsh @@ -13,5 +13,4 @@ void main() { vec2 t = (v_vTexcoord - c.xy) / (c.zw - c.xy); gl_FragColor = texture2D( textureMap, t ); - gl_FragColor = vec4( t, 0., 1. ); }