From 026431e2d66efc2a4c0b2cea417bd9a29a2001c0 Mon Sep 17 00:00:00 2001 From: David Steele Date: Fri, 14 Jul 2017 16:16:47 +0100 Subject: [PATCH] Updated alpha blend example to use better masks of different size Demonstrates quality improvements in adaptor patch Change-Id: Ibf433741526f8014d2e9c345319f865f5aa9c80e Signed-off-by: David Steele --- .../alpha-blending-cpu/alpha-blending-cpu-example.cpp | 8 ++++---- resources/images/store_mask_profile_f.png | Bin 0 -> 2364 bytes resources/images/store_mask_profile_n.png | Bin 0 -> 1964 bytes 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 resources/images/store_mask_profile_f.png create mode 100755 resources/images/store_mask_profile_n.png diff --git a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp index 8b8cd98..ce1f0a2 100644 --- a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp +++ b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp @@ -28,8 +28,8 @@ const char* const IMAGE_PATH_1 ( DEMO_IMAGE_DIR "people-small-7b.jpg" ); // 100x const char* const IMAGE_PATH_2 ( DEMO_IMAGE_DIR "people-medium-7.jpg" ); const char* const IMAGE_PATH_3 ( DEMO_IMAGE_DIR "people-medium-7-rgb565.png" ); // is compressed const char* const IMAGE_PATH_4 ( DEMO_IMAGE_DIR "people-medium-7-masked.png" ); // has alpha channel -const char* const MASK_IMAGE_PATH_1 ( DEMO_IMAGE_DIR "mask.png" ); -const char* const MASK_IMAGE_PATH_2 ( DEMO_IMAGE_DIR "mask-large.png" ); // 300x300 +const char* const MASK_IMAGE_PATH_1 ( DEMO_IMAGE_DIR "store_mask_profile_f.png" ); +const char* const MASK_IMAGE_PATH_2 ( DEMO_IMAGE_DIR "store_mask_profile_n.png" ); // 300x300 } class ImageViewAlphaBlendApp : public ConnectionTracker @@ -70,14 +70,14 @@ private: mImageLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); mImageLabel.SetAnchorPoint( ParentOrigin::BOTTOM_CENTER ); mImageLabel.SetPosition( Vector3( 0.0f, -50.0f, 0.0f ) ); - mImageLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::GREEN ); + mImageLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLACK ); stage.Add(mImageLabel); mMaskLabel = Toolkit::TextLabel::New(); mMaskLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); mMaskLabel.SetAnchorPoint( ParentOrigin::BOTTOM_CENTER ); mMaskLabel.SetPosition( Vector3( 0.0f, 0.0f, 0.0f ) ); - mMaskLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::GREEN ); + mMaskLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLACK ); stage.Add(mMaskLabel); LoadImages(); diff --git a/resources/images/store_mask_profile_f.png b/resources/images/store_mask_profile_f.png new file mode 100755 index 0000000000000000000000000000000000000000..299969c99908414689cb894eb53239b93ea7b3f5 GIT binary patch literal 2364 zcmaJ@X;f3!7LJwKT4gp5h2*jn(1wrz0rChuNCKpc4M743H71u3Ah{t45+Z{}u+D-5 zgH|eO5tXr}$}EpM5Q+#v1ra2UAfPCNRBD0VSkeA?zPs+dXP>>k@7w#Fv)5i{Ur3Pe zN`rqHAP|U^G(QR*9;KR3PY3?HaR@!|fRs>~l29mClEM;!2rmw_4MfrSEG|d~S)A0Q zcF-MxSPt+QObIhEfXIgU_ACv?Udk83Yy`sHQz~S!6F>=S8_4AeNWja+768TLkbrRK zK!-pf8I0rk$wXkNEQrCDC9vH%fTst_T}p%n_@IP^lJXM;Vxp7;ywfGZw#JPGQ12j; z1QPIfQp~^*6d4kMC}(>|4BG*RLlFq}I45TU0rw>e?|{Q&9pIOM!8s9~2}HaL>iq-2 z(L|hBBAw#%J{CM90dW$Ekch>mq@>uVINC!ZE*9tJ=BClW<1sJ-BTf}aSW=8YY`vsF z0mW<)PblF*0+dFPwGB#^kN`N-zn8!levlQ2-)|GVVOS|kh{f4EXqL1D3=I7LP(J?y zS}dW1AM^d6!eU0M5X90!F_bJ~!v_~@tqCP0l0_g(0*M$9l(@8uA#sod630P86giZD zvJK}6I8ch%?j1fbkVq4VB`g6Oq)|u!tYFXMafr@Nu2j5}1JxT(cEsVR1Xlvp)s0MW zpyF_Dct;n)5|;w8llh=Pvc%Rh4M)*7ET7MIoN+3^pXp%9*y~-Y~jg=!UqL#wTs}g_Am5oM6iwL=}NKl|N*rd?aYjxJ<(r60&#Wf3uf zY*hK%8!uOWmekBSQK8_Xt@1)DdtOBK^@UyBf4M(@kVY4LVV$nD3A>=E@*OgCL4;`g zS1@MUAXG; ze53lQq(3J^{fc-r-n2PObP9jV#p77H;`OlV{5f+KJM@>ye#f&nHiXDuo*m4qqYwU~ zw!Lc7B%g>JZoPdW?sV;+HNqF6WpUQy-brjFjiK_lt>v#e5PCt8uZkF;@B-V;DU$8l zYiI5lj##%as}ygaoo7$@74I(!4qoSIlf6-9CDMsb&bp+)>P1k$H7j>?))}=kCiXZb zzD5p`Jqrt2bI3H@JZG5RA#WUQ>vjGdQ*fy4dB6`3M2`JGKcLMVD?El-;gOq>XnM3; zzF1-vm1UMzkniM}`L(cq?v%Wvvl?t|Q3c1&GR@ro<9Vr)71!$76C9hNH^(aec173c z(bpKO??VY!$Ak}Kta^~1`v$tMB$`$vmXsczbDhz>zPc&9h&a5v+iDFvDDP&sni{^Y z*y7iEyWl;go$>xM-RO&*=0+@!sPYpl6GqGUF^4CMe=_@i^z5d_?D1ofRNsdUN9<$qE1GYT7jJ=i?^y$70WBT!_P1h5>V-#IDcdX$bMbniE zUzPr3!&oN1*^-)ncP#eDD}fy;z_=CAy8Y|0 z=oVJ}K>ElvQ5m$nmrD|uxts=b>qb2{zo8EnTh}ymYM5y{E^l?xp%}Xfr;ANc(CK>@ zZ0bgHC6nBPy|86TnqmKh?RT`!%&&B1jtpp#>pl86eOXsDx)4!8@|nI`ap*U>{eOoT z`RUot_igLY4Lck94)i*%mJr(Ql95!GgDMhLg4)WBUU0faD1BgL?AM`{;JKGE?z~Ua r3jf&@ms+8BtHy%+<;pj~JC`ART))}rMY literal 0 HcmV?d00001 diff --git a/resources/images/store_mask_profile_n.png b/resources/images/store_mask_profile_n.png new file mode 100755 index 0000000000000000000000000000000000000000..2cb6a4e79dc017dc1e022b923fa0d0e515e6b452 GIT binary patch literal 1964 zcmaJ?2~-nT6pa!Pqp}E!T9F|Lg<@71+iN>BoXWP}Kl3CUmrE>KjeVin>- zl~oj%x>a0QL~E>)1~=l`xD>1kDDGetTeK4d>}gBq%*^}$&As=%|Nnbu)MajK|lyBPKF{Ou{1N?0L{eV zEQqpbAu1HiVM-8~EH-1v8d!m`ak!ZQ8iiPr3ZXy}lq{38h|f>_NCae37BR+8KouxB zP>L)#O9@3~g-1)WQY8#2F<=%jQ^UjrUZxgm*6pdIxp^>TPB@F-tg8zrY@E}@+Mna$R{ZC<4 zbfyBLL_#VgLn*-yZlRkwl!D1oLShtAMk7etz%E9lASj|rK@T!o6|5-5brB4P?;nM}&`;RRAbUn)4=m%*mdcp#hY>%->prqlT}kV9qo3~;%K zBm;)z=m1yxiR(Wk*IWv)0*lOrl(NN;l&?f!pl``c+0eQ84yo7Al@6VY-;i7imJG#w zuzx$~0T)(1=HX!3Vw1tbhvZnbE3vZn^tXM1!{LDtZeXdwzF?XVZl=WAz#Q-SO`&;T`km**QL}%&_FwudArZbL8{tNvrAAo2DGBtnXc3 zTIWPc5Iui=VQWjfMN4VNg&s{?`lXVsYvai6Kzv*JNW0P2R(OltVY-~e+0=dmOu)Q+ zYM&YSIEZo7w92@z^a!!GVcO=jqO`(mp^K(o*M4Cje(>3$y{rv1cpGwdetE^a zXYAE;dx9T!8LzbHQm0mj?@Gu38+8bp!<;C#M z%xSF~7e`^ZoBV>@pKY03bSFrWX?aLnQh0RNwJOm|QsWYQQM_W~gK8IU)f$^K>)*{{ zYIL#Rjfe>)2Q!Bk6uVTZ-_l7^N7jiMn!`K8s{NZg-$W>9)7cKaA97>f&VAB$8qqpw zmuWXxm(?Z0R?kC0=t1TgAHx*?yPUD_TG{2dx4PCf@e|sbnhE18TUA=CBG#m(rioI4 zk?Y@Mzi5lB?5IuSABoFco1bfohR5;~lF|wqs%)oRUS<7&nea`QukpU=e$Yjl(X)=@ zP+DQzrRICo>U(?XXHy(RPTS+!JEQf!UYRo-y!YNDJ@v?{dQh6LdQ|Z0r^_~Z`#~eg z{(QzMIcZCA2Zy{o@_=NU;OMD{35%-|!p2RiKc2evs*`==whm`2ESBDRd~t{1lFfo? zgkKYb6$f}azdZa+p<~0Xg4RX(x%)bQjW(otYJ@!+)`F$5d z68uM?evCzK)B(5rXHEG%JoWsS3+!7?))186g2tvtt1WlO*Vy4ZXF0L#o1VVR@SzA9 z_S;)Gx;hdab??T-$8eR$$Tb|#;9!@W&b&&BvrA4;=7<^DfwzdYOKy8?N^MwkX~&WU zN0Wu}6Qj~L6xzKpeBa%rf49zX-TsJtHQ4iNGRXF>XnA!vu`AjO$Bkb!|n-7H{si3y%|rmD-Iv8H#x6+eb#+RK&OM3O(TK(LfAM3 z-fbJ&eLq!neY(-OxIC`fQ`BDlFyNMru29mZXezPb8~@pNR(Lma`~9o$2AgttTMf