From 89fa7ff198b4585d2e1b62ac10ed1c092d414619 Mon Sep 17 00:00:00 2001 From: Ludovic D Date: Thu, 16 Jul 2020 21:52:01 +0200 Subject: [PATCH] Update 0.1.3d --- .vs/Tokenmagic/v16/.suo | Bin 134656 -> 134144 bytes .vs/VSWorkspaceState.json | 3 +-- .vs/slnx.sqlite | Bin 90112 -> 90112 bytes README.md | 3 ++- Tokenmagic.zip | Bin 22090144 -> 22090487 bytes tokenmagic/fx/filters/proto/FilterProto.js | 2 +- .../fx/glsl/fragmentshaders/forcefield.js | 8 ++++++-- tokenmagic/module.json | 2 +- tokenmagic/updates/UPDATE-0.1.3d.md | 5 +++++ 9 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 tokenmagic/updates/UPDATE-0.1.3d.md diff --git a/.vs/Tokenmagic/v16/.suo b/.vs/Tokenmagic/v16/.suo index 9192ddabc718e5f6639ab20df2ff287b70d60c1e..91edb995ecbea15c6951896dc76714783855ecc6 100644 GIT binary patch delta 8669 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 P8$Wn8pAArS*X;V=?TsPK delta 8240 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 delta 2476 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 P>OFE&Q-3!>qfq}31Ru)< delta 8760 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�*>oPDRHFF2f75_Yd09J0LHcC<*0nkDz}~$Gj0WzGtZVeOKCCVJ-t7e0xboF zMd`rpUlG$w*CwZ&Udp)AxLt~$`y;7;X;#g;$LB`p-1Lpa;-LxxsHpPs1w$%{vj zMARh6X+`%*sE+Sv;>S%MgbP-&6^kQ+IFEFP-nBL7_9(JevJa&3+A7$@zg+NM8enT% zs^saC(q&Gpm5T4)npPWCu6oe4iJA25U~gkum$>^7r`>}Wr*a~@+i16q5|znWESgY? zk>#bWZS-6Z`MuKlCmACgDc#%QQSOF^=kwzadP!MeEv-Zk3{_69MiI05jt~V-a|R7b zvOXPTyXAD_VV3IIqjJY3(>s1#<{a^wOk63Q@)L_Y+F{-10^65?-qKfM7ECpsCauVA zi9&jv!zM=e*wvL>|hQ0-Ub-0)NRfNoTCB7+S zct?`9Q8FbJ_hQicZ3(M*!M?D{;HII@U|5!1G%F&++m#)cu;Tcj!>hYsKznwdW|E#< zCy`e*t|B+pdQg4mu`tO7PBF&RKiSf{BikSHN~$m)fF2gD?U~Dd(a*!(<)l_sKOL>* ztoynVH<4M5LMAznZ`Yi?V?rlt8r;H{2#6xQExs-=MwYF3`iHj3Gc9br+*=8A$EQ+B!Tw}`IP-^aT zSNdK`ty@n|gC$NQE-5hzR3u1zak%SPm?;-xD?5B>)Bb=z8h7E&_JN7ebe6T6BuA&h z)YC>RyA!)xFpYiI+-u$5AZbpUpsN1snGdEiHK&?va)y*x>SA_-)sDH@6MofGO`RPI6CXOQ(o zYKm%Bm&k*>Z%(JW?C{}l%@%j3-<5GyOXbfzSK>uc;r{cRT%=5!yZueWCjs>G-`-Pb zy$oCQz$w+1o|Wt>MtJ|w#^R(L_0l$eKc zE|~2X-wA_~Hl_L74CM_%JZIP3L9Np8i{sTwMEuxC7ru%7)~Dv9=O(STPpG09+I}+q zJf``0|JkjSK1oXSgFZv{DDxe_}j5%bk zS2E=<_|b-=yvkLjSjQN-Ji*(PT-+W`YMprhKAxMQhgjDe!wOBiaDl5a321s84OzjQ z(F2Cr6-v?sW)ieliX~R8$^d;1(|3S!>AXjNAm&h#)nTOk^kIo-c3J=R(yVZI@%$vT z@Nh3(ap$AAquPe5wBB`DRoT(ll!JFJVkC?N73EQ+hClg9YBy>;)!b5DSVZnu3uhm` zAMiFDFv&gmL2)lz#^f!*+F&&Uk=ZONX1y+;Y}f}^!K$*?x>Ei2vh~Z*7|aLr$cZ&n zgU8Hi^cKr*TS+r98y?w0WgX4gbi?6-ar&i1x$T3P&-CnUglp9=Njvd<%`@R?q7tNMDM}K>w;Mb9VgV8Pw}X`6JQ4G;};?Ox-k9NN8XvKH~9W%kE0R z%O!Jb?c0SsgTe2?)IsJt*>}vePCaQz+i&Lka)N=E8eWB7kqthg*0_J>vFD$##v+Io z`Z%jD4uFHWh*iaVNb{?C$lLtC{0`hW|^o4%oG z#sHm82GBT)sQ+0k$Fgo3APZgAvmW^#9-D7%r|MT8BI;?DOA_|Hi)^X|W#2E_SpPHW`Umagph0>;$rfEFJ!> z&}R@EqA9V=c!p>|&UMoJQ5bokeI|Fpl}dzh!PLHGv`81ZO|?zf>tsAB~SqL5ia6|4fblpSf=o=YNyr z>`45a_}?J_nFCF3^a$$*x z4AIs&HE;e)cK(d1Ynq`iit`@f5>$o&2! zQofDW#9kpaMBhahVe|e*N~|X^MAKk7koFo{;cw=I_W2u`uH z8<3>}9&8v=xQ@Po9Ymt~|N3TPBR53Tp`-uSX|Y;JMn$$G;r@59{EgT%d$z53z>G*`)tJZ{|1JSrt-b@ckRHkN)X^ zRr+m!#=}Y>+l=U{zXy5agnq}CP$6RpyM&al;}ERi+>XN_SQO diff --git a/tokenmagic/fx/filters/proto/FilterProto.js b/tokenmagic/fx/filters/proto/FilterProto.js index 0847660..a7143c1 100644 --- a/tokenmagic/fx/filters/proto/FilterProto.js +++ b/tokenmagic/fx/filters/proto/FilterProto.js @@ -16,7 +16,7 @@ PIXI.Filter.prototype.setTMParams = function (params) { } PIXI.Filter.prototype.getPlaceable = function () { - return this.placeableImg; + return getPlaceableById(this.placeableId, this.placeableType); } PIXI.Filter.prototype.getPlaceableType = function () { diff --git a/tokenmagic/fx/glsl/fragmentshaders/forcefield.js b/tokenmagic/fx/glsl/fragmentshaders/forcefield.js index adb859e..b339373 100644 --- a/tokenmagic/fx/glsl/fragmentshaders/forcefield.js +++ b/tokenmagic/fx/glsl/fragmentshaders/forcefield.js @@ -223,7 +223,7 @@ vec4 blenderVec3(int blend, vec4 fColv4, vec4 sColv4) else if (blend == 10) { fCol = all(lessThanEqual(sCol, vec3(0.5, 0.5, 0.5))) ? (2. * fCol * sCol + fCol * fCol * (1. - 2. * sCol)) : sqrt(fCol) * (2. * sCol - 1.) + (2. * fCol) * (1. - sCol); } else if (blend == 11) { fCol = fCol / (1.0 - sCol + 0.00001); } else if (blend == 12) { fCol = 1.0 - (1.0 - fCol) / sCol + 0.00001; } - else if (blend == 13) { fCol = fCol + sCol; } + else if (blend == 13) { fCol = fCol + sCol; return vec4(fCol,0.6); } else { fCol = fCol + sCol; } return vec4(fCol,(fColv4.a+sColv4.a)/2.); @@ -629,11 +629,15 @@ void main() vec4 final = clamp(ambientLight(clamp(colorized, 0., 1.)*intensity, uv, posLight-vec2(0.5,0.5)),0.,1.); + //if ( r <= 1. && pixel.a < 1. ) { + // pixel.rgb = vec3(1.); + //} + gl_FragColor = r > 1.0 ? pixel*(1.-a) : (pixel.a < 1. - ? mix(blenderVec3(2, pixel, final),blenderVec3(blend, pixel, final),pixel.a) + ? mix(blenderVec3(13, pixel, final),blenderVec3(blend, pixel, final),pixel.a) : blenderVec3(blend, pixel, final)); } `; \ No newline at end of file diff --git a/tokenmagic/module.json b/tokenmagic/module.json index 5ef93e9..50e4e45 100644 --- a/tokenmagic/module.json +++ b/tokenmagic/module.json @@ -2,7 +2,7 @@ "name": "tokenmagic", "title": "Tokenmagic", "description": "

Add graphic filters and animations on your tokens and tiles.

", - "version": "0.1.3c", + "version": "0.1.3d", "compatibleCoreVersion": "0.6.5", "minimumCoreVersion": "0.6.0", "author": "SecretFire", diff --git a/tokenmagic/updates/UPDATE-0.1.3d.md b/tokenmagic/updates/UPDATE-0.1.3d.md new file mode 100644 index 0000000..0cd3581 --- /dev/null +++ b/tokenmagic/updates/UPDATE-0.1.3d.md @@ -0,0 +1,5 @@ +# Token Magic FX - Update v0.1.3d-alpha + +*Fixed regression :* +- autoDestroy and autoDisable properties not working properly. +