From 29ab739323a18a89b8e1542fa67170b2d6667c52 Mon Sep 17 00:00:00 2001 From: gered Date: Tue, 21 Mar 2023 21:20:35 -0400 Subject: [PATCH] update IndexedBitmap graphics visual tests to match the rgb tests --- ggdt/tests/graphics_indexed.rs | 28 +++++++++--------- .../transparent_flipped_single_blits.png | Bin 1833 -> 1832 bytes .../ref/indexed/transparent_single_blits.png | Bin 1770 -> 1769 bytes 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ggdt/tests/graphics_indexed.rs b/ggdt/tests/graphics_indexed.rs index e62abdf..321f26a 100644 --- a/ggdt/tests/graphics_indexed.rs +++ b/ggdt/tests/graphics_indexed.rs @@ -1369,13 +1369,13 @@ fn transparent_single_blits() { screen.blit(TransparentSingle { transparent_color: 0, draw_color: 15 }, &bmp, 318, 196); screen.blit(TransparentSingle { transparent_color: 0, draw_color: 15 }, &bmp, 320, 226); - screen.blit(TransparentSingle { transparent_color: 0, draw_color: 22 }, &bmp, 46, 227); - screen.blit(TransparentSingle { transparent_color: 0, draw_color: 22 }, &bmp, 76, 228); - screen.blit(TransparentSingle { transparent_color: 0, draw_color: 22 }, &bmp, 106, 232); - screen.blit(TransparentSingle { transparent_color: 0, draw_color: 22 }, &bmp, 136, 236); - screen.blit(TransparentSingle { transparent_color: 0, draw_color: 22 }, &bmp, 166, 237); - screen.blit(TransparentSingle { transparent_color: 0, draw_color: 22 }, &bmp, 196, 238); - screen.blit(TransparentSingle { transparent_color: 0, draw_color: 22 }, &bmp, 226, 240); + screen.blit(TransparentSingle { transparent_color: 0, draw_color: 10 }, &bmp, 46, 227); + screen.blit(TransparentSingle { transparent_color: 0, draw_color: 10 }, &bmp, 76, 228); + screen.blit(TransparentSingle { transparent_color: 0, draw_color: 10 }, &bmp, 106, 232); + screen.blit(TransparentSingle { transparent_color: 0, draw_color: 10 }, &bmp, 136, 236); + screen.blit(TransparentSingle { transparent_color: 0, draw_color: 10 }, &bmp, 166, 237); + screen.blit(TransparentSingle { transparent_color: 0, draw_color: 10 }, &bmp, 196, 238); + screen.blit(TransparentSingle { transparent_color: 0, draw_color: 10 }, &bmp, 226, 240); let path = reference_file(Path::new("transparent_single_blits.png")); //screen.to_png_file(path.as_path(), &palette).unwrap(); @@ -1433,13 +1433,13 @@ fn transparent_flipped_single_blits() { screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 15, horizontal_flip: true, vertical_flip: false }, &bmp, 318, 196); screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 15, horizontal_flip: false, vertical_flip: true }, &bmp, 320, 226); - screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 22, horizontal_flip: false, vertical_flip: false }, &bmp, 46, 227); - screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 22, horizontal_flip: true, vertical_flip: false }, &bmp, 76, 228); - screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 22, horizontal_flip: false, vertical_flip: true }, &bmp, 106, 232); - screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 22, horizontal_flip: true, vertical_flip: true }, &bmp, 136, 236); - screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 22, horizontal_flip: false, vertical_flip: false }, &bmp, 166, 237); - screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 22, horizontal_flip: true, vertical_flip: false }, &bmp, 196, 238); - screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 22, horizontal_flip: false, vertical_flip: true }, &bmp, 226, 240); + screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 10, horizontal_flip: false, vertical_flip: false }, &bmp, 46, 227); + screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 10, horizontal_flip: true, vertical_flip: false }, &bmp, 76, 228); + screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 10, horizontal_flip: false, vertical_flip: true }, &bmp, 106, 232); + screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 10, horizontal_flip: true, vertical_flip: true }, &bmp, 136, 236); + screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 10, horizontal_flip: false, vertical_flip: false }, &bmp, 166, 237); + screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 10, horizontal_flip: true, vertical_flip: false }, &bmp, 196, 238); + screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 10, horizontal_flip: false, vertical_flip: true }, &bmp, 226, 240); let path = reference_file(Path::new("transparent_flipped_single_blits.png")); //screen.to_png_file(path.as_path(), &palette).unwrap(); diff --git a/ggdt/tests/ref/indexed/transparent_flipped_single_blits.png b/ggdt/tests/ref/indexed/transparent_flipped_single_blits.png index 8f0059072e5401398fa6f7baebd00d290f1e97bd..517bdc475015da177a2b4e204f8e737ede9d9895 100644 GIT binary patch delta 887 zcmZ3_V}mX zgihbZeKG6(k2;I|^jUUNy7=?cWjinToPT}$?0nY!-#4}`TDtv@Yucurn_U;x9@q^O zS;e$Yb=Fyp)4LTD=DWQ1VqP|VcXr?(nSxn+Ouvf?udSZhP@U>p5(9-mJcpda2|9f=IgioYQ~UnXc!>>j7!{eF*jlDB z%C>e_YOwEA=9LuqP-^E1&XjY2DiG~S`3tu(tHwt`FuEzEEq|3tknJZYB{U!%y zta4)lQ)v#&QX8TV+|6gMx8_rNnc5RBXK<|J`u5OQK+hS*RUVK~j=L{rn6St5z^%=Z z?tD9Jmd>wBIWXzGp8twvow96iEV#CF-l!INw?qDh!2=V?)^B^1YroI(I4NKBqha&w zL)XjL?!4IZ?PT>E?{{0`99Q(T4pC{rZ(1*Z4 z=x*pc^wdVE@y^6HP;h+;;QRD$joaj(%+mE29;{qb_1RiD6 zfN?jg&+o?Sdu-q2TpS!)88-@B2n9+ADF1HcVom~CR#`3vOcBz?Z0FMiU)Ch7m<5So z9*()|J0%1xS{VgF;RfW|Oi8}e+X(T%le>{K7!@bivr3nTNPNgw<6E!wz@#$!-NsMb z_-E*Ue+E*OW!15UJ?8(LxT$PD`pFH8TwZ6tkK4+-V}>N#pK}d6mjmV4>+;{du1Y)b z^}JsA`MXbYt+|dTGpBK<75{!x`)J{vX6Ac;-z5KKueE({JPtU&AfaX- ztI@{HE6Ud&M}HJ>wVRyz>DZl`otf`U9)JE-_Bs9F``R@NGhXV}Pn?1iy;hoIQA_&C1^}O=M z3wiyD51Y1U;A?|=kxjR3#4yk3UsnD_MZW{JDRcE{h@Mpkw$rnZ`l%{Siod<<%!Cl z->qqzT*oSJXZ87VB-@&Toy$bn)}%OO@VqeFaIPfs^Wl7(m4$!b2{VU*ymzAEg3^M; z1(y9T3gt@_L1ASxrFoC_YQf2jEHd>KTC4BHYZ3Caro4%f5u}iZV`)R* zp|5v(8)0E}V)te#h|&p+K(p*_Zg{l%!SkARbNHVbFJS!5dgrg%hQ|t%;(pm&%|6He zS#rbw$-Il(7?c0#{|`Leu<>)ldIPS-4SU@mhTq_S!npjTp2in3>r3&=zwl-p$YZ=* z_h8=k#=Y!<0s)B*Z&>lJWZg#{08>@0urB@OSg+ ztHtJ(xBCu#ywPy8>E<1~%J~%<-ybxT+y9RE&nO%7&wiJ#6${?dkHD;%sM(6;eQwxeo3RO{N!35Y9Z&FhN@|W2cZ{ zB2at+qaw2tTgxfNdL5Tb>svj3?G^Bx&mG7Dbl^mj(`-y&D$Rje>Ow;%pHlkQhWcFN zW2f13W*f%YCEV`$_=)j$T2J}`k5^(Fs!U&>U=*MJ<@R|=gTy-5s}1_x6%PV;Bp=8$ zpY-o}bU>WQ!vRv2GWj<%pM%t%DWS&u=cFEJdhHs@EC!M=VJi_>X?Zq( zO}oG9lGyov1_=`(`tq2pxSsEv(mcn*nXM(J)4^`;)lOi5O4ox7G2g#&9TO-3K&DH* z=Wh4fH_y*NApsmR3&k!3?l_mp0}4N2IL$xz>HsXfcsPCrtvXcCYX3a@V$J$FjJz2K znAj&8$DawWSbcpCqy5j>yo(Pt82;=2y22nq;=@)(+16^7Ic3V3;-4LWK^s`OPhBbL zK-B>={x32=CN*#|C$Y8oC1@^BxGd4iXb5spja9etkgB*yq z^2`J#$K-~PMYVPIzu98!vmBV~zMC;#|Nm?M`sM6v<|^Jd&%Ym7@onOb2fugLeKD<^ jzhla6s|R}*-~Pq@;@)%n>AZDT3_#%N>gTe~DWM4fzjSaC delta 835 zcmaFK`-*pi0dxIQPZ!6KiaBrZIRQNY>d3@#97u(vdESLY)>?7u$F5k(^bnkcV_E4?} zpDlG?a)sBPX3LSD^dj%icHb@UUNSDfdxMqPiLK=q+nuM8d9n8cr7Nc2-&iVrhWWkh zU3F$B|Cr7}51JhY;K4{!Ae6U5@ z^Z#d?0>KRy9Wr(gzRvUbc(BEpJ!iHaBYzcNjzQPAhW1ma0^n z!q&2DjZ5E~GF7D`5GS&=fK&nfGWiEHj{|SqsZ}%M&lx2g{JLlrV>d`jirK2;%A9BB z*A6ciy0p$;U19^&bLNb)t)F8~Ir=RD`gEO(!u)fujsOExx*lZ6?E4Ynji4X^ncw@p z)mb$js8s+GHUZo(G-95cuz^AlXqbO`X#y<7*jj2dLm%#Mn*Vug#=h`#4QwU}jm;-! z>Oa%ob2a;1!~8#I+X530Nc=xq6(V84^W#=S-yvHjzugnJbXP6_hUyB7`@)Kb3APEd z*{k?!JRMpY4Vj(PH%tlMklAynVFt)Sc5{zTzQ`*P%rFz&CO-SE2p@BQnSnXjFj@P798_Zl|8J#s$$jj{hVYma}- hsa)9)_b%rCW$nHAFM82lXFmoY@O1TaS?83{1OO1abFKgY