From 2acf56f5f25868fd1f24acb3db04d5b8edbc5cc6 Mon Sep 17 00:00:00 2001 From: Evan Barger Date: Wed, 15 Jul 2020 21:05:42 -0400 Subject: [PATCH] Remove blocks component, it's just confusing. Remove drop shadow effect on news. --- img/free_block.png | Bin 4937 -> 0 bytes img/used_block.png | Bin 4251 -> 0 bytes index.html | 1 - script/app.js | 19 ------------------- script/gbnp.js | 14 ++++++++------ 5 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 img/free_block.png delete mode 100644 img/used_block.png diff --git a/img/free_block.png b/img/free_block.png deleted file mode 100644 index 26d7262e9b0184c3530e540ecb98ef713eb41860..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4937 zcmZ`+byO7Ex*r%Cq&B7Fpjp+Q1a8l+3Q zrJLdDIrrUr*1GTQwRU~q@Au^&d+i7vE!Z8B`y>DW;Et+_qTa6^^m`H!{8~|de#Za+ znF3NlK}S_V0i@&MYL9e6001fxNk)VQ319xmZYz{`z`-jFomXU2NuidHG$;v)j>Dr? z3n!NAis9qIcvImpH1gzcm;m6sr`6o2*blk+<&pRdJg$1OMuYx8oBao_k5&g-7WmWJ z$N_lu_XyjsBwOK8jo3i z`zDWBNsVf_twJ*pP|cab+m9z(M!!Xm->lJF;6-ColnS8+=4ysb=5VbXvXH+<8@sq< z<0?oj#$lPX*JQ*-3B?;``{c??l^(8G#cRCn%sLIKTMklpiFpnRV`5B~N1`+H?I-Iq zrhKVL%8A|U#iXDFHd5g-;pb}p;kuJ`hDC)6RQoQOow8+zFVF=hB@Kj}ruhtc4R2o(GL55{e%dX_Yl>|Q% z2V1Z7Db()C09~zYBJG{3Kf1!Icg~5D?%3(UV@vD z#4=nRz=4uTJG3+)~vYG~p;YyxtdWt7?z~s~Yxwx@U?qO6whFs70Ofn{rz@ z%|a74=0$`9g)y~4ct@9;4fimWXvdAar6jcl@P}J>i`&l^PHj^(*_6}76vPumOrfR; zO5G#OTh_tcLpW@qrH)#+t@g9z)s4$?80MANvltc^T(f;$0cui;;HtU2czuRtYs3)JQ*p3keaT8_QGSA;z0}9Z3wUiZ zgxf%p8An1}P?P5??V6DB{uhXqTUYasPP$4BBTm4Zv+%7)-%+|3fwECvZJTS!xB`BT zK|!}KTpNp}06V5cfRioJtQ+XL7zVFB?T%zajqJP5yZ3OPOCUQXzS6Z8l)nI$f4++b zSW*(nx6@Gqsbxu0@tXKTuizv_A@o*YZv0iNhsOA&?S3DKoq!S@4~Fo_Lu?mm#VEip z92d!FrLq?BH*kK+GKYZJL&JusY`bu)lrpJ|x=0UT@^LEcgAx+3QKF*l})hOtxMi8xi%MvE3veheRthzxg(XbOi#>~_JrET|*wG(0#j z;%!vS^rTA?Yr<+?dWL$Yjj3MBj)P3&%)jKV7*wa4X;gw-xtKXEIb}G`bUnH2XqnZ> zUTLQ(!{w(mka=c>o_d$XjRyXu%pxz+m9o?;3Looe>;2SQaBy%iMxq^~zEdLmhKt80 zE8LZrU-ZB(=lz8`f<4E7D;iuE^HBVF<SrZ=qoVrv)n1oi7_EoOZ#QnGz4D7YceMYc;O9wr{9PIg9TA$l#`S=mf#;Y{dzVTEh(e1~g!W6=Tf|kg@$>wh%E;sl(;Nm8V}js`PYhsuRA_Jl+sMXPtT`aPVQ;TGUL~+!%}xJ^@pNF_6bH zT1Yk{&%aSUX48Z5F}VA685Kzgy>3YJeOfr*`-m+PRu}brcWdPd9DST9KN$ z$~}WIQ{+6)k&+I&YCN~UaybilJRMkLb-XqldtH8w31ql|UejZdScYo}Ts|NMrxu3- zSOL6vVTzkm%?O8=GnJ>v^?{H>*xWNG=2MN+VJki{J`5j*UlGFosE}tRu=t6Cy+eS5 zcB=p6@rQyRq5I+ch##V2_KXkS$BYW~p!)hAaj^=sEwPodK2U}#sj->n4;4Ss<;~wy zo>7i0$gq(md{`9}#Ss(DWGZ#4I@^n(cYnXUd62MN|G7<_NX_`I8`m(4 zZuVq)VU{pU33xNW!|m{JCB~htr=QVBx|>}oaU@esO;c^|?X-ln-F4|f7R@YIq83Ja zIMC)t*T)16&Q%SlFx+3z=Wt$F-o#`2v}SOY&V|2TG%LX(VZPJ$$neNwA9%rgVU8=) z;n6Wl))uu&KPY%3Xk_P23=F;d$%V?)fWt58Zg#Eoc7V6W>G%#db0yQfVP&>v7HA{o zUU#mT?Q3Ce(bNUkzb}v*5bB%QG`NpA<+SO`*(xSvYe%w?7Y`AKZwt) z>8;xj-h51jH#eW}Hm~^dbJ%mB)E?YWpQ;Cx7?#u=_dH*?*uJ+&sz^HhM^)&S65XvURh^DAmysG`89`Sy5uXYX%!7%kSauV>1sVQ2XVBQ^57+0gWa$2(uZQ?sk8GZNA`MEFxCM zCs{I2ss#P)pk^;^`{PUVJoA+7*r53f`NRA_n~ouKZO<&A&9i4diwpPsdQLoB-?nZA zwQNKmWK_7qTAX*IcUx}3XXXo6)f7F>_wNJrWfG)~0^P4i4n>x>=diQb zKw_h>PXbA-+;ZvZ0nPIy0DgP`^x7~t#whD3F{F5)NDU85W0-}Xw1guI%%siP-YEd= zgmr=`Jvzk+28dq(yig2`&*Bl7hEhz;77hr0de$}o495Mu{sD_^oy1}xA_7xo0LH)~ zs3lJ*(I5dsDv9Tm4dh%Gd#C41Fa>k4GV`xr1+kk790dUU!SQ?IsOqur0|2;qNCRU} zV@(aHt*bNG+RoJm0Y*E!{Xzo(l4$6!qcg(O8iaOsazR1SQmlU=puf()#Sm7|Ul316 zDOO`m9gu>n2LdDl76uEjN|S&^(fb{6^4u6KH`5|i2P8H`Ct)3S)_D$Xb* zsV@r;^+dd4dg}ZW+$Q?*BRoihvEWU;p9J$&>v~HXoQreu7I%0BaMA+R3i7(YI4RO- z8`EdIR+uDyr$__^v*l$9pt+^h)9QkO-gxl_Xj|Y;)K@NJe*`4XQp-!nq&~yfoxg1f zQjSej;B42oo67s#hH*I1-Jy-Y{~-_)ld+p|`EtLFs8=`KD%I-cuJe+ld$NjD2@a}3 z{9UtNrBxm#7(}utc4P4tA*oXwirKj5epcUvIlU1vJ72*)m6@IB;Ty@GqSS8EPAVS* z)Pn7#EhS@xuxSTxv}D~+7y0&uhAwhnrkm7Zu9FwXK>@%PwD4mJ)@6!?0WIeiJ zccxY9)n26%Gch!<8c`LDv3elb?&WD6?xCtUp-GCsYeJ}vXDzM=d~d8W?}@{C!{)0> zzO%QNU-#r?%Gm}^KyRb99=in0;-SRC*#Y{f>g`y}On?)d$q>jManw2A;?GX;_2Oc? z-qAf{pkJQWl>g6ppfuY8i!K?Rb?953Z*nE?XZ0PzG;8hLyS@xKNH^g`grud>n+0y$ zHV5wA@tmui7gy#MrP^ntV7PV49jVL}Fqe&c%F#REIBb`;mYinL*?k6H8tD1+t9aSO zWf=)-p#Mittf!da(VPJ3OaRLgL}xJBQo zCbyb@I{G&FMCzN#H&uRK=TDjCjZnGMWdf6yKNuUlsyy^r*@Q=9L}bfwOi=tzgRVf2 zcKQl>IR*1aI;R2+QH%;Q^MHgQsqCm1k=%=wZ;29n(9(9n8blp*`3D5-UlT!JJUZ<5 zj91wuh{<+=9wa1Wbpf9&Le~_n+Hh$3)-l1e4tUog56YlMLeJBRQxDj8gAX>Ti>nL7 zw<#uu!|%tbch$&56UIK^J|K*D+UN^xFpt2Yq02*iT5Zz%uJ#mCOcexx4pk1Q-Bz1; z+bPtZUh?FHn)Io^o846!!uzTezJuhZR65{v&sH(V&7N{wY7@^-h#ZaFXr7h3wkNCK z&fgS1*g1RZmfmdOr2AHU;_ek5L>GLEpF{mln3?L~fY6oq9{KVu&2~V^tE^aWEAZPb zpDmFQY4#IlyYwM{kB#1l^&FZuPOQ>(n9Ba?>6wE{)XUVpHWJS)@F#H40OKPe;F8=! zq3lB5=EMrg6qO@pd{>&ysAbCAh({#Q!k$h+9cGv(A?k#GCtSC(58^VZxclDI~) tYW%+d^Qiy; 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͘p)+E&H>f3?XkFD98 znVV1|lTUwz65Dtd(9;7jbHo4vJOJd%xFFFa_b@fGY_L=V_lCwe7ccDxmOM@lZT{AF zF!> zWQsJ^)`Hl3xPxpRJnS4nD0k0WGyoujg4`b69g(&`l)D?k2ZDmK{f&U!p6|q9HsIe7 zq$`xoR9g?I=;7@M6a$HZ1leSXfk2>)w}TVJKuP6a^xGSh%^8XGgn+^R{{A3;5s-)X zBe0N^loVJ{7%VI-aElP|2|yriQ341b_J550uN@^vAA4`OClc;~0N&ZPwe#>rLfP2v z9Q}Lz6Q?5z{vS^WpMRxwn;`g30~P`ag8wfX67KZ>(C#$<(EiTrA9pf$#vpodl%pF= z3GVKQ@VO05R!CA*=5IIurTI^wzcEdJXA1w${7v&4^DYvIt~cEAwn%rSkQI^v|Cj7v zcp30roqns^KTY{tdfOFQVj1wiJ1k4QQA6Da0ATH^D?Kz)BWq7hsCX|(`a~p`C-M!) zy8T&AB%y3F@MddQ=Xl!*=DlWw@NLi@3D(XMHRr$oul8m2_5N&3EJRD?;g+sg5=MCfwt2Y^xWWW+Ve1Hbp zkoQpU&52~g?BzQ%l9e@nQ7Xi>rQXW zXVn|mNj=er=N2Tcq`{>k(8o}^2}E=K{LfeOKVJtJF)y<(`Bo00?OdMP9Ra#xwDGGS z3sJbdc}FlcJ0ukk=mG0#+BuYchhQzvx``idbI@bDZ1ut_$21cA?AfWS<)d+-GK>i- ztjQ#VQi>Y%L7n6+W+%fcufEY8BquyESO{8A#qAoNeJ81Sk&#G2T2JfiJg+iD67GJj zKSba?b|ly^y|e5oDf*(Ttn{Exct9G9YTRT?u(eM|K9BAL+vCyLi*f!0@eaPz2wu%b z?!YTcVEqx%m`5pdCrSLz+Nk&JGKOw+VVkc=qVyd&T;MGh#&5`$^+Wdc+}lZdxH|aD eq-JHwwkW~}=BkvKTW#;&ySlQDQjLO5 Limit is 7 blocks - diff --git a/script/app.js b/script/app.js index aeb7cde..f959792 100644 --- a/script/app.js +++ b/script/app.js @@ -22,25 +22,6 @@ Vue.component('bitmap-preview', { template: '' }); -Vue.component('blocks', { - props: ['used'], - computed: { - blocksUsedKeys: function () { - return [...Array(this.used).keys()].map((v) => `u${v}`); - }, - blocksFreeKeys: function () { - return [...Array(7 - this.used).keys()].map((v) => `f${v}`); - } - }, - template: ` - - - - - - ` -}) - Vue.component('ticker-settings', { props: ['processor', 'fontsLoaded', 'fontIndex'], data: function() { diff --git a/script/gbnp.js b/script/gbnp.js index ac382a2..11a72ed 100644 --- a/script/gbnp.js +++ b/script/gbnp.js @@ -516,8 +516,9 @@ class TickerText { ctx.font = font; ctx.fillStyle = 'black'; ctx.fillRect(0, 0, canvas.width, canvas.height); - ctx.fillStyle = '#888'; - ctx.fillText(text,3,14); + + // ctx.fillStyle = '#888'; // drop shadow + // ctx.fillText(text,3,14); ctx.fillStyle = 'white'; ctx.fillText(text,1,12); @@ -527,11 +528,12 @@ class TickerText { let byte = 0; for (let j = 0; j < 4; j++) { let red = imageData[i+j*4]; - if (red < 100) { + if (red < 210) { byte = byte | 0b11 << (6 - j*2); - } else if (red < 210) { - byte = byte | 0b01 << (6 - j*2); - } + } + // else if (red < 210) { + // byte = byte | 0b01 << (6 - j*2); + // } } buffer.push(byte) }