From a69e3a95981f0e661360a36b60d690c4b035b63b Mon Sep 17 00:00:00 2001 From: Tanasart Date: Thu, 30 May 2024 13:44:11 +0700 Subject: [PATCH] raymarch --- scripts/node_registry/node_registry.gml | 2 +- scripts/node_rm_primitive/node_rm_primitive.gml | 2 ++ .../panel_palette_mixer/panel_palette_mixer.gml | 2 +- shaders/sh_rm_primitive/sh_rm_primitive.fsh | 10 ++++++---- .../1edabec3-254d-42f4-8d2c-52898860ab0c.png | Bin 0 -> 2258 bytes .../9fcdf9f9-ba78-46c9-b253-0c8ab869e7fd.png | Bin 1882 -> 0 bytes .../30e25e94-92fd-4e97-87a4-b6fe46ef67a9.png | Bin 0 -> 2258 bytes .../eae4b9cd-265e-4fa2-9fa6-1e3d16f2efcf.png | Bin 1882 -> 0 bytes .../s_node_rm_primitive/s_node_rm_primitive.yy | 16 ++++++++-------- 9 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 sprites/s_node_rm_primitive/1edabec3-254d-42f4-8d2c-52898860ab0c.png delete mode 100644 sprites/s_node_rm_primitive/9fcdf9f9-ba78-46c9-b253-0c8ab869e7fd.png create mode 100644 sprites/s_node_rm_primitive/layers/1edabec3-254d-42f4-8d2c-52898860ab0c/30e25e94-92fd-4e97-87a4-b6fe46ef67a9.png delete mode 100644 sprites/s_node_rm_primitive/layers/9fcdf9f9-ba78-46c9-b253-0c8ab869e7fd/eae4b9cd-265e-4fa2-9fa6-1e3d16f2efcf.png diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index 826c24381..60372089d 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -752,7 +752,7 @@ function __initNodes() { addNodeObject(generator, "Flood Fill", s_node_flood_fill, "Node_Flood_Fill", [1, Node_Flood_Fill],, "Filled connected pixel given position and color.").setVersion(1133); ds_list_add(generator, "Ray March"); - addNodeObject(generator, "RM Primitive", s_node_rm_primitive, "Node_RM_Primitive", [1, Node_RM_Primitive]).setVersion(11720); + addNodeObject(generator, "RM Primitive", s_node_rm_primitive, "Node_RM_Primitive", [1, Node_RM_Primitive], ["ray marching"]).setVersion(11720); ds_list_add(generator, "MK Effects"); addNodeObject(generator, "MK Rain", s_node_mk_rain, "Node_MK_Rain", [1, Node_MK_Rain]).setVersion(11600); diff --git a/scripts/node_rm_primitive/node_rm_primitive.gml b/scripts/node_rm_primitive/node_rm_primitive.gml index 9ad1fe49c..426e5a7bc 100644 --- a/scripts/node_rm_primitive/node_rm_primitive.gml +++ b/scripts/node_rm_primitive/node_rm_primitive.gml @@ -317,6 +317,8 @@ function Node_RM_Primitive(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro for (var i = 0, n = array_length(temp_surface); i < n; i++) shader_set_surface($"texture{i}", temp_surface[i]); + shader_set_f("time", CURRENT_FRAME / TOTAL_FRAMES); + shader_set_i("shape", _shpI); shader_set_f("size", _size); shader_set_f("radius", _rad); diff --git a/scripts/panel_palette_mixer/panel_palette_mixer.gml b/scripts/panel_palette_mixer/panel_palette_mixer.gml index e044163b6..dc1e735aa 100644 --- a/scripts/panel_palette_mixer/panel_palette_mixer.gml +++ b/scripts/panel_palette_mixer/panel_palette_mixer.gml @@ -50,7 +50,7 @@ function Panel_Palette_Mixer() : PanelContent() constructor { node_hovering = noone; node_dragging = noone; node_drag_mx = 0; - node_drag_my = 0; + node_drag_my = 0; node_drag_sx = 0; node_drag_sy = 0; node_selecting = noone; diff --git a/shaders/sh_rm_primitive/sh_rm_primitive.fsh b/shaders/sh_rm_primitive/sh_rm_primitive.fsh index 0ade4a83d..4eec61974 100644 --- a/shaders/sh_rm_primitive/sh_rm_primitive.fsh +++ b/shaders/sh_rm_primitive/sh_rm_primitive.fsh @@ -18,6 +18,8 @@ uniform sampler2D texture1; uniform sampler2D texture2; uniform sampler2D texture3; +uniform float time; + uniform int shape; uniform vec3 size; uniform float radius; @@ -306,7 +308,7 @@ mat3 rotMatrix, irotMatrix; vec4 sm = sampleTexture(extrudeSurface, pos); float am = (sm.r + sm.g + sm.b) / 3. * sm.a; - float d = 0.1 - am; + float d = 0.3 - am; vec2 w = vec2( d, abs(p.y) - h ); return min(max(w.x, w.y), 0.0) + length(max(w, 0.0)); } @@ -486,9 +488,6 @@ void main() { if(dist > viewRange.y - EPSILON) // Not hitting anything. return; - // if(sin(wcoll.y * 64.) > -.9) - // return; - vec3 c = ambient.rgb; float distNorm = 1. - (dist - viewRange.x) / (viewRange.y - viewRange.x); @@ -501,5 +500,8 @@ void main() { c *= lamo; + // if(sin((wcoll.y + time * PI * 2.) * 96.) < -.9) + // c *= 4.; + gl_FragColor = vec4(c, 1.); } \ No newline at end of file diff --git a/sprites/s_node_rm_primitive/1edabec3-254d-42f4-8d2c-52898860ab0c.png b/sprites/s_node_rm_primitive/1edabec3-254d-42f4-8d2c-52898860ab0c.png new file mode 100644 index 0000000000000000000000000000000000000000..761e224400ac0ef11ee13397faa83c53e9fabfc2 GIT binary patch literal 2258 zcmZ{mdpy&P7stQb*gUKmxjZ3Oxy)ReVLYx=OLJ%DlKXYJCfCGbijq9JCq!x$5klq? zw(j8xg&}fDA|;n3wz6ma^LzdNd0yvr&gbBny=A z+eM&)SQ8pOB@k2~iEIY|NvZ%qPX_?5AVpsUfOsqbEcpR|(NzGDJ$bFe$wW|q2G|@W z0{q`r*;Q2l0I+9PL<>sd+vPIP5YHcbUzlgn8Ui&+a0mZ*()%W(ROhDDbL>MR<6hdM z%s%(l3l_r{^p`I&9;4qmQ_N5Nvx!5;L(6{V>OdI?Z@eDIQW35d?S6T#NZChHX*$4| zY}%7>uPkzTHZ@3TuhoKr_x{t$zQ`Va>Q3wQQU3Hw>RO&kx&1f2aEDzyruy|N1Rb&p zZdzYcKdqm4J4<^8JjpIG8MqTJd_xYHq{9qPIDQpExyTc|?fWyDeP%lIRwGZT2U>v|4lsKjg6WXxYA224 z+A#ROtkv&;ac!2EgsgpmZv#3$4B>|~tg>EUJ-DjC`%B4}`$vy^!pqBL?LhlPTH;X}qB`iGddoBK$$ zPK8B>MY->+S<51_8-@=Zj#TH0f)+t$gCFK6mbYJeMQ2deMJyDG%7I?%Xdmb2;@8N> z(`AlNm0s^yR{cSd6NZ+*tLk)+WQ&ZOb?pAxByC}8^L1L`eJ{_P7$qGNa(?&0v~MaQ z5uj+DH|MCXnimvtu~CPjz6@oKW620Q&Da9g4#N1VnaUkzD44Dx0+uYrHm_zsYB9e! zzW)P=bX(HgSvGu{e~i(13amu3NF|7J_ZA7waBfwJ0VhAEN!>U_BBPY!lMw@te6=rw zo1`{=&|(g(GP#W-9!I~$-eC%>rKzhgDpAe`KLc%v4#$VQ$zS5*DqGJ$QD;^@>ZmV@ zqu$#syzPzQ#MZWS|LNJk&o8MLG_&8ps2I!+y%TGb^cgiSUl%iifRij(n!>;8$v~U_ zr@pJ^G832(Qu~rny|o2D(~0H?xu3^#lfQ27ZB>wf;dd*?X$;!DAU5O{UPk=K0Jmib^JTgsWck_vn}@I*pY&a?4WYY3_SlFEAZ?ryGk2oJtH zP^q!K(MkPJr>9MyG=xwDra5(UP11Ne0hr|>W=_wHW@vfJ+IT0{Z{5J_6>RmFO;!|Z z1pj2JuGqe#eQz=F(SuY*s7S6YPOhYmCxt{#z3D6&gXBhp+}U@k^(v!|YiYK<-WMU$ zDk()-e2p`xcSsNX9GyH(V5t-|bW7x8MEvAdeLA)(AWH-1AmQcuZ$BAQq9#T;F^SY` z5St(I@?!P+5)(LjLaUBAYP8WSodudl z)7u8&xeLl|(qLwtqJx7H^oWMlH0CJUPcDJ|8f)bsF-T62`OiuU4+u%hfN8@#&ZoU;#l6s1^U&WhYTN}na}_gQuCq|IEiO_`N9VFs;0 z3%<-IlpQeRw+D9YeKnv}muk2k9kjneMnX)2MLIiS4fB=B@z$ z6xSl7$0;^vE$78wi#=dt>|{Qj`1!3IHk82Y)|}%gy%5=%qZ-N`({ITi7G*OzuCDH$ z$6jkS+XmYE7?qzW%~NXH!b*KLi5Z(39)6h~XQ1iuYP_epV#NcP$CTKP^JCqpYyN17 z95oCz(Xxf+{J`+ox@|#~D0}xCU7$sgQ1=~9sDn9%n?f8vgN8i@fZ-&dg;M}U5+=pJ zs&>`dQ|8rlS=%nG;`b>gd5mWn$Tjzy!%L|8waGJ(Uoj&fG%_O7z_h=R%z^_$S+i+0 z@!D<1UATzsd(+1^PgK|dNa0RF=eeYe8U#W3aUC5SzviY)_h%0o3@Yhh+;ss_A^H9I zL~N$GDkvLs-iG?Z(HX!X5kwk#<7=e^J@naXUI1@O8la%OL^H2VYe)-5LU~Yb*X_;r zTA-THHh$XRK9cTF%q{5q6z&FgM2#UW)~`X?)d7i>lE1!q{GP^ceSl2aCv%AWn_4I!O!i8533IO!~HpGQS2FJ$vN1ps|hMd;ADqsMsBlg7lLw;xf E1@IvPfB*mh literal 0 HcmV?d00001 diff --git a/sprites/s_node_rm_primitive/9fcdf9f9-ba78-46c9-b253-0c8ab869e7fd.png b/sprites/s_node_rm_primitive/9fcdf9f9-ba78-46c9-b253-0c8ab869e7fd.png deleted file mode 100644 index 71a5d2cd35a84876bbf83549acc9221563af426c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1882 zcmZ{lX*ApE7ssC@VqbpKQmR_p*o&0J7E44FwNp!J#ZXbiQp5;z2sMho_EAwn5c4CAL<0Rw9DZf&c&! z8*73KS8@L&KQH%W2Hl?Fik!c-i#-5w$^g((065@Uv=sm-C;&eC0$@}CfMi5bhqE#F zg4fU1iU3aj2}WmiF4wTPA(&r{o#Z?sl3m?o`ph^>KZn67-{=>#3G!G7*KIRSRjelS z`pbEvdlSWkPwPtPcI?lU-VLy;aDJh;iyP)^F%BkNh7+C=t|VXU^;@x%xer~-+v@wK zUDw~c@9lm>SkqMe)Qs6z>}DYpw{F-q5@l+#yn9$273l5hIp>gX@($78a?F>t3S02{ z-k8>tf-$j&Sw2Z3mC{$AlkmT}I*yCJpJ?^*et~8r) zaA}Se5wn7snE46r`{fYmnldINd5q~=Cz?y`zgLMWPOznJFe8VqsF2)o;yt@5)fY%d zr^K<0$7@l)?#~4MWDyUD^^6b=MIC>_8f?FMf=fTB4kos=R^! zMdHo`g5e$=e@lLi4e_)x>q;L7h~vJ)ZDzbKDBOH_XlJmyOl;`}6& z=iz3W{E9!z5G={JC55G^5P=q4WpPkwJ4(CpEa!N`KA_;CiSS<*5%T#P*L=0pT{+S( z)5FuoH}$h;!DqRmy||RoZK|2t#l%`*%xyy_B|Ays;3&N=^W_)YCw4RHpygYO`f^B6 zu-d<*bk!;qg2yOo>5=)nd~*k6Vc76#3Y%Mo-tCN}`!x|jiv6?09znS@% z33pUFTPu6J$OjG>#fKN#3MFSO5%RawKIcq3Uab(hmm09yxupyV%yM?X3@8 zDzmVfT~+~&wwc$kBWp1gq@a6s?bI5s%M0`QB=LbXy6vZ9J_O^`<}IL$CLQ_Kdku_U6JvVUS5c3__TQlV#E-1xyV4I1t@w)1f-HKCltYSd)lb2^#iLJQhm6}tV z|J*uLhuP-!DVqqAGLRO@hH2c<+4bq}DC)jAk2@`Sa1r_G?s1Ixv{Y0hi!4feNIe&G zj;vj3KXcfg@W)By(w4}E>f1Wn>oi-usZMsxcI$FG$n661<~F zAV)?jN(T1q{Egy@%PP6|CFV$5=p}Q4fPU|BIU!43yZYt(G$CKN>@r|pdCNm=w6&#q z9npd9Fj6x4CAtobWDpd_Ig`Z@_wo53g{)7e=h)*?wM?dG*X!O~mm#OFP{{%MD}k56 zo6AU=^|w0IgxI|$N3)U|5c{>*gifcgoJ+0lepfzaHv`{dI>0#GN|K^sS=L`NjNL7o z-bW;_+Frji-jZ~qN@F7=I1(^z2jmYF|r(v&pWhjrz7kDwHi`oi2S-f(B0!;t;8ouGI_ad^^%hJTy1~ z(c@e-V3x9wzAKICR|CkjnCNZf`Jnm39JriCgo67Et=y{Hy3dsOaIhZDJ42tuY@&{o zgmAF(>~T6)-J<%Lk{B*^j3W;3~?{2&Hd?zNCRd8KF@3*ZgJw4+ssv8APJ~ pH*mt5s^9{u|Nami6dDi}{at9pe={|Y4}Rb>z{b*n(17<%{u>JcJo5km diff --git a/sprites/s_node_rm_primitive/layers/1edabec3-254d-42f4-8d2c-52898860ab0c/30e25e94-92fd-4e97-87a4-b6fe46ef67a9.png b/sprites/s_node_rm_primitive/layers/1edabec3-254d-42f4-8d2c-52898860ab0c/30e25e94-92fd-4e97-87a4-b6fe46ef67a9.png new file mode 100644 index 0000000000000000000000000000000000000000..761e224400ac0ef11ee13397faa83c53e9fabfc2 GIT binary patch literal 2258 zcmZ{mdpy&P7stQb*gUKmxjZ3Oxy)ReVLYx=OLJ%DlKXYJCfCGbijq9JCq!x$5klq? zw(j8xg&}fDA|;n3wz6ma^LzdNd0yvr&gbBny=A z+eM&)SQ8pOB@k2~iEIY|NvZ%qPX_?5AVpsUfOsqbEcpR|(NzGDJ$bFe$wW|q2G|@W z0{q`r*;Q2l0I+9PL<>sd+vPIP5YHcbUzlgn8Ui&+a0mZ*()%W(ROhDDbL>MR<6hdM z%s%(l3l_r{^p`I&9;4qmQ_N5Nvx!5;L(6{V>OdI?Z@eDIQW35d?S6T#NZChHX*$4| zY}%7>uPkzTHZ@3TuhoKr_x{t$zQ`Va>Q3wQQU3Hw>RO&kx&1f2aEDzyruy|N1Rb&p zZdzYcKdqm4J4<^8JjpIG8MqTJd_xYHq{9qPIDQpExyTc|?fWyDeP%lIRwGZT2U>v|4lsKjg6WXxYA224 z+A#ROtkv&;ac!2EgsgpmZv#3$4B>|~tg>EUJ-DjC`%B4}`$vy^!pqBL?LhlPTH;X}qB`iGddoBK$$ zPK8B>MY->+S<51_8-@=Zj#TH0f)+t$gCFK6mbYJeMQ2deMJyDG%7I?%Xdmb2;@8N> z(`AlNm0s^yR{cSd6NZ+*tLk)+WQ&ZOb?pAxByC}8^L1L`eJ{_P7$qGNa(?&0v~MaQ z5uj+DH|MCXnimvtu~CPjz6@oKW620Q&Da9g4#N1VnaUkzD44Dx0+uYrHm_zsYB9e! zzW)P=bX(HgSvGu{e~i(13amu3NF|7J_ZA7waBfwJ0VhAEN!>U_BBPY!lMw@te6=rw zo1`{=&|(g(GP#W-9!I~$-eC%>rKzhgDpAe`KLc%v4#$VQ$zS5*DqGJ$QD;^@>ZmV@ zqu$#syzPzQ#MZWS|LNJk&o8MLG_&8ps2I!+y%TGb^cgiSUl%iifRij(n!>;8$v~U_ zr@pJ^G832(Qu~rny|o2D(~0H?xu3^#lfQ27ZB>wf;dd*?X$;!DAU5O{UPk=K0Jmib^JTgsWck_vn}@I*pY&a?4WYY3_SlFEAZ?ryGk2oJtH zP^q!K(MkPJr>9MyG=xwDra5(UP11Ne0hr|>W=_wHW@vfJ+IT0{Z{5J_6>RmFO;!|Z z1pj2JuGqe#eQz=F(SuY*s7S6YPOhYmCxt{#z3D6&gXBhp+}U@k^(v!|YiYK<-WMU$ zDk()-e2p`xcSsNX9GyH(V5t-|bW7x8MEvAdeLA)(AWH-1AmQcuZ$BAQq9#T;F^SY` z5St(I@?!P+5)(LjLaUBAYP8WSodudl z)7u8&xeLl|(qLwtqJx7H^oWMlH0CJUPcDJ|8f)bsF-T62`OiuU4+u%hfN8@#&ZoU;#l6s1^U&WhYTN}na}_gQuCq|IEiO_`N9VFs;0 z3%<-IlpQeRw+D9YeKnv}muk2k9kjneMnX)2MLIiS4fB=B@z$ z6xSl7$0;^vE$78wi#=dt>|{Qj`1!3IHk82Y)|}%gy%5=%qZ-N`({ITi7G*OzuCDH$ z$6jkS+XmYE7?qzW%~NXH!b*KLi5Z(39)6h~XQ1iuYP_epV#NcP$CTKP^JCqpYyN17 z95oCz(Xxf+{J`+ox@|#~D0}xCU7$sgQ1=~9sDn9%n?f8vgN8i@fZ-&dg;M}U5+=pJ zs&>`dQ|8rlS=%nG;`b>gd5mWn$Tjzy!%L|8waGJ(Uoj&fG%_O7z_h=R%z^_$S+i+0 z@!D<1UATzsd(+1^PgK|dNa0RF=eeYe8U#W3aUC5SzviY)_h%0o3@Yhh+;ss_A^H9I zL~N$GDkvLs-iG?Z(HX!X5kwk#<7=e^J@naXUI1@O8la%OL^H2VYe)-5LU~Yb*X_;r zTA-THHh$XRK9cTF%q{5q6z&FgM2#UW)~`X?)d7i>lE1!q{GP^ceSl2aCv%AWn_4I!O!i8533IO!~HpGQS2FJ$vN1ps|hMd;ADqsMsBlg7lLw;xf E1@IvPfB*mh literal 0 HcmV?d00001 diff --git a/sprites/s_node_rm_primitive/layers/9fcdf9f9-ba78-46c9-b253-0c8ab869e7fd/eae4b9cd-265e-4fa2-9fa6-1e3d16f2efcf.png b/sprites/s_node_rm_primitive/layers/9fcdf9f9-ba78-46c9-b253-0c8ab869e7fd/eae4b9cd-265e-4fa2-9fa6-1e3d16f2efcf.png deleted file mode 100644 index 71a5d2cd35a84876bbf83549acc9221563af426c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1882 zcmZ{lX*ApE7ssC@VqbpKQmR_p*o&0J7E44FwNp!J#ZXbiQp5;z2sMho_EAwn5c4CAL<0Rw9DZf&c&! z8*73KS8@L&KQH%W2Hl?Fik!c-i#-5w$^g((065@Uv=sm-C;&eC0$@}CfMi5bhqE#F zg4fU1iU3aj2}WmiF4wTPA(&r{o#Z?sl3m?o`ph^>KZn67-{=>#3G!G7*KIRSRjelS z`pbEvdlSWkPwPtPcI?lU-VLy;aDJh;iyP)^F%BkNh7+C=t|VXU^;@x%xer~-+v@wK zUDw~c@9lm>SkqMe)Qs6z>}DYpw{F-q5@l+#yn9$273l5hIp>gX@($78a?F>t3S02{ z-k8>tf-$j&Sw2Z3mC{$AlkmT}I*yCJpJ?^*et~8r) zaA}Se5wn7snE46r`{fYmnldINd5q~=Cz?y`zgLMWPOznJFe8VqsF2)o;yt@5)fY%d zr^K<0$7@l)?#~4MWDyUD^^6b=MIC>_8f?FMf=fTB4kos=R^! zMdHo`g5e$=e@lLi4e_)x>q;L7h~vJ)ZDzbKDBOH_XlJmyOl;`}6& z=iz3W{E9!z5G={JC55G^5P=q4WpPkwJ4(CpEa!N`KA_;CiSS<*5%T#P*L=0pT{+S( z)5FuoH}$h;!DqRmy||RoZK|2t#l%`*%xyy_B|Ays;3&N=^W_)YCw4RHpygYO`f^B6 zu-d<*bk!;qg2yOo>5=)nd~*k6Vc76#3Y%Mo-tCN}`!x|jiv6?09znS@% z33pUFTPu6J$OjG>#fKN#3MFSO5%RawKIcq3Uab(hmm09yxupyV%yM?X3@8 zDzmVfT~+~&wwc$kBWp1gq@a6s?bI5s%M0`QB=LbXy6vZ9J_O^`<}IL$CLQ_Kdku_U6JvVUS5c3__TQlV#E-1xyV4I1t@w)1f-HKCltYSd)lb2^#iLJQhm6}tV z|J*uLhuP-!DVqqAGLRO@hH2c<+4bq}DC)jAk2@`Sa1r_G?s1Ixv{Y0hi!4feNIe&G zj;vj3KXcfg@W)By(w4}E>f1Wn>oi-usZMsxcI$FG$n661<~F zAV)?jN(T1q{Egy@%PP6|CFV$5=p}Q4fPU|BIU!43yZYt(G$CKN>@r|pdCNm=w6&#q z9npd9Fj6x4CAtobWDpd_Ig`Z@_wo53g{)7e=h)*?wM?dG*X!O~mm#OFP{{%MD}k56 zo6AU=^|w0IgxI|$N3)U|5c{>*gifcgoJ+0lepfzaHv`{dI>0#GN|K^sS=L`NjNL7o z-bW;_+Frji-jZ~qN@F7=I1(^z2jmYF|r(v&pWhjrz7kDwHi`oi2S-f(B0!;t;8ouGI_ad^^%hJTy1~ z(c@e-V3x9wzAKICR|CkjnCNZf`Jnm39JriCgo67Et=y{Hy3dsOaIhZDJ42tuY@&{o zgmAF(>~T6)-J<%Lk{B*^j3W;3~?{2&Hd?zNCRd8KF@3*ZgJw4+ssv8APJ~ pH*mt5s^9{u|Nami6dDi}{at9pe={|Y4}Rb>z{b*n(17<%{u>JcJo5km diff --git a/sprites/s_node_rm_primitive/s_node_rm_primitive.yy b/sprites/s_node_rm_primitive/s_node_rm_primitive.yy index a8a5e30de..d7c979d82 100644 --- a/sprites/s_node_rm_primitive/s_node_rm_primitive.yy +++ b/sprites/s_node_rm_primitive/s_node_rm_primitive.yy @@ -2,24 +2,24 @@ "$GMSprite":"", "%Name":"s_node_rm_primitive", "bboxMode":0, - "bbox_bottom":62, - "bbox_left":6, - "bbox_right":62, - "bbox_top":5, + "bbox_bottom":63, + "bbox_left":2, + "bbox_right":60, + "bbox_top":1, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9fcdf9f9-ba78-46c9-b253-0c8ab869e7fd","name":"9fcdf9f9-ba78-46c9-b253-0c8ab869e7fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"1edabec3-254d-42f4-8d2c-52898860ab0c","name":"1edabec3-254d-42f4-8d2c-52898860ab0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"eae4b9cd-265e-4fa2-9fa6-1e3d16f2efcf","blendMode":0,"displayName":"default","isLocked":false,"name":"eae4b9cd-265e-4fa2-9fa6-1e3d16f2efcf","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"30e25e94-92fd-4e97-87a4-b6fe46ef67a9","blendMode":0,"displayName":"default","isLocked":false,"name":"30e25e94-92fd-4e97-87a4-b6fe46ef67a9","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_rm_primitive", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fcdf9f9-ba78-46c9-b253-0c8ab869e7fd","path":"sprites/s_node_rm_primitive/s_node_rm_primitive.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"32fef19e-0a12-4c33-a385-a86daf2a08de","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1edabec3-254d-42f4-8d2c-52898860ab0c","path":"sprites/s_node_rm_primitive/s_node_rm_primitive.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"22ee247f-a875-4591-afa7-cb8d52f409c7","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,