From 53ba0ca1f5b093b6edca3ef4b76aa66996261731 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Fri, 4 Mar 2016 16:04:04 +0600 Subject: [PATCH] parent color effects tests and fix --- .../Examples/Animations/Tests/1_colormode.fla | Bin 14961 -> 16270 bytes Assets/FlashTools/Scripts/FlashAnimAsset.cs | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/FlashTools/Examples/Animations/Tests/1_colormode.fla b/Assets/FlashTools/Examples/Animations/Tests/1_colormode.fla index 9bbcc8a56e326f247089e8d196f021a5e8c50f97..c9de30007c2592c532a08848dd69dc4b1f354a2a 100644 GIT binary patch delta 2920 zcmZ`*2{_bU7axN$Lv|$+vL-KOUm`PhjmcJCYxdAAmO=JEQj)b9TPV~}UWq6wA$yiI zNR}aL>`Rkkm^aKfeOur6Jnwt%bDn$8J@=e@pXZ$WJ7*&-6UcT2?j7o1>EQ%{%n%?D zKL`XewLzH%`GjNraAB&ESj@WHG=5T70BCJ(r^Y}4&m&FjcdSY`pTkrfqIK3CEXLKB zPPm?NRt*OBs(&k*jeVNkKqQUx!}93J$-VW**2Qf*>zILdnYK!D0}SzTj= zPscb$dm2^K5A5{SqDIuu3_L#cNnG)v$*^0gX6MV#lXy~;s2L`;=@>E{Yb{?Av^06$ z)Z6fVOhqLcZS9D*n@;9jEZsGEa1F;ni5yJV}*lMsfcg1?~|{Qn@l&R&4m>(hGM7 z*F(wXg`@moDhTGOmd5VTa4klKWnMu?0*R4iPpGkaS*Vdcd<4i&URdAA8jZZ!=q>nJ z#75RhKQ%SSH@}!v@6p5I&^%r||eC5*e*)iw=q}F567hVF}`U-Aw%Jgs*e@_05s_NGg#oBCD>T)Lc zDO#RQLL+P4B601M^bjv6LwOrD_cAwYVZB6IVEk;)R_s`4@kK+UnbSruBF>y4Yews= zOn6@KjA~hoipNJF_OJTsMo1N>ANMOVYcI&&KeCb}TAN~)iQWSSJ(?wD6X`#A*h)eU zrqR5LQuO_z&UwMd4l62y&zf%&cU`5=cJg6}pijEEFN<|km`YmKl~7!TvrBV4W!c;k zNVr-)Hlq~a+=6wK&9{a^Tt71^aPK9x_}um1Tb)C4gH=Q-}gv%3!<8Qb$Ip1{?X_k z6||(qtWk7H=~&ekWP4d_ot;OV(~F7JenM&7jd#cgRx#pj$w+6z^z@P%*;OE?}KoUi%VW&+%0TP~Q144yo^ z`_Q}b+Plgz4b^W*m)Q=PnI~Zx)FrIMqEkE`)JPz;G)jCOzG?EBW`SA7=!47{t6Tfn z(C2B@D86iHAs5K#lp&>B9ggqg22;Mx>*#YW-}h<4X(Vn2E$~y;N>KYdVv08|#w6)3 zL|;^dHoXn)d13@}0+jpc9A$+ZKQ@Yz51mnbv$K%}ySm_G+$6PmQo-M0?%+H_Qpjbu zH|Tf`5QA{P~mv%6$!nCs!N3 zFNHU8zJsZ^G~#3ntL><;sfiq%SyTgWG|wi{^thhCo4nN2GG96+=y~4U*6I3D4$MeK zBbp0;&X=rOD>MH>Fcbuu zYVfioD)AnuCv&E9!F+{j+(E1Y5JdFmm2u_-aexFsY#?>k4hM^QK|#TOI6q$xtdB>q zI*9w12;%woS~VEw|NrOIKrPiQTNbggnEjt~eGM;C2>?T(Af6as%L>{7-P%*aKKVbFsr@WN8TKffcDO+E4`pqtbA$A?%MV3)Q&S(pBwpPvzth*f7Z5Q9 zXEu+h$Ux;n0}8UXKd!yHZSZPfA>*RU)?wTF49D&n+^YevgT`_FjOgYsKy^*bhq$i@ z!X|^V7I^WIZJKgmtUv{P$@X;ehN0c0Je|9WQDLv5N`0M9F1T7fp8%mG7)N(`7wMIc zgxi$}@#-^$BVIqyZZr!An1QwJCssqBOPs6s)i2-a*V8I#GPES{uyLHMtlKN#Edc8>l^*w9GuDUssKG6)qqk72QT&?!-O^ zdF}^0F35%ry?;;tWZF!4PkL014`{U@n)c2nZ{&u%a0I@s%2fc0SMCowQ5CIrjGPrh znEpF7ia6e><$SKiH{a}vU~}4mcga%NuK|0zoBOhw`cbobOmy^G+V<0?Gc7>;la}$* zJ}!f*lO9~aFfNw3mQlSI0rzgxq7<*VJdz+T zNnfjL;kDT%W(fGVkvn>@KKJS!4+IoeL}*bf=HZPrDd*-fSzJfQ3tvnTMDxtW?VurPibaGluiGm+qUN!x5O>9m;>c8MBF|`%Y5(3D(?}q)%-OhXD&02R=L#AockJr zB=BXSHr6c_;^TIwReVGv@Pt`S=Wv0qpI$bV6X_4$Qa{EI#idGz4m2tFc8&zNnAn5}2T zMkbQ=48Ra=BA>q0-$KYQ57jz<4=A=sHn0fjCl3B~+WztqtM`{)*wl%~^i^d#PlG_% bK&)R_RIr~dk`waNj*m5}Sb)ZE@KgE+i8nvs delta 1600 zcmV-G2EX}^fAMsXTYr7t zd!RDme^9BI$oklChQK5#(L#>1MD+2M(T_%)s3p3UBB9D~5{?D~jB-wNB4paf6EbI+ z7HWynSF6m5Pk+f*8l%|;?d#bwBd^_b(X3!RMqa0jQA++4a_5cL#&+>tkK6XJ5hCy7gm6WV z)^5pys_!k1BuVMjynNpAB#cwN$?0#ukB5Cc9J<5d^?&uK(Y}5&Y6R_TztJ7}LF20B z2GP*J3OnHlzy1Z8S1+Y8Bh`bYK-ye0osxX4X^Jv1*T*7<9mUN&TVTY1Y|OO7xIOPC zt%eJ)j+aCjDN)EdeY4h7LeNIwRZdK5G@A|_SL(XWgp)6HoeQZQuVwXFp&O#~I5i72 zhNBGHVSm*2f}piszug5ty$e3wvo!cHX!+n(*9)UC45P!_;z|g`SOG*a2t)TJ%K3CTF)H2m`m<+4JboiJq>It?nn# z7V=g4lz>3qt|F943?{mGU(iZJjsqf(=sVRnX1&sD{|`W~-~w>=Yq#5KnNmRtE#3i3 zyno&IxAj@2Wdy!s@z8eZH)2^#*L@7JiwjA#Egn!R^or6dXHsFvP+`iyAI-uvBl$Mh z{-PT=XyEgG*X#Vqxjp-oQ&YkCC{z7xOc)s4fx?ux7Y+&pl?%Gaz2<*F{A_c#hR?aLCxMUEQTB@m`8+U^XvPaV zDY#}iF9*B^^fpQ3_er9tnSSBXuxy{b0HU;zknlT-?>!(~XS)5YOGWGDcg(ste1Ai% zE)Gx#_G^RNjJj^>iK`b+>Gs)g7Tj+qI*XpdOeUo_kld9i_K}`&jPiUvt=I0%T66U zd8e+ybB2z`c51@&B{_JP?P8j><-FLDyaxJNDy*Ih?vf9lZF|n~ci2nz?YH8q1vsXA z-=FW@N@kLFO0{O$Lhb$J+*Ze?UHaBgP+3IK0#Wo~6;Uu|Om zzOA!p4ofMMi#zoSlb+++JOuy%05p?|JWT?&1(RI{8I$rnC<5sPlaK}#lQBIi0UMKC zJtZ5sI+sF00000%0000J000000000000000085jcJwO7z4U^tILIE$6AwE9=7n5N= yJOWKMlb=2xlS)4#A~QDt0Bvb)WpsIPWl&261^@s601N;O03QPY0CG0~0001|9}9W_ diff --git a/Assets/FlashTools/Scripts/FlashAnimAsset.cs b/Assets/FlashTools/Scripts/FlashAnimAsset.cs index 4a39730..3bd0bb8 100644 --- a/Assets/FlashTools/Scripts/FlashAnimAsset.cs +++ b/Assets/FlashTools/Scripts/FlashAnimAsset.cs @@ -61,14 +61,14 @@ namespace FlashTools { FlashAnimColorTransform a, FlashAnimColorTransform b) { var res = new FlashAnimColorTransform(); - res.Mul.x = a.Mul.x * b.Mul.x; - res.Mul.y = a.Mul.y * b.Mul.y; - res.Mul.z = a.Mul.z * b.Mul.z; - res.Mul.w = a.Mul.w * b.Mul.w; - res.Add.x = a.Add.x * b.Mul.x + b.Add.x; - res.Add.y = a.Add.y * b.Mul.y + b.Add.y; - res.Add.z = a.Add.z * b.Mul.z + b.Add.z; - res.Add.w = a.Add.w * b.Mul.w + b.Add.w; + res.Mul.x = b.Mul.x * a.Mul.x; + res.Mul.y = b.Mul.y * a.Mul.y; + res.Mul.z = b.Mul.z * a.Mul.z; + res.Mul.w = b.Mul.w * a.Mul.w; + res.Add.x = b.Add.x * a.Mul.x + a.Add.x; + res.Add.y = b.Add.y * a.Mul.y + a.Add.y; + res.Add.z = b.Add.z * a.Mul.z + a.Add.z; + res.Add.w = b.Add.w * a.Mul.w + a.Add.w; return res; } }