From 89ae253bc23d45cb9e445fbe068b759ebb965e81 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 14 Feb 2022 17:07:26 +0100 Subject: [PATCH] Added hiero glyphs --- conv-font/package.json | 2 +- .../numberxd/glyph/BaseGlyphSet.java | 12 ++++++++++-- ...{new-gardiner.ttf => new-gardiner-bmp.ttf} | Bin 581000 -> 582488 bytes .../distributedrebirth/gdxapp/ImGuiSetup.java | 5 ++++- .../desktop/apps/SystemBaseGlyphApp.java | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) rename main-gdxapp/assets/font/{new-gardiner.ttf => new-gardiner-bmp.ttf} (98%) diff --git a/conv-font/package.json b/conv-font/package.json index da8c8394..738d69a8 100644 --- a/conv-font/package.json +++ b/conv-font/package.json @@ -8,7 +8,7 @@ "conv0": "node conv-font.js ../main-gdxapp/assets/font/code2000.ttf > bin/code2000.xml", "conv1": "node conv-font.js ../main-gdxapp/assets/font/free-sans.ttf > bin/free-sans.xml", "conv2": "node conv-font.js ../main-gdxapp/assets/font/noto-sans-brahmi.ttf > bin/noto-sans-brahmi.xml", - "conv3": "node conv-font.js ../main-gdxapp/assets/font/new-gardiner.ttf > bin/new-gardiner.xml", + "conv3": "node conv-font.js ../main-gdxapp/assets/font/new-gardiner-bmp.ttf > bin/new-gardiner-bmp.xml", "debug": "node conv-font.js ../main-gdxapp/assets/font/free-sans.ttf" }, "dependencies": { diff --git a/lib-numberxd/src/main/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java b/lib-numberxd/src/main/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java index 8f303c83..d164ef6d 100644 --- a/lib-numberxd/src/main/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java +++ b/lib-numberxd/src/main/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java @@ -80,13 +80,21 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣT(y=T_? z&*5c$`Pk=vwD0v_>??~_Q54tYH`|J0HoO1hXI^^#d&TOX59des-Zh!diuV;a<@3Gy z{HA+9aY$Q-=HD%f*13HCz(Z$_pZ(R-zdThG*ZnO&_TWR$Jhi^`T(MCU*H7~E+fSZ7 zbw+oe{AN+?zCWM8dg}O-XRll-mh<&?=kwK5k3LtPeCyN?+C}l9tzz|sM^B$P{_u_G zT94<8U6ntedpbYxp3m;gH*ZxJ+<*GaQ_sHf?c)3S{OzK+cJhm)c*=H~d&W zzv|5KXV0!YvHY3*{OSDh>yI5jbHbl`_k+di4}Vq^%a_hR{^V1y-~8&aV)d2J7sajL zIQzs0PMrN#_or2H^%dSye>axickJuWzkTAxx9?pWRS#?%Ef0$W`RSrqsy|?7zJ783 zzLwwLx~_h>d2{sS^x@*ig)R@yf2VcJp5>hQzsJ(9{P{1w{FBySu9+|A&!~>Q_4SJ4 zSU$^l%IDjPBYC~5Sk3p^R_M)l-~7kr+b<9Dx2?!$e|_`se=07wuUxtE+x0!`SFi6} zU*!t<>FVG4-Mjj&<@3W`ua%2pb5ZQNXL0M%t;OBX%ooMJJ8xKQzisP|dHvWI=Ig&- zw07No!@)&sbA9~}hZZ|-JGQmHe%HR)@lUUBtv~!=e{Ex9zP2$xxLDe}=f17!zWK(% z#q#DOH>@v?9NpSj9LdjY+pI3Rv2WvZTYp^p&3r9?+}6L=-kGoMD>oJ^w{0zE&&=y* z=JR}`mCdVH>j>d~zWt=0?k3$yBui)-?ivHQOK&KKu5=7wWi^Zey+=#(_{z}(t$ZxyV>ut& z^0AVS?fKYo>F9ygonPBI$~S4{pVjr39=Npn#A>XKlaFEHl4E0 znsqi{9kPz9b=q#XS%X!qW=*Ue)-G$0wO_AgyItQPU$DMGUjK80F&{W#t;6#3b=b5W z1Ox#=KoAfF1OY)n5D;}hnJ+{@5D)|e0YN|z5Cn(-5g-CYfCvx)B0vPF3MlipQUr(q z5g-CYfCvx)Ccp%k025#WOn?b60nPzs^|LeqCcp%k025#WOh6(a5s(N-1SA3y0f~S_ zKtCisKq4R!kO)WwBmxov9RfN8bO`7W&>^5hK!<=10iAx?{Bm^&=n&8$phG~1 zfDQp20=fir3Fs2gC7??{mw+w-T>`pgGY0K00bK&R1at}L63``}OF)l+9sxZ9dIaE(phrO2BcMk>kANNlJpy_J^a$t?&?lfzK%am<0eu4c1oR2$Hvwh4Pe7l5J^_6K z`ULa|=o8QHj1dIt76EN;E|6>Bi1dIt76EG%VOu(3cF#!_- zCIn0fm=G`_U_!uzfJu+}pAax1U_!uzfC&K;0wx4Z2$&KuC16Uxlz=G#Qv#+0Ov`2r z+EW6i1WXB-5-=rTNI(y0W$(-1k4C1X9Ua$X#U<$+cN@Y1k4DS z5isLBFlzz=4@A2Oh;|bY?Is}FO+d7pfM_=XWwe`sXg2|Y2LcZS9*A}m5bY))+D$;< zfxrWS2LcZS9tb=Tcpw@Nl+yqN(SRVIH$Q^F1Azwu4+I_vJP>#w@Ic^!zypB?0uKZp zh}r{r{sRz14T9>N06Y+QAn-uofxrWS2LcZS9tb=Tcp&gV;DM+-P|be;f~Y`HpA&!w z0uKZp2s{vYAn-uofxrWS2LcZS9tb=T*#q_8{{RG$K~M+afxrWS2LcZS9tb=Tcp&gV z;DNvcfd>K)1RjV^x0(L{1koV?4+I_vJP>#w@Ic^!zypB?0uKZp2s{vYAn-tR%VrD$ z5JZ;%JP>#w@Ic^!zypB?0uKZp2s{vYAn-uofxrV%0)hYpfd>K)1Re-H5O^T)K;VJE z1Azwu4+I_vJP>#w@IV=WAOJz&fxrWS2LcZS9tb=Tcp&gV;DNvcfd>K)1RjXS19|=d zK{O!9=llrpK;VJE1Azwu4+I_vJP>#w@Ic^!zypB?qV_;F|9~KB5LD*`;DNvcfd>K) z1Re-H5O^T)K;VJE1Azwu4@BjGdj0`HR3ND49}ff`2s{vYAn-uofxrWS2LcZS9tb=T zcp&gVWDhj+4+tWIpbo$Tfd>K)1Re-H5O^T)K;VJE1Azwu4+I_vJP?x(^A8AOLI55J zJP>#w@Ic^!zypB?0uKZp2s{vYAn-uoftZ&3IRpeTB>)cu9tb=Tcp&gV;DNvcfd>K) z1Re-H5O^T)K$L(W072k^zypB?0uKZp2s{vYAn-uo0pS7R0pS7R0pWpCfIxsictChS zctChSctChSctChSctChSctChSctDK@%BcW>*dP!d5FQX75FQX75FQX75FQX75FQX7 z5FQX7Q0;*{{{jSJgFtvdctChSctChSctChSctChSctChSctChSl?ST%7a$ND1i}Nt z17d$bctChSctChSctChSctChSctChS*#q_b3lNA60^tGS0pS7R0pS7R0pS7R0pS7R z0pS7R0pS64QZxSo1Y(0gctChSctChSctChSctChSctChSctChSctG8x z)PTTj5Eu^_4;T*^4;T*^4;T*^4;T*^4;T*^4;T-)_CTJ00|K)_U_4+vU_4+vU_4+v zU_4+vU_4+vU_4+vU_9W;1J(Q+5SR@D;{oFV;{oFV;{oFV;{oFV;{oFV;{oFV;{j(6 z)bnpZU^WPh2aE@d2aE@d2aE@d2aE@d2aE@d2aE@d2i#FJ{{{qRgTQ#ec))nTc))nT zc))nTc))nTc))nTc))nT-LlyxGaxV<1jYl#1I7c!1I7c!1I7c!1I7c!1I7c!1I7a` z0f7O5@qqDw@qqDw@qqDw@qqDw@qqDw@qqDw@qqC_X+U5=U_4+vU_4+vU_4+vU_4+v zU_4+vU_4+vU_9W)19|=df!QE19xxs-9xxs-9xxs-9xxs-9xxs-9xxs-9&qh}YW@L% z*&r|;Fdi@-Fdi@-Fdi@-Fdi@-Fdi@-Fdi@-aOHt|{sDp6ATS;<9xxs-9xxs-9xxs- z9xxs-9xxs-9xxto_CPcLfWT}J7!Mc^7!Mc^7!Mc^7!Mc^7!Mc^7!Mc^7!P<7%s(J7 z8wAD!#skI!#skI!#skI!#skI!#skI!#skI!o|esaxdDOMATS;<9xxs-9xxs-9xxs- z9xxs-9xxs-9xxto2?z`bj0cPdj0cPdj0cPdj0cPdj0cPdj0cPdj0X}PC=(z^fFR+4 zga;BHNO&OOfrJMV9!Pi~;emt)5*|o+AmM@3c%YmnK#esHc@{4_%7aCQk?=AM^xB1ms`LXJyCe4wT c=7m4MzT>6Ws*|68^y;_rvQoUU_jm998=a_wY5)KL delta 8216 zcmYM(O~__vdBE}WzVBr6YAt>w+Cn3Vs6io(&vjk*^93XH`RqbPML`#$9g<9@Flo{l zzg9=AR99U%S#()iDBYDLg#@}OF2sf4O5!5!3UyO-(XJHI`<&mR1843z=lS^0d6|2D z&-K2){KH1es z_w(y#?|tXaf8P1mKOKgTK0I9i-Mzcd+yN z3m>`r+)Lm7>6eD-&EFV?_x$$W^H1G=|M#E#`yP0#pa0Kux4-?ujeoj&u|K})&wuQ% zZa?=-ef2kw4%e@JcNnf-f8qJBzx3lrzxny$`t|-{G$wtsSKdfts&SG(b()79a!9~bj$|Lp$vF6xiw3-crWx6j=< zJw5!#+x^%5pIv^% z{JoIn<_~3){SAG~? zyZip@_kLvf?|kLv18?1W_3E+$9{q85vVB`j$vOS3F3 zE6dulv1~0n%ieOZ94#lyd0s*<;^sKzLoftGFa$#|1Vb zjXj@&DVTyOn1U&of+?7SDVTyOSb`;3g5?HFucqEuixMos5-h9L0E4UTh3T_3rf?L6@;LZ*1^me^B?Z2JiPH-o<6Wj^z1b2cv!JXhv za3{DE+zIXl_kw#jxYyfHy}tkUf_uTe;9hVqxEI_D?gjUPd%?ZnLGU1W5IhJT+~7g) zF!#pALGU1W5IhJT1P_7-!GqvI@F;i`JPIBKkAg?RqZ>Tx9rebe;8E}>coaMe9tDqr zC&828N$@0i51W$q|!IR!e?=%XY1W$q|!IR)w@GN*1JPV!$&w^*cv*20qEO-_? z>z(z^NBi$Ac%Fkn!&uD0Sj@p#%)wa9!C1_}Sj@p#%)wa9!C1_}Sj@p#%)wa9!C1^U z7>l_Vi}Sqy0*BE#>>36QgN8xFpkdH3Xc#mM8U_u6hC#!iVbCyW7&MGY!@mClhcR(D zow-9A1`UITLBpV7&@gBiGz=OB4TFY#kI!#S!=Pcz8jck>jG4oJ=1WS$pkdH3Xc#mM z8U_u6hC#!iVbCyW7&HtT1`Wr+Vc;-m7&HtT1`UITLBpV7&@gBiGz=OB4TFY3!=Pc% zFh(2(4ugh4!=Pc%FlZPw3>pRvgN8xFpkdH3Xc#mM8U_txHTqYI!&v!OO2eRG&@gBi zGz=OB4TFY3!=Pc%FlZPw3>pRvV||$SU*Is-wgnA?hC#!iVbCyW7&HtT1`UITLBpV7 z&@gBiG>op{^!YPz7@foEjD|tOpkdH3Xc#mM8U_u6hC#!iVbCyW7&HtT#-!o2|8N)+ zhtrvDNW-9E&@gBiGz=OB4TFY3!=Pc%FlZPw3>wC)Vc&l^jG4oJ=6^OC1`UITLBpV7 z&@gBiGz=OB4TFY3!=Pc%Flaai4g-fl!=Pc%FlZPw3>pRvgN8xFpkdH3Xc#mM8U_u6 zhB4wWa2PZU8U_u6hC#!iVbCyW7&HtT1`UITLBpV7&@gBirx6x7j1w$q7&HtT1`UIT zLBpV7&@gBiGz=OB4TFY3!=PcD_x2wS<4h+S1`U&jNyDUJ(lBY5G)x*M4U>jR!=z!- zFlm@w!)gB|4zqJOozXC9m^4fpCJmE@NyDUJ(lBY5G)x*M4U>jR!<;ni`!8{rhQp*` z(lBY5G)x*M4U>jR!=z!-Flm@HOd2K)lZH8KI9B2?4Tnj?q+!x9X_z!j8YT^shDpPu zVbU;Zm^4fpCJmE@W8yGzm^4fpCJmE@NyDUJ(lBY5G)x*M4U>jR!=z!-Flm@04ikq- z!=z!-Flm@HOd2K)lZHvdq+!x9X_z!j8YT^shPfK&&uodqG#n-klZHvdq+!x9X_z!j z8YT^shDpPuVbU;Zm^94wZr*>1!!#Tw4U>jR!=z!-Flm@HOd2K)lZHvdq+!x9X_z$3 zuHn4@aF~X}q+!x9X_z!j8YT^shDpPuVbU;Zm^4fpCJmE@IcYfUKOCmvFlm@HOd2K) zlZHvdq+!x9X_z!j8YT^shDpPuVa^)%{fEOe93~BuhDpPuVbU;Zm^4fpCJmE@NyDUJ z(lBY5G)x+fiNnNU(lBY5G)x*M4U>jR!=z!-Flm@HOd2K)lZHvdq+yOYOdKW+lZHvd zq+!x9X_z!j8YT^shDpPuVbU;Zm^4fp=4qTqr^I0z4wHsS!=z!-Flm@HOd2K)lZHvd zq+!x9X_z!j8s>Rx|KTtVhe^YvVbU;Z*uPae8P&gKX_-H=^>5)hnn?GL^4QtY{ z@4v!f84kO~^HXWqadaj~!=ho)uxMB`?7P_u1Zh|_EE*OKYu0eA{>7YMVK^)r_Ny+s zLmCzhi-twRqG8dnXjn8X8Ws(UhDF1o;aE5<92O0WhDF1oVbQQ?STrme77dGrMZ=mf^5y zSTrme77dGrMZ=l#k`ui>y64jT;{4I2#`4I2#`4I2#`4V&4p(Xi35(Xi35nGG8a+cX>Y z{nv2V42O+|jfRbejfRbe&1~3c*l5^j*l5^j*l5_yhK+`ehHcjHue(3