From 9ddd7da1c215bfdc8c516790117dddf535135dd9 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 4 Jun 2020 21:10:54 +1200 Subject: [PATCH] Trial of skipping ever n pixel in width --- aura/examples/animatrix.rs | 9 ++++++--- aura/examples/non-skewed.bmp | Bin 0 -> 18634 bytes aura/examples/non-skewed_r.bmp | Bin 0 -> 18634 bytes aura/examples/test2.bmp | Bin 0 -> 7754 bytes aura/src/anime_matrix.rs | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 aura/examples/non-skewed.bmp create mode 100644 aura/examples/non-skewed_r.bmp create mode 100644 aura/examples/test2.bmp diff --git a/aura/examples/animatrix.rs b/aura/examples/animatrix.rs index fdcac245..52f9d5be 100644 --- a/aura/examples/animatrix.rs +++ b/aura/examples/animatrix.rs @@ -4,7 +4,8 @@ use tinybmp::{Bmp, Pixel}; fn main() { let mut writer = AniMeDbusWriter::new().unwrap(); - let bmp = Bmp::from_slice(include_bytes!("test.bmp")).expect("Failed to parse BMP image"); + let bmp = + Bmp::from_slice(include_bytes!("non-skewed_r.bmp")).expect("Failed to parse BMP image"); let pixels: Vec = bmp.into_iter().collect(); //assert_eq!(pixels.len(), 56 * 56); @@ -13,8 +14,10 @@ fn main() { // Aligned left for px in pixels { - if (px.x as usize) < WIDTH { - matrix.get_mut()[px.y as usize][px.x as usize] = px.color as u8; + if (px.x as usize / 2) < WIDTH && (px.y as usize) < HEIGHT { + if px.x % 2 == 0 { + matrix.get_mut()[px.y as usize][px.x as usize / 2] = px.color as u8; + } } } diff --git a/aura/examples/non-skewed.bmp b/aura/examples/non-skewed.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4d43c87f66ee70999702e3ae35ece16b583b9315 GIT binary patch literal 18634 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 S!h`2?=FFMn-E%qRjsJfp`>yc- literal 0 HcmV?d00001 diff --git a/aura/examples/non-skewed_r.bmp b/aura/examples/non-skewed_r.bmp new file mode 100644 index 0000000000000000000000000000000000000000..2fb40a236afd43e791f95fb7bb9f0f8bdc98d9b0 GIT binary patch literal 18634 zcmeI2NoZ9`6oxbCGVa7}F9eq^bg2+yprg{8-UtzO;ediD+75_~IDn!qLUbWfQE@;; zMN||NML}_h^BA1LdBQ2qQ}z4G{Fi!lhnLp8y!X0q;Y-!6I(6zl=bk!s>RfC7Xs#=> zWpU>3-o=wf~fBvPB_SO|)!VE{aroU7N zsSTtyklH|M1E~$9HjvstY6Gbaq&AS+KxzZ24Wu@Z+CXXpsSTtyklH|M1E~$9HjvuD z|HTG|4I5@^YiomVL~GZsHT)z$WA*j*!L$1R3w32>Wgu7Au3c^W-o1O~)vH&gfB*hw z(4ax))2C1NN1Hyzph5mFUAhGGU0$WEn^UJwS@}kd8f69#9&EmS`(`M&Zrw6BZrreK z{?Mk60u8jIM~}91PoF*==%ti(0rsa)pIR9|fBtOkz&^C&4|c;G%9AHgN>(4^#*H&y zzI-v*#gZjUY}*(A_3PK>^5x6s`}gnuP~;_Uu{vzLzaqW*QqC4R({OU{kEY zT6_2IHLP81Izbmn1sNVadSq6vTxs6Fe{V_U8`iB`XXUwg@nRB-*fG{FHhu7};>yE^ z56zr8a{|oO)z#*}fdkft9zT9;`|&kDTUfhT^nqVvFJr$^<;amEA*_BJaqir?sHwK^ z-Me==&m`6cLoxVRd_5)VoLIhmxz$BQMMX#_dY|}@r~Lx6ni?}=#0Ycu?p=HK zE?l@UbY5v~u!wJ=>Nq=>F3QWxV==O4;)>!^*;21wz0C08!!54~6DEXo0w1sxLJz{o z+QbBYIePS{#g(LsZr!>Cv8X?vXJU5vyYV{D@a);Mr+M?{O=uceqz@OP`tn&57ZG=A zzX%+@lXa8!h;W@he_qof>qCbQ1@dVQ^^_@7Ed8ZRm&}eGJA(5HEX1*ei0$v+zaNr; zee9kit_)G_`Sa(8c=#Rt`t=Lx0{8o z!Cy?BIyDRH$&)8FJ+huTb7mGjykEY2X=%4^-D;*!pKjwCO$HNpK!2b4m^%8IyC?T8 zw=7z;D1=?>a#vAtb;9}4+S;n2P(5whv=C3?4aIc+1TYO5G9)xdI6Ar}PlNB*o!!NQ zKk3n5=orix&o7ef##cbJ=hB zZeKTG10#8-j+Wo&NA3#Wuk!ZoTbs*Tzka>#qIT!R#o%Ceb6{V;eih4{HG1jOr%#~o z-Me>(=77=7!MT_^x=jvCc^lW4Ba<5wF&0(Oh2j&i;g1wkMbSs~ZQQsq(EExNE3!zy z2F8w-JB}ZDJ>|7Ne*9?W&Yf%Twt&LdF)uFeL>H@9ueLNglP_GjkR?xh9(1k?qdNy| zVANPXYx2In9~G8;`}SE3N%xVfSFc(c`Ifl&Ry^Zse1 z_}U}i_U+p(ZQNPQSu}9qK(lJqDqqat8Q<;76%4dBI!hm5aQBOFkjshlouW~VuZW80 z7(aOMV3wSI{3{-^Md?KS)a;kKy1FbrqRU6^`cvU>&m8sr+giHNUWz-1@!La(4h_y1 zVm7yQra$%1TNlT#w28rachW^uQ&a4j>Cw#g)ckWnS z=uV0*;^GnMLT3{?bYow5cV;}M{TCIlyK-{Jg7*6L>uz^!o4hdeOP4NsQL@@su3QOpDVe%=?`~;0f7GW*TAMXBR;W7ZdlYv4{Q2`N z+a{+tdGh3}KFLLm?I4S9Q}j{DA=BQxd9!`ykG@BZA3wg}`p|nw`d*38Aop|p_;D+P z8!rSxWg6Uz;U`}s-kc+@@03kyZZUnY6y~Jw*~)j!o;_P4glg>(Ul+s|QD>^lK(U;# z6hp25??7${`_-NXH#tzg;orV}+Z7{d6R!^#Fu>;C8yXr6d2?cLa!pYM-mHOL@E(fs z|2w$vgm26FE@Q`zEgE0p${y9m$Fj#c|A-0v{r)q$f(N|dNxPVQXOs?-`iL1R_<>x$ zz||GB^1bZ2q%}%ujM$#LKldzhYuv{v+-a1T=9#wcInY4M9Ok-t{8EzL$LhxRKlA@_ fH3z;fFMpj`+O<`AX literal 0 HcmV?d00001 diff --git a/aura/examples/test2.bmp b/aura/examples/test2.bmp new file mode 100644 index 0000000000000000000000000000000000000000..589295a706367380d936b3199c2917be4489251e GIT binary patch literal 7754 zcmds+T}V|~6vyw(Jp1aC4TA$d_~1hz2qH)z;)sYNif=v$K7I@@z` zfBo)KpM3Z4T=x~|zQWwsFRnjazq!Z3GcMPkAzv={^xu!TTwi{e%em;kv-BNb$6vo) z=$44o|MwLh9xn0m@u$AetgI}lsHiwqI|2d%FGH&Oz=x#VWG^=&&%}m^r>M27Z4W@9z2kRg@t1=!G})s zMqpr|C-We2odY^Z4;&sjsh>_wV1U^$7_H);ewXNynI&80qit zmlrQy$kx`DynOlc8$Jh<`}gmwdrzJ`k-fb=<5(0G6)FATfUeEWO}TUDj@aWBOfFrz zq-;GnIFRx2aicXbA|gUz0nP;l1%ge)-@w3tz-4xf&z?Q2{I4TwK05d;u3lM@K6@Y-?+?_Se_fCu?hK!v5LgjT<*4EiFy; zL~w`6J`pactE*Eo;V=A-PB@jCM*qVczqGctDlDq2tJO0n#oya=<>loHd;F{~)?K@H zP1SgEmpSl{k^I2?%lhpuef*bo|O+{V`H+hu_5QrpSSdptHdS#0v}WQwH)#kuB4U{59nE4 zT~)E5*MJkXM9-ZV$wPb(KXi3Kcv z_FCi~d!%=onVIn_n?7i8a8TtAoC$}J&)#g-IR5CU?SP}`CE!JG@`(rdggpNA>62G` ze^j^Udi(+>^M1(rmN&dLCd4Z?d$ZM3?n&nKTEquuIsb*p>({Rx>9@4a^jh%4ahTA1 zCMPEgF>CJw^z$Z1PfRqQ5JU78DJdzA)H2UK5GUR+v7hC5_NbmROwH|>kfYQ)eU{^m z=S=DKlw-$)`Ub!0vmAS`?D?D%b1)%ih*{1QoH)zz#cnX6-oUSihlh^x#rNzXN0yhD z6&B>`_tragpS%DIC(d$wwVAUV&TyPM%kk9?c$5CZ^jVIt`t`cp++0V_a= index {