From 47ab37bd28006361252199fab6d9d6cc3c7e80c7 Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Sat, 14 Dec 2024 14:40:03 +0100 Subject: [PATCH 1/2] redraw arrows and mirrors --- assets/tiles/arrow_down.png | Bin 194 -> 197 bytes assets/tiles/arrow_left.png | Bin 180 -> 174 bytes assets/tiles/arrow_right.png | Bin 193 -> 158 bytes assets/tiles/arrow_up.png | Bin 187 -> 153 bytes assets/tiles/mirror_back.png | Bin 180 -> 182 bytes assets/tiles/mirror_forward.png | Bin 162 -> 163 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/tiles/arrow_down.png b/assets/tiles/arrow_down.png index fb2f672bc4446e88ef8d9a3ac92d37cef8eba3f0..b7f31de29089d2d16081141703882b81d642f497 100644 GIT binary patch delta 169 zcmV;a09OCP0mT83B!7%aL_t(IjbmUKXuycf2`!)bpID8nJJT5%7#J8>ut~nZcNV8c zK_z1pK8gYF@1123R5Hd;gwFy-bV-;uu(<+eFwFTFE+EDg=ms;PE7-Go79+A^7{(@# z)dl!mfz4YOF2LprT(;vh09hl<6}X}nrvd1;VY3~t0m!!EOCneV0iooL*98>YP7DA5 Xdc;Ow$Ly5{00000NkvXXu0mjfDj-Dl delta 166 zcmV;X09pUV0m1>0B!7uXL_t(IjqQ=a34kyV1ScXEA?U{rY{Qy-S(9y~13v~VLWKB= zoY7MepYH1*yK_kvzL4uD@A}EV@h1SYU6}2{6UfkwKKKEQJOIe*l%mOv77laOmSzXI zgPesA01cvrPXRFm*xnn5H$eD2d2P8h4oknd%B!6{DL_t(IjbmUKav-#P=Ks+0ng3yY7E&}~6DMc@y2khS&N2up z851^ukVc#a5UUZx08%x=028u?_xH}iC5X|C;(|S^XE8D`Ffh1;ru|1YfRI5LVL+-u zjD(zsZV(Kt?o4OI>H=b2L^f~-B!7EJL_t(IjbmV-C3w8`+5g8|pZ&)t&Vozx-R4LCf1Ue7P@EB$ zW*A$!R*n&$IEDeFXvQ#rRLv*`kfRxH0J)kO7#J9skU4Bd*dqm(I94yP8L=?PdP@-$ z$1s3gLvThTv4-GHNW>U|)c{fqVZvnqEZWfX11@p00RRX|iy37>!sBAVnii j7Z9rv!vIn>4jupiZ_`1ro$YoR00000NkvXXu0mjfh}|>! delta 165 zcmV;W09yZ^0l@)~B!7rWL_t(IjjfZx34kyV1V<5z5cFdQwqZ@atjRXgfgc5n2!Z%f ziJnmt+*cTGCtM)#N9JL%^RU>j+)WCgl|d`Rb=b$Q3PCkv1_8D(3%av_M72xF*3 z2tp;df)GjS6YSB-Jo3jC0P3z1x4Yc?h+oP=5L!M7V#cD{#7i7~3&ifX{YZuE6R7Vr|DT e0H4i+7XSc|GA9*21;=~<0000U2pJrGLAlry;2otgm$eQmq zKl=ac+#iNt=l(DtMtm+IyQ~k3pMv z#;tls)#M#VUY#p(TVquq>99^wg3H5{WwnZC+k+_z*97*QQ$8lp)aY_TV9_G3`HC)* z4d(?G@g7L!5SIHYk#PQ1WY39{^BNg-jVC5?>~c(DW@r+==D?pnVQ~Nh5O})!xvX-B!7EJL_t(IjbmV-26(*n+5g8|pZzCCFB1a;1H-R#e;9t9`@=wv zA&fA_-R4LC85kHC*o;^hWWA*racjY00J(->C?eGmtO`gm1g9jihTt`w7()p9k&q!o zg)}}xh>mYuh7fH4E<;E%0GlC9q#B@HE62#d0Led80RaAfKM|6D(7lQP000076Z%|1l0JKok%QOcS#VxlK=n!07*qoM6N<$f{`jSUH||9 delta 133 zcmZ3?xQKCrN?oR>i(`mIZ*qbJ$A^m7oB#K3xBGqm01!B>dbay)|G)oM-`UTltArZ& ztc}q=?lFn+hKX=4gWg#e$p(L8M`n)9W7!ObvkIjg)}*aro3KdoFhh{(VhM-7v>l93 kveFWO!0Fk9RWr317_=HJFNCq4`^f+Vp00i_>zopr0JVQN Date: Sat, 14 Dec 2024 14:41:04 +0100 Subject: [PATCH 2/2] make colours more consistent --- assets/tiles/block.png | Bin 155 -> 155 bytes assets/tiles/button_off.png | Bin 188 -> 188 bytes assets/tiles/button_on.png | Bin 175 -> 172 bytes assets/tiles/silo_off.png | Bin 223 -> 221 bytes assets/tiles/silo_on.png | Bin 300 -> 301 bytes assets/tiles/wire_cross_off.png | Bin 168 -> 168 bytes assets/tiles/wire_cross_on.png | Bin 168 -> 169 bytes assets/tiles/wire_horizontal_off.png | Bin 111 -> 111 bytes assets/tiles/wire_horizontal_on.png | Bin 110 -> 110 bytes assets/tiles/wire_vertical_off.png | Bin 124 -> 124 bytes assets/tiles/wire_vertical_on.png | Bin 124 -> 125 bytes src/util.rs | 9 ++++++++- 12 files changed, 8 insertions(+), 1 deletion(-) diff --git a/assets/tiles/block.png b/assets/tiles/block.png index 3a3cc6871a91119e002244ee4a7c178952aabc7a..1742ead7a5a39bc43d60d91f598021a225b5f284 100644 GIT binary patch delta 68 zcmbQuIGb^Tk?O*Q3;%mw+)?#4%Z&{P)KU(9e}CV2PyK(niMVn%;nM01NgmKW%k~e z$~Uu9ei#h7`yr^R<*>$Zf(%r?nYEci3~~d`%p7{tU<`-|h{)-sszE9ujt$ZP01+uy z*=NcX?t)jE-U9r{xC2#P0F1wQ0^NPPgS~Rll@k1pR(0P-O%O<=yMO=y002ovPDHLk FV1ja~Mg{-? delta 151 zcmV;I0BHZb0lWc_Eq}Waz#t4mO^!jl6E&kyc@%1P@+L_I0VDG15|z3qTfQ^V@8yu0 zQreL(A`{;X8!Dv?UBL_t(IjqQ-J5x^h}1I1k?VHRd_W{PKF7Oz4o6CzBJDk<`% zPA_}_Kkt*GP()gktLoJ60ZRw;R@@=sSYp{l7NT5L)5awh`2y~2TzYarA22iIoTrzf y3mh{8FnnSur2*(eD_pF#UY|JPLn~bT4ky9QFB9igS#wB delta 147 zcmV;E0BrxP0j~j&B!6~EL_t(IjqQ-J5r7~N1dkbeFr_g{!N4zt#y+(Qj2`iL0wWFF z@aFdT0r+{J;DtHo>g6Ib^jpBve#ou3t=Sz5ESt!Jmy1YPxWpn~z@3FlPcCQ!s)`un z@RE0dp{fA7PfRIQ0BvZ7iKUe56MJlEhKb+d1Y$Th=+k$gunYhI002ovPDHLkV1ltq BLtX#? diff --git a/assets/tiles/silo_off.png b/assets/tiles/silo_off.png index 27d9c137a60fd691f9d78a44ccc37f2180a8715d..23585091f62270f76f4de736085e8872171d0659 100644 GIT binary patch delta 193 zcmV;y06zcU0o?(RB!8qyL_t(IjbmUK@_-SWU}$LQe{ABbSFgrU4;MhzboT67thN~& z8)F#82-A$L>HYinSPc*q6htv>_3G7(j4;i(G~qH-NlA&p*w~nXQAtVZKR(U)C>lA7@EI+{mLLIDT!j(;>C*@8DW~SX+qYF4kRTd8H|mM85p&+wEpAL zj7=lDAxxy$iVd*f()`7-4MmJ+e-%~(Fv8%KRtf_H0|Uc<9z1cZ8ej&&!+?PSGZya1 xgrR7H8K!z;GF%KE3orqS(g8XkB_$3#003s$Rd*0<8j&B!BctL_t(Ijm?v>Y63wJhQB?~5WK>G*xGupVI}r+rKLe%AYJ;r zfWAYPfTeGum0&Bv267S-2x}p?S(ueuVjks8AtswFjVslY8{V$yW YKyY0<>Lj2j01E&B07*qoM6N<$g5cYOssI20 delta 273 zcmV+s0q*{-0;~d%B!BZsL_t(Ijm?v>PQx$|hCfGYP}K|!s4FXZ1)hMJ{X7=I3-AU= zya3tp(uKWmQdX7@Ri#vFA`2EXR54Dl0}>1WbUxpGwtk=Ck5Z|P+5Osu>-MpX)_zM4 z8;2T#vT#w{tdh-l7x4o;V4`0ffZD%B0Z*@SNCqGxqt^~0oqxI>B_eLwUP3Vk;AA=j zz@47|2)y1rpxgqN@2X>_n0vr)AWdENO$2zit&dZFgz5vDZ4@#F%Cr?e&TdB`A*h2j zb&0le93&BO&r{=z^Ihdlg)d_d?#k!16^t>;PgVGoAuN=(;$vfsg2Z1)%|+Mrzw`+} XZ(XyNGNGRU015yANkvXXu0mjfQ8;?) diff --git a/assets/tiles/wire_cross_off.png b/assets/tiles/wire_cross_off.png index b511c348ad342e11b110f2de81148d11cad1d715..dc0ba7dfe663b58a9a1b69a7209d890713ef5491 100644 GIT binary patch delta 122 zcmV-=0EPdk0jL3xHFG7lU@fUKwOEt)@*^vFatH1!gk{h$hKRd&fYurSwN?Nk!sc#L z0991GCE!gi0E~m3#NB%y!%kW4t(0>70{Gwtc}Su%izES{C7J)c>ZFxnJBbLpK%`#) cN}82O4`E9vAB@pdIsgCw07*qoM6N<$f&$1h*#H0l delta 122 zcmV-=0EPdk0jL3xHFGt7ttZu`9&7Smeq;qt?!bM8unZc;5OMbo&{_ka)(SvG*xXGD zpo(g@1iZ-wfN`*sxO>lI*eR>Ml~Rsh03X~S4@p#Jkt6`LB=etFowPD+ClO&6i1Z6U cNwX5^0jg6dXG`XNod5s;07*qoM6N<$g66g}A^-pY diff --git a/assets/tiles/wire_cross_on.png b/assets/tiles/wire_cross_on.png index d79ca2c1b5e0f12cd9541dd62c08d2f6e7d1b4e1..6c8986eb1dd25a69f6824ff192538cdaf0aaa2b7 100644 GIT binary patch delta 141 zcmV;80CNAR0jU9yB!6&8L_t(Ijm?rl3V<*S1Sh2*@Nw}8KF&POC)86fWdpS+xTg@7 zp$%h*xO)RQw*X+j9DsX_l3Sk-A zFouY`H-K{s0QSoPhzJ|IMFCV%?NY##`~c7owi0)5wGT68wYPS#`~rC42DM9~GKwSt upd}gqoOMcO*i0hAejw5(03}T((hZqSDraZ`$&mm6002ovP6b4+LSTaBZ#8QG diff --git a/assets/tiles/wire_horizontal_off.png b/assets/tiles/wire_horizontal_off.png index c0ac36ec49cb67a1ba163fa00f7565673cbf53f2..619e0148e3b5b83f07e573dc4e99b807a080b66d 100644 GIT binary patch delta 71 zcmd1LpP=hx$je~BbNEiChttA{Q}US~-Heu!s1|aZs^>bP0l+XkK`ZXL1 delta 71 zcmd1LpP=isk(a@Mr`h9b_MT_+{?xlwvt-{mI4SYtnKQ*HWHd?Skpw8Gyjk)z4*}Q$iB}c&8pr diff --git a/assets/tiles/wire_horizontal_on.png b/assets/tiles/wire_horizontal_on.png index 3a961668c72d1f50ae868a4d4cd3cd8402f5d535..1f191b002ee3845c08fa060e3966ad7f0e9feacc 100644 GIT binary patch delta 62 zcmd1Hn_z0${gCC}^OmBP>s8y8S=sz2ndQx7aQN!VI&C83x5`4+>P6A=3_m99;QibG SZmJOj5O})!xvXgTe~DWM4fuYn2U delta 33 ncmb=anPAQ$=l{HNqP4C_K^nh;*%F(T3_#%N>gTe~DWM4fx2g(M diff --git a/assets/tiles/wire_vertical_on.png b/assets/tiles/wire_vertical_on.png index 59222fcc5177b423bad22f6b554872dc8a4ba80b..23385814c8c105f91708562afaa0911e24f3f3a5 100644 GIT binary patch delta 55 zcmb=aouDG+;_2cTV$u8d@>HL6B+;j diff --git a/src/util.rs b/src/util.rs index 98dd8cb..20a28d0 100644 --- a/src/util.rs +++ b/src/util.rs @@ -183,7 +183,14 @@ pub fn texture_option_button( width: tex_size + border * 2., height: tex_size + border * 2., }; - d.draw_rectangle_rec(bounds, widget_bg(&option == current)); + d.draw_rectangle_rec( + bounds, + if &option == current { + BG_WIDGET_ACTIVE + } else { + gray(16) + }, + ); d.draw_texture_ex( texture, pos + Vector2::new(border, border),