From d740e725443c6ae443ab6abad400675ea11d3b6c Mon Sep 17 00:00:00 2001 From: Strangedusk Date: Sat, 23 Jul 2022 19:33:43 +0200 Subject: [PATCH] Complete renderer file structure --- res/fonts/MarginaliaRegular-8XlZ.ttf | Bin 0 -> 16716 bytes src/Game.zig | 2 +- src/Game/Grid.zig | 26 --------- src/Game/Piece.zig | 30 ---------- src/Game/Renderer.zig | 79 ++++++++++++++++++++++++++- src/MainMenu.zig | 17 +++--- src/MainMenu/Renderer.zig | 15 +++++ src/main.zig | 2 +- 8 files changed, 103 insertions(+), 68 deletions(-) create mode 100644 res/fonts/MarginaliaRegular-8XlZ.ttf create mode 100644 src/MainMenu/Renderer.zig diff --git a/res/fonts/MarginaliaRegular-8XlZ.ttf b/res/fonts/MarginaliaRegular-8XlZ.ttf new file mode 100644 index 0000000000000000000000000000000000000000..27dfc90c93e209df44ef7d7c5c33d50dd4c4ea1d GIT binary patch literal 16716 zcmeHPYiu0Xbw2wdmy|@wlC1ba*%L)^Y)29)xw1(^ekc^w7>Jw15(TG79k0k0cP%cL z++Br|Ex2wgr*06?f!o3g8WgUBJ|H1zf*5Uo*g;#QrBUQZ9{mxZMWB=d+5#?Mz)mfZ z6sO;J&b>3U%Oxc_N%JSOxHEU|kqw*wyz`ITSCDt=Qo^2 z{#~T)rAp)EeSff61HH3IZyhhzCg#`8--@OiP~SgZ9Vtln#XzLv1=PP?DV&^?-;q0z zzX|ohM4?jr!IOXaU9^8#r2D@otMx|etAhLeJ6JEoj`YG8|M;cPt>5=k5t0@8(I3A1 zZ~nSiTdb`Q*G}O+FKO+eeR>9n>xS9IT55KE=*rp2j%T#w8QCs5ElB%{=$g*YroN2Y zY#xL~mIm#L{C6|=uvOMIeNLnk*@xY&96WURG28{)Hm;o_hMs}U4C*M0ArOsYxA8mMLJyU+puD+agzMf@l!>e!S`>l3m`(&T%>Far~M*mvsNQZor^5lkN zxmTiL*cWT8XTDuKFOR>j)F!C|FBi+0Cl)5-M-Q@cdRPxejW73CFNeSSzMd|z;GlnH zkT&BCPe^@9vMG!)xeYFzksf(gUXfSjFXZd;4S7xeHg!+1Ik-L87TmFIV;G`c&{DrU z*c9A^`t7U_=fZys{~`Q#_;=yogx?Ck84g_d%!MNt4qrI*Fq}X{a(=6I)H@wt*E~Z`P)!- z`^S;cF4%wsS%M29AAA_;1(9u_zwNI?KC~U_4ANVeuF-D$NhIcxKKx~*H<6IP18wgB ztvi7KBR3%d=bhklCwSiZ91>{X)sKYyUC7^!z8`%U>1~l6uONZW4$#>NemfgnJJ`J1 z^%CM{S~{c~F>WL5y!_~Tbm8>E>F|HDXBMEKu3aJvr;#sb&;0KtT<=5KOCqu-_s;w} z*_3-H_wKtl!+`%ezjl6IM`!LGk@ju|LCk*)wDn=i8-0yZXD# z3?ucWi|p6gn;TxKUp!Yc@^fBySM*EG>b#zj+mXM@!TEt0d`e>SJp9#T^=*004OtFXmU;c}=q%)H3_S zu6hl7Gcze&3mR3g#rgBj`p$3EjybudnOciU**WZ8tc42OAjuq5qv9KbrSFAhl4hya z0EVf8LO=l5)(h*@T3Y(P7ut)C)k0^l^Jn!g@5!Bz$@DL1L(hQku3wHkGvgqNXG#_% zZ-CHM!B9i6%$x_XSo088r*C+i*q*A|*xQPAsad6O)=+OCee)>N&jUYv@`mO3p?&8G zs!F9`6zP%lCF0DZT<@l&CKp3!Ov{lAXTld*gI3_<#%hbdcun%kp8lSwn@h-xK2KV7 z0JL7q8~k`^E-g>U$7H`+U&$f&On5px08dEC5bA!*hyvUJlt05I9_ZzU^K)<-dNxVn z;Of!)s_|q;@JzHJUL!|rq(hI2vQ{9E$s| zA_b|XX0ub~DMaOQsV1GrFU-I=(3|mAoho+oF5GK7!*BX9O~g7^eQrt0(WFm549S$g zu=ff~k?DoIYM7#_Em~NpG}U?b1f-x826Lw1$RK8S#n7ZnAK%!;M@7r=&PQ)}#Wm@& zRR}=tU3if?Abdt!nak?T<4wE;2N?PEo z53&&fH5-MSKfg3+E^J`b+zP-L8no81*8(S@7d$C&0N_oRvEs?kaa2)qY8N`hsC3wK zn33R5Nx;kV0M{pHLF46AfBGCn;4dLeVp0JIm_Bw8+@lx3Vxpl4M8MvlrV218YxP>E zq-)i&&R{yzQOERG3nl9G5t}3v)*BR>bN)Q@mb5%Eh@v0>(z=FXWY)Pn(i*jC#9|_p z(u@ialmqJo^jj+%(1t%A(RJlWyksPyEQ`ob*ga4mKs-i7?ilo}Nf>-Od%I@2sx>=i zrxsq!PNmN;%w%iyd7NcoW?_byGBf$PcCye@7`b@$anfJg@xZdD?a;~i^ihz&AZIMV(;+d)PyxO-h}LzG;TD+AY-(KyoNQexe?^9 zH)AD#i~p2`VUaFHL@BKNnz3=Pv%Qyq2rqHY$2BqEu`bTgrW zw;+05vAk8*$WPR3$jbYO=|nZ07|7H*L32R+{IXb{Yqv7> z?+mwILf<^SiZe`%sg16U3&l51rtMY^OM{m&?u|ORq-Hy~GST@f5l?@)`v=bdHfFOc z#g}#=l{1O?mmhP@fz))47H*zHOz0N+^lFC>X5K%jG9PA)Al2=Lc}w{8Va|f6O(6P! zM|-peTp#{uvgBSayTTJTB5SXP@XyoRi1#YW_~F9q(X^KEtt~5Rgt+4MIdDe74o+1< z<=N&<0yTxCj;|((#v`AHum@2_Lp_0^GsfWNT^$b;$b8oufg>={ug$oKW3$0A-(bEu z2HAW<<)^R;VeE~7#pA9!#s#P0GLFq*ttj>|x@4y?sIaWKGMqlokal@icQXl`E9;o7LC#`Dp}aior1ufWEk0kI%sI9Ihk6#D?azoEtlP)92IYt{kD6t{4$E$n$A!#`@Sj&!p>R&Cg|KKsW2? zW@b1<35Q*6a}vceXmjy19T!un6_b^mtZZ;$BXp3myjchJ0Y5*0(ak zWHLw9g%3B{INbaK+}AbFQ8XhO2Qwq?CkK|Zg@v`HL2%$=0;0t2{ICTS=ZnzGb*wEt zZ_k66>}Nb6pBn-|(lQ}=WG06nOz&48Y9K6~nm9(@LF3rZbM@w7sYizGk-gxdX`Ef4 zkIafYt4>Vv{L#0(Dx2ruOPGy05d6#y%ePesUDzimgpQ&61U~mo9;`45q{e%*1os3`<#s*N%IRJ?bpTExk-bh zQZ^FVl8M^UP@s4I4Vuw2IeP{i)ug;XkNpJ2X9&m6LkIcN0M%-Sv4O!oiNd9}oE}sf zyXToi^d)B;4{mIg*vs#GK^|CEiwa*B3U?Cfp^sRzgh`}_uZ7}atj}|UK`ZxmYh zB)V^Di-n9Bfw)|=S50Zo@IbZ`PIeD3oYuPT7i_MDE zu1T!!3^%7fd_+af9Op)TThj`cQ5-H;fpV0UR78#-Z;=gwb~UyAAR| zv}*k=FPPO&B!);Ud;?#uz8d}+&TsHuKaltw%7^$OPD`Gb=j9E2gZ{jHf%oCls5yYQ zan|+;&>F&zHE-beDt<~!*RAaHI(m}^Tkz%H5MJ_u2Jb0f%iffwHkl>&rf8R)!c)+J zq#o#nEKQC#_Z~CS6>DvUrO{p2xf{4wUvn+d(9@>I{Rp5N(9{-v*h2RK*!jbmqH)4m z%lD3+9;nlJN~Fma(Ze6?&iP%IuEEzKW~>?!J#8H&N{6oO-PS0xjhEd=My?I~z9L?4 zdurxy-RGM94cbcj8*D+8&26|kPWU9+bcX8h8e3rwdZnFEmpIPI8UB4k_%(RVw^5GO za%af19`w5Bi3;CY(^J0&?G2y?CH&?H$gchSA3UH>;p?BF==-0o{%y0;qt5VJ;o9jb zjFssrzVo_YbF%CBr5e7YA0C}H5qYNmb-a9xpC>6$$_>5f0c}uf=!iPN=Sp0cc82bo zGkpi_m8+~6C$3B5<|&Tb`?JXE76V>>W7bW55N~^!5p2k}>?1Bihxma{xey>$t#2~* zn@+bN5E~o-yy@E2Yn;e&1@r%c7tmJ6bG7=m`h^duC&a!G-CxB6Gc!N4ho*GouH?ZO zznK~R`Zo*F^uW@C!Hi1|yK2Ct)iuUttexHavrewgR`B7r&o1cO=HEQ~D2^*AGCI0` zYdj7^<2m@={%W)mRFt;jfJ~gJo8uzqfka$HcTnDea}M8E@!RZ;vJvw~pWLVCeK5A)bVxO@ul#J0G68hhlxmtP|frMq2ztqi6gart$!GyS_R-y^%zf9>*{UBd>8(};MZNgJAEPR>93JzJNLTswNmT+mdme`-^_p5<$L64{oQ9Cix2+H-K5HxCq(PE`gJ04Vz1##uBk!q#XXiV1c z@9R5;E_Lm~QU~V;G07hW(}j9)^h9~Q5lojGr39G+#d>*cqF4(?i}jIOd9ndK_XqnX zAKV9m)rqkOV~o4^^|`WreW;&&@NRcKSgi$(62KA%a>bxLS}Z8fMm4Auju(S^wNgZr ziLqe1R30e>(UMY-^2levPMF>AJ>e>^372ql; z9|fOUP@gOoM{D>iNf6x?90t?z>h#XZ>iDU#D)b-J8>hyL0n~A{Jb^AMHlYE<$njtt zg>{8iH|T|6tXd^yNI>$(s@29swc$WO{m!a8(EJ4Z6!lLicTolH&5*DPbXxDLm#Wi! zyYKBEyl>AveKEnEyRX{4TJyd4?&;rqZ-1Y&@DRjrls{h#hN_hcSOh~u{lTYB933x@ z1P7{>LU|%MP#i6fpiy;#T;M7rt`8K$F1xC=vA#*|GO9g5yH@RkL-rjc<)h`XVCqC+ zj_#ixc;wi@y_Ls5{lEhVGgXfTG-K(9dce;iT-;7lDC9TnnaTT&cRU5ul?Dr`H7nj-$_jasJ#i_qICl#Sq8 zRD06O)MQ=hkE5LVvihv~z=Tps()YON>C|AwwI?^qLka7sE8;h*oasUI@-g^fAcujH zauDaV>_p3|;u^!%MgsdcfRreSmhv7|3MNx*cWRPtOrs-^nsmvFmXEc@e5`e9m)xo< zTWkZ5p4TecPw3ew6>vuhZ5%X@+8vJi3FYZAQ5NcaSHcsnXJoV=H|DW*^}rJFO(VBk z?#1{Xl=~1{?!kRKj62clXXj4qw({Pq5pAzx=xd2~L(cy6lh3QA7$Gb8(blvIAD{H& z`YDX-qiVYm+#S$X1+^saXm|QIz11|}Ww8ju5lxTwe9UJ&mtCO7NXs!Aa~VzWFx)ki zP@9aFeTZ-#GkuSvYzn;#Kye)RHtu}%V#KF3Pl1BPrizX