From 015d05f945b8fffc8a4e22747e27cb1016a455cd Mon Sep 17 00:00:00 2001 From: rolux Date: Sat, 6 Aug 2011 14:42:10 +0000 Subject: [PATCH] changes to icon render script --- pandora/scripts/item_icon | 17 +++++++---------- static/png/icon.mask.png | Bin 2854 -> 3581 bytes 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pandora/scripts/item_icon b/pandora/scripts/item_icon index 9fbc0f25..94b7b407 100755 --- a/pandora/scripts/item_icon +++ b/pandora/scripts/item_icon @@ -24,9 +24,9 @@ def render_icon(frame, timeline, icon): icon_height = 512 icon_image = Image.new('RGBA', (icon_width, icon_height), (0, 0, 0, 0)) frame_width = icon_width - frame_ratio = 8 / 7 + frame_ratio = 4 / 3 frame_height = int(round(frame_width / frame_ratio)) - frame_image = Image.open(frame) if frame else Image.new('RGB', (512, 448), (0, 0, 0)) + frame_image = Image.open(frame) if frame else Image.new('RGB', (512, 384), (0, 0, 0)) frame_image_ratio = frame_image.size[0] / frame_image.size[1] if frame_ratio < frame_image_ratio: frame_image = frame_image.resize((int(frame_height * frame_image_ratio), frame_height), Image.ANTIALIAS) @@ -37,16 +37,13 @@ def render_icon(frame, timeline, icon): top = int((frame_image.size[1] - frame_height) / 2) frame_image = frame_image.crop((0, top, frame_width, top + frame_height)) mask_image = Image.open(os.path.join(static_root, 'png', 'icon.mask.png')) - icon_image.paste(frame_image, (0, 0), mask=mask_image) + icon_image.paste(frame_image, (0, 0)) timeline_image = Image.open(timeline) if timeline else Image.new('RGB', (512, 128), (0, 0, 0)) timeline_image = timeline_image.resize((icon_width, 128), Image.ANTIALIAS) - timeline_mask_image = Image.new('L', (512, 128)) - timeline_mask_image.paste(mask.image.crop((0, 0, 511, 63)), (0, 0)) - timeline_mask_image.paste(mask.image.crop((0, 448, 511, 511)), (0, 64)) - icon_image.paste(timeline_image, (0, icon_height - 128), mask=timeline_mask_image) - #mask_image = Image.open(os.path.join(static_root, 'png', 'icon.mask.png')) - #mask_image = mask_image.resize((icon_width, icon_height)) - #icon_image.putalpha(mask_image) + icon_image.paste(timeline_image, (0, icon_height - 128)) + # we're using jpegs with border-radius + # mask_image = Image.open(os.path.join(static_root, 'png', 'icon.mask.png')) + # icon_image.putalpha(mask_image) icon_image.save(icon) def main(): diff --git a/static/png/icon.mask.png b/static/png/icon.mask.png index d54625b6c34dcf0fda9fc5db7af676f843f2ae86..f13365385e59262da27f23f98f2f135aa24d761e 100644 GIT binary patch literal 3581 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 P^{+!AUF?~*_|*RbuP1MH literal 2854 zcmeH}`8V5n7stOLGmIir)d{NA>X2ZlDx*{yip25^BGryHI<%cq(oI50lj_3QqBF4@ zAtqI7X-iRSs+LyOnxaKgqfMzLwopmN;U)lm3dbuhm+Cy^Amv=--!2iEfGMtU3S0ykC4;6 z3;Nke$KT^A&Pt(gEpyU=pngNug#ahgq&f72ke3*wdTAwc^w#5B2~hK7e~Yq@7~g<1 zfB&icV^6}rTzh2t!*`)1IMtSVbl!&Z3ACcN60FzkULtIW9(@=3Ht-ppla)3r!im%P zBjmLnZG82T3}$(z;TSP0pgC@4FpCh_AQN03Zz&t!GY&4YJD$K&r#!tmfnU1NW4+WM zVQRNZu&@o0S&{E2WEI*){milx&xkD|y(qw&C+O=G*NtRm4*VwsKMQU;ah(7t~Bb|D5U(p zz#I~yS@fthru;$5ZtkBF)3dGKymidFXp3hnvBI>HMZPN!lngJWEw76v63iH+jr)-D zxJYq(C5~Q9)0&rZk&vDXqd$kYjUZ_wgfSXt`gVunuMII&gJGoo5TB78c+!$?H3s)N zm!eS9OsRii;H+?;zbauSRp7Q7YFn;`wC}*E7Yc8~O`c*P{OAYNf2y&n!CS+r8GDNX zDd}&$$?>}i(bu{f+!#3e^FuUSS2ChG||O9B>p1sL(B4tT_=*eH2-{` z;+kl~05?JK?MKpA0_Ii~f^X#G>lqPC;L=!aR* zbz#IYXcBf^qh3fygL!i;5n8MGNe2etUKa~`Qt)-Argpws-26|Qn=o!j-Y3m`W7Wc< z<08|fhb=|#ot|B#XC%adO3%el6h%9AqM_N+{B?ADIe|X}itT~fI8d+i^9|OTSm|M? zd%H$QbP8A%;z_0f zdIwO8JbU5ts&a>K{^Q25Vl2{Qezi==48!m$RH`mgQvKfT7ZPz5>fB)6c!(0OKf!vP zTu|tOezBk}b<1rEQ>8~l3eidlB(l%}(tqyk5jFxjm{JCAlzKg0C|j8RPUWM3c2tpm z1o&FM&fx1F{J)(+efcrU4Si}>6vor*A7Zutz%I?1QzVp}1W}YsQp2Y#EC46UWm-&b5>w(9Oub zbgFs!K+;kWwy!Z>z}Uyu5|tDHe(1y?wz6r3oSJ!E#U;qLfxOc7n+Fh;-+JQc;jfLv z-(IRUA|>h1q4T^2*ym~6@GT(9P>?vD)={SeI_UoxiNEQOGQX0fuRG^vB&ONca}G!T zp>J8cDyy@m_Zp%NQU)h@QZstXl%l05Etjp_DCI-@Y4pT<$qsnU_rHNVz%9T-r0&c9 zK2}0gw7Zm;eGuz-56OMxxJgilF0$&5Dae&r0E;thdcPls2vQqm168}5)M^%yXQZ$X z$DJYSbBB)Nw740l>lmOgLX;7Y_ql22KW1qlINTjLA~|>)p`?dgUUYvNiKAECTmXx( zDw|VzHXb;-wLm+L;sRK&FT5fqFV_)8sn5=`VK$P<*KOyT%63++Pp3s?=oOFemCP?nY3;zEtYVJ|3iEWV zE_`%~W~^bKTes2CorYWBM~Am7wx#OYm+`+ycy5)r-iDxeWO+bHf~F6?i(vSKrCb?V z>%Oa>rKz^xl-kl_A#bA?d)$nKTLK32??hA^Kf>5FZiNkHu;FPM_HHIDf7E0+v#yxP z()u`vQ*^mH5)l*p+X(VJoUFG`EP!gG=*&zWQG3={vL%W19MZzlb)@{jM_ce+HJF(2 zi#jX&(+yo}R;Bn=A__7qr!