From 743488d8765ed66b8a04247da7d13b85a537e793 Mon Sep 17 00:00:00 2001 From: Emil Kosz Date: Mon, 9 Jun 2025 13:49:16 +0200 Subject: [PATCH] Some more font updates --- game/res/textures/cursor.png | Bin 466 -> 0 bytes game/res/textures/cursor.xcf | Bin 3811 -> 0 bytes game/res/textures/font.png | Bin 2028 -> 2119 bytes game/res/textures/font_10x20.xcf | Bin 23448 -> 23789 bytes game/src/ui/widget.c | 8 +++----- 5 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 game/res/textures/cursor.png delete mode 100644 game/res/textures/cursor.xcf diff --git a/game/res/textures/cursor.png b/game/res/textures/cursor.png deleted file mode 100644 index a146bad7b98608c2979f8ebc5eb8db81651e3831..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 466 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>eMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIM26(zShD02`JN@j$!wNjD^KCSf`4{%j*)~Pw5p!#fW~S>qmz@IbAH+F3j5psA zO8zln-Vx)@?@SCk7{2Tl;*&d_T+ATwO-ZJKkNHPuT_M9xS@w+=N>y_>TQ2JxaP58` z^KZ`s8Cy<)C$DyOT)sMMInxbAhBpeFE`jp>9j#v?Tj%($b6vER*jC}8{RyQuI-1{tLxvLFthTdMtYI<#naDP?`)GfC*aa? zLim9Dzr3rvXPt4BbZoPCX=7M+m-V(d<0`Rt1@;#tTQlVs?-l)6uM@dm?A^ig$+M@# T9bP0l+XkK%uBf= diff --git a/game/res/textures/cursor.xcf b/game/res/textures/cursor.xcf deleted file mode 100644 index 17774be127970fd192707b943eeb4598091d8c3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3811 zcmYe#%q>u;NKR8IGcYt{U|?WSfMO;F28L-23=E7649qNG3M9LVVHE?zs#PF@Vb!Wo z5Hl16{)he#4gLQgM1ZOP|Nk>EFbD_;C@3hHnwq-0x`u{^rlzKrmX>yPbe6T|;~4FCUw(7yi+P5&7j|1&TkOCX72muPDGKdL$tSfE%8 zN`usiGB9x1F)%Rjg0h)za(-@ZYF-J*aFC>sb5UwyNotBhd1gt5g1e`007ymvtTZz> zF+Ei`y(lvUB*w_Vz$mFvTvC~ns!*JtlbNE)rID7NoS&0l#HFC1pr8R}Dkuf1yQ@2? zJ1V5*{*TpCFv7zoh_HW?oiYH~$!L1J=dUb=#z zfhLzmB?=G9(Jjr(EK$hJOU_6w*5uNt$WKcvPAyRYt4Cr(n5c?D0i@%enOhK0l%JfM zQd*SioS&DLnI2S{r<<0Uld4;gm#&*yQIKC$qMMUg3=4inRgKKNlGLJ{#N^Zzg}i)C zE{){;+=8Oi;^NHwJOxWoh-9ZjWkB{q)D&b?7DHGinYpPDR&ioks%}Y9VqS4UVo_>d z2}Cr%pd>Rlvno}$ATcMkqy(xqEx#x?u|z?sC_O3BLP?WLBQq~Kr!*y1H?<-&4Wbby zl37raj4D!*TYxG6j(6RHqI{4?QKd>UN^_I)5;Jp9g`sH>A_z`uFcBq;{1qxgd zurf%B%uOvxOi3(B1c@^;Ft8@t*jMD{D3qlZfkMqz-B8a!T_H6uIX@*cFWpu>G{jBU zLfzhu%Lb;=j!QworX(?4AulmE)mF*1A~Q|T6O`EXoH9#_15%5E6LSl4QkCp16f6`h zZ1hVK({XEYNi0bX$;?evvNJL;GPN==vobJOFf_6lCS3sDr|xa5|dMv>~Nb6Q45O}m(29clFX{q6w<;L)e!RH2V#alxD*p2gC8p#jrRpW;=jy}N=o{)8=quUT=)=uH%NY^51$uDRdZ1Wp2z_xgv;d-vAP3-~h2fEgA*}1|=vPBq4*u22}u{h7Cv@WDSh1 zg`|cXiOqw==0#%jgBnaAL!g))DhIMl70L!lsesu3!My7TQcB*Q-^2#bT^zY`w= zqZ3Gi(V2~b$r;3BbYyg5bY^5=asK1v?Bv7?Rlw@Z?8NBI&%o%&t3^ zGm8@l3otM`{&RBXauNX9zyqWB!3OX;2{7=24d8P6@66=%-N+7?>Qm82&r*f^Glr$may|4#;I7F_80l zoCLwDA*2w)e~>xMgtFwMxo@t>c8|35#20GJkF z;QKGgzzfA7Hs61cm;h7_AA`Vu9tPq6+zcZBIT^(Mb1<;{XJX+0&&t61pM^o-KNHw& bf&YvQO#ivSdO&9LL(Kr02QgcSf#*K}CVoJ| diff --git a/game/res/textures/font.png b/game/res/textures/font.png index 7296276b31dc393204a579e4cb330289d185a1ec..8d3567788074a5768a517ee0528e0bf0fad32b70 100644 GIT binary patch delta 1940 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 ZFZRFvDg|v4KPG^Zgr}>Y%Q~loCII>bxAFi0 diff --git a/game/res/textures/font_10x20.xcf b/game/res/textures/font_10x20.xcf index d9099fdb0feb8e49a5db5a81e5faef402773d41b..e3f45dd5fa5aefd2d18a45d73553edc9b7f42ae9 100644 GIT binary patch delta 3279 zcmbQSo$>8X#tE|+4L8n?<6w#k+5DTsl2ItifB_7mY`_#ll*eR)D6z>gT%4I7AtJ)^ zP`VjHYc7P)c5x8eWgdj~oeZJFK0xTm3sCw2l!l5&LAVT20uV-&!sK&Y7b2M%*#9#z zF#cy`VEoU+!1SMyf$6^>1M`27I3ol5e{QfC<9{Ir=Km}VZ2v)GJPg18Gcf%BFN`F{ z&%g-fL(F2H>?deGc^lv9QzYpiJ9>~)8;O#%}mT349uGyY!9-DGC@lz1kK36G`YsZQ5KYDL8TVReqP7i2Ib;Mo7OOg`_LI_gv!gsSx90585!ND^fMCs9y! z#Q2|!f&D)tGpamX0=D>WE1oU5!fpwC!Br7Q91tuG~NY=Cd7i0j{ zPmppEmsW7v!myg{zW`W_1)P&0&Sd#t&-jsn@js}vLB^sC%>P-z`3q87gOU*=1DhB) zfr5&DP;~(D4eNiV$u^#n^58TFuAo8AWoBUdkDf{u*%|+{GO+$3?LPtCdvQ*+>=lGW^yuuav}rMf04-x0;DGU`EfC_PfqZY z=SRdRC{lzbclpJQx{Bzq3J3?K0Z2|^`46fvK@rZv!2BN;myF=p24x3OT!Uht?LP|x z(|=BI6NBwPtXTmP1EnEQdIH6*aESioU%>{j_~m5;H%i#Rd604Pd|ydfkZL9dj{j`n zBnHcLp!^I<6B~VnrD3T+ih=FF7z5jXDF)X65)3T=>zTqQ2e`;i?l%*dJlBG6@`fN8 zTsY|O~;6p>!;i&VpSL@G2+hDyFTlW1Ke;19VX|(t`{aOVmB|6o9snCGs#^d6 delta 2518 zcmaF6lX1p&#tE|+wKvX=<6w&Tzxg+ZC8JQpZ3Zxicn+o*B0f(Jj2508$;Fd-79t{4 z4y7kUXpM~!+7>GAydA>#X@=0D3m|kvHI(j#(zBuTYAC%MN}ry5j_bl?4_+Qm9tNiW zj0{Zw1sRzCvobLL|I6_IKNAD{e;zQ+_+N;D`9BK-D_D%5f$_gEm=96M%)tI1CdM~8 zPtbhw2VN6#W`_U&g&7#ZGK>t2|9Kb~|JO72OlB02pB%?`WQ5rIK@b#@EDVhQL1Dnl z@c%#aWJg}%Ky2a7jHHT*0TSlOaRCcskZB-O(ZfC66nmJTW~k>n$-wmAhJpFNH3Rd1 z8wRHT)?hy4|9a-FlMRFv`H2$~G2!N9VEk{(!1Ui1Of&ws0YxkGSB84_2MquJ%VE+S z44Ws&{a|EfW?-CLE9yCUgM!H9z0zEhv!(4OU-uT8952l?*+DF5@&QAZ$vQS1liNfE zHm?&4W}&r)7^ck5CYVEqpYPf#A9 znQ5}W8PDb_>s3t5Tnvnp&lpQ?cCcH)Hkrj=VDbbTw#olo946N&a!fuD%*V|5Uv%oSc;o`Fi?E5 zScvH4PJbb8#{b|n$iVbpeDW&)xKUStt6ET41UQ0122`Lkf(so`+<*!srvF^f$^aw| zlLuAEptu7?HYD!Y{KFPnMaP zfqim+sH8k7{y@bYs6qzE9|QY;F$T8(k_>GB#Ti&9zYmQjAvWEZRTvm2uMXdePK&ER zn-R$Y;Mc?~3eYWQt;${F_5skr~o7iL!vu(Irs2 z0ZR9P8cFpG3=B~RARi<*# diff --git a/game/src/ui/widget.c b/game/src/ui/widget.c index 138f5ed..2e84ba2 100644 --- a/game/src/ui/widget.c +++ b/game/src/ui/widget.c @@ -123,8 +123,8 @@ Widget_label_render_text (Widget *widget, mat3 parent_model) glm_mat3_copy (parent_model, model); float char_width = wdg_real_height (model) / wdg_real_width (model) * (10.0 / 20.0); - /* * 1.5 because that's the step we use in the loop later on. */ - float total_width = (widget->label.text->len - 1) * char_width * 1.5; + float char_spacing = 1.5; + float total_width = (widget->label.text->len - 1) * char_width * char_spacing; switch (widget->label.alignment) { @@ -158,9 +158,7 @@ Widget_label_render_text (Widget *widget, mat3 parent_model) program_set_float (RESPRG ("uitext"), "character", ch); program_set_vec4 (RESPRG ("uitext"), "text_color", widget->label.text_color); SimpleMesh_render (&quad, false); /* UI always without wireframe. */ - /* 1.5 because we want to go forward half of this character and - one character more. */ - glm_translate2d (model, (vec2) { 1.5f, 0.0f }); + glm_translate2d (model, (vec2) { char_spacing, 0.0 }); p = g_utf8_next_char (p); }