From bbd9da033db3be166b47a0682ed0dfd3e642383b Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Sat, 19 Jun 2021 17:34:36 -0500 Subject: [PATCH] various additions --- core/container/array.onyx | 10 +- modules/json/encoder.onyx | 14 + modules/ui/resources/fonts/Calibri.fnt | 329 ++++++++++++++++++++++ modules/ui/resources/fonts/Calibri_0.data | Bin 0 -> 65536 bytes modules/ui/resources/fonts/Calibri_0.png | Bin 0 -> 6610 bytes modules/ui/ui.onyx | 4 +- 6 files changed, 353 insertions(+), 4 deletions(-) create mode 100644 modules/ui/resources/fonts/Calibri.fnt create mode 100644 modules/ui/resources/fonts/Calibri_0.data create mode 100644 modules/ui/resources/fonts/Calibri_0.png diff --git a/core/container/array.onyx b/core/container/array.onyx index bae2d242..7c3f25b0 100644 --- a/core/container/array.onyx +++ b/core/container/array.onyx @@ -207,8 +207,14 @@ average :: (arr: ^[..] $T) -> T { return sum / cast(T) arr.count; } -to_slice :: (arr: ^[..] $T) -> [] T { - return arr.data[0 .. arr.count]; +to_slice :: #match { + (arr: [..] $T) -> [] T { + return arr.data[0 .. arr.count]; + }, + + (arr: ^[..] $T) -> [] T { + return arr.data[0 .. arr.count]; + }, } /* diff --git a/modules/json/encoder.onyx b/modules/json/encoder.onyx index 8747e968..99ce21e5 100644 --- a/modules/json/encoder.onyx +++ b/modules/json/encoder.onyx @@ -47,6 +47,20 @@ encode :: #match { return .None; }, + (w: ^io.Writer, v: [] $T) -> Encoding_Error { + io.write_byte(w, #char "["); + + for i: v.count { + if i > 0 do io.write_byte(w, #char ","); + + err := encode(w, v[i]); + if err != .None do return err; + } + + io.write_byte(w, #char "]"); + return .None; + }, + (w: ^io.Writer, v: [..] $T) -> Encoding_Error { io.write_byte(w, #char "["); diff --git a/modules/ui/resources/fonts/Calibri.fnt b/modules/ui/resources/fonts/Calibri.fnt new file mode 100644 index 00000000..5d8a9aba --- /dev/null +++ b/modules/ui/resources/fonts/Calibri.fnt @@ -0,0 +1,329 @@ +info face="Calibri" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 +common lineHeight=32 base=25 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=4 greenChnl=4 blueChnl=4 +page id=0 file="Calibri_0.png" +chars count=96 +char id=-1 x=128 y=36 width=13 height=16 xoffset=0 yoffset=9 xadvance=13 page=0 chnl=15 +char id=32 x=97 y=20 width=3 height=1 xoffset=-1 yoffset=31 xadvance=6 page=0 chnl=15 +char id=33 x=228 y=0 width=4 height=18 xoffset=3 yoffset=7 xadvance=8 page=0 chnl=15 +char id=34 x=80 y=73 width=8 height=7 xoffset=1 yoffset=7 xadvance=10 page=0 chnl=15 +char id=35 x=44 y=41 width=13 height=16 xoffset=0 yoffset=9 xadvance=13 page=0 chnl=15 +char id=36 x=32 y=0 width=12 height=22 xoffset=1 yoffset=6 xadvance=13 page=0 chnl=15 +char id=37 x=0 y=24 width=18 height=17 xoffset=0 yoffset=8 xadvance=19 page=0 chnl=15 +char id=38 x=138 y=0 width=16 height=18 xoffset=1 yoffset=7 xadvance=18 page=0 chnl=15 +char id=39 x=95 y=70 width=4 height=7 xoffset=1 yoffset=7 xadvance=6 page=0 chnl=15 +char id=40 x=13 y=0 width=6 height=23 xoffset=1 yoffset=7 xadvance=8 page=0 chnl=15 +char id=41 x=20 y=0 width=6 height=23 xoffset=1 yoffset=7 xadvance=8 page=0 chnl=15 +char id=42 x=43 y=76 width=11 height=10 xoffset=1 yoffset=7 xadvance=13 page=0 chnl=15 +char id=43 x=135 y=53 width=13 height=12 xoffset=0 yoffset=12 xadvance=13 page=0 chnl=15 +char id=44 x=89 y=70 width=5 height=7 xoffset=0 yoffset=22 xadvance=6 page=0 chnl=15 +char id=45 x=103 y=37 width=8 height=2 xoffset=0 yoffset=17 xadvance=8 page=0 chnl=15 +char id=46 x=121 y=67 width=4 height=3 xoffset=1 yoffset=22 xadvance=7 page=0 chnl=15 +char id=47 x=0 y=0 width=12 height=23 xoffset=-1 yoffset=6 xadvance=10 page=0 chnl=15 +char id=48 x=58 y=40 width=13 height=16 xoffset=0 yoffset=9 xadvance=13 page=0 chnl=15 +char id=49 x=12 y=59 width=11 height=16 xoffset=1 yoffset=9 xadvance=13 page=0 chnl=15 +char id=50 x=24 y=59 width=11 height=16 xoffset=1 yoffset=9 xadvance=13 page=0 chnl=15 +char id=51 x=0 y=59 width=11 height=16 xoffset=1 yoffset=9 xadvance=13 page=0 chnl=15 +char id=52 x=72 y=40 width=13 height=16 xoffset=0 yoffset=9 xadvance=13 page=0 chnl=15 +char id=53 x=36 y=59 width=11 height=16 xoffset=1 yoffset=9 xadvance=13 page=0 chnl=15 +char id=54 x=222 y=36 width=12 height=16 xoffset=1 yoffset=9 xadvance=13 page=0 chnl=15 +char id=55 x=209 y=36 width=12 height=16 xoffset=1 yoffset=9 xadvance=13 page=0 chnl=15 +char id=56 x=30 y=42 width=13 height=16 xoffset=0 yoffset=9 xadvance=13 page=0 chnl=15 +char id=57 x=86 y=40 width=13 height=16 xoffset=0 yoffset=9 xadvance=13 page=0 chnl=15 +char id=58 x=250 y=52 width=4 height=12 xoffset=2 yoffset=13 xadvance=7 page=0 chnl=15 +char id=59 x=59 y=57 width=6 height=16 xoffset=0 yoffset=13 xadvance=7 page=0 chnl=15 +char id=60 x=149 y=53 width=12 height=12 xoffset=0 yoffset=12 xadvance=13 page=0 chnl=15 +char id=61 x=67 y=74 width=12 height=7 xoffset=0 yoffset=14 xadvance=13 page=0 chnl=15 +char id=62 x=201 y=53 width=12 height=12 xoffset=1 yoffset=12 xadvance=13 page=0 chnl=15 +char id=63 x=206 y=0 width=11 height=18 xoffset=1 yoffset=7 xadvance=12 page=0 chnl=15 +char id=64 x=97 y=0 width=21 height=19 xoffset=1 yoffset=9 xadvance=23 page=0 chnl=15 +char id=65 x=136 y=19 width=15 height=16 xoffset=0 yoffset=9 xadvance=15 page=0 chnl=15 +char id=66 x=100 y=40 width=13 height=16 xoffset=1 yoffset=9 xadvance=14 page=0 chnl=15 +char id=67 x=184 y=19 width=14 height=16 xoffset=0 yoffset=9 xadvance=14 page=0 chnl=15 +char id=68 x=120 y=19 width=15 height=16 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 +char id=69 x=235 y=36 width=11 height=16 xoffset=1 yoffset=9 xadvance=13 page=0 chnl=15 +char id=70 x=244 y=18 width=11 height=16 xoffset=1 yoffset=9 xadvance=12 page=0 chnl=15 +char id=71 x=168 y=19 width=15 height=16 xoffset=0 yoffset=9 xadvance=16 page=0 chnl=15 +char id=72 x=15 y=42 width=14 height=16 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 +char id=73 x=66 y=57 width=4 height=16 xoffset=1 yoffset=9 xadvance=7 page=0 chnl=15 +char id=74 x=247 y=35 width=8 height=16 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=15 +char id=75 x=114 y=37 width=13 height=16 xoffset=1 yoffset=9 xadvance=14 page=0 chnl=15 +char id=76 x=48 y=58 width=10 height=16 xoffset=1 yoffset=9 xadvance=11 page=0 chnl=15 +char id=77 x=82 y=23 width=20 height=16 xoffset=1 yoffset=9 xadvance=22 page=0 chnl=15 +char id=78 x=0 y=42 width=14 height=16 xoffset=1 yoffset=9 xadvance=17 page=0 chnl=15 +char id=79 x=103 y=20 width=16 height=16 xoffset=1 yoffset=9 xadvance=17 page=0 chnl=15 +char id=80 x=196 y=36 width=12 height=16 xoffset=1 yoffset=9 xadvance=13 page=0 chnl=15 +char id=81 x=119 y=0 width=18 height=18 xoffset=1 yoffset=9 xadvance=18 page=0 chnl=15 +char id=82 x=142 y=36 width=13 height=16 xoffset=1 yoffset=9 xadvance=14 page=0 chnl=15 +char id=83 x=170 y=36 width=12 height=16 xoffset=0 yoffset=9 xadvance=12 page=0 chnl=15 +char id=84 x=214 y=19 width=14 height=16 xoffset=-1 yoffset=9 xadvance=13 page=0 chnl=15 +char id=85 x=199 y=19 width=14 height=16 xoffset=1 yoffset=9 xadvance=17 page=0 chnl=15 +char id=86 x=152 y=19 width=15 height=16 xoffset=0 yoffset=9 xadvance=15 page=0 chnl=15 +char id=87 x=58 y=23 width=23 height=16 xoffset=0 yoffset=9 xadvance=23 page=0 chnl=15 +char id=88 x=229 y=19 width=14 height=16 xoffset=0 yoffset=9 xadvance=14 page=0 chnl=15 +char id=89 x=156 y=36 width=13 height=16 xoffset=0 yoffset=9 xadvance=13 page=0 chnl=15 +char id=90 x=183 y=36 width=12 height=16 xoffset=0 yoffset=9 xadvance=12 page=0 chnl=15 +char id=91 x=90 y=0 width=6 height=22 xoffset=2 yoffset=7 xadvance=8 page=0 chnl=15 +char id=92 x=45 y=0 width=12 height=22 xoffset=-1 yoffset=6 xadvance=10 page=0 chnl=15 +char id=93 x=83 y=0 width=6 height=22 xoffset=0 yoffset=7 xadvance=8 page=0 chnl=15 +char id=94 x=55 y=75 width=11 height=9 xoffset=1 yoffset=9 xadvance=13 page=0 chnl=15 +char id=95 x=126 y=67 width=15 height=2 xoffset=-1 yoffset=28 xadvance=13 page=0 chnl=15 +char id=96 x=114 y=70 width=6 height=4 xoffset=1 yoffset=7 xadvance=8 page=0 chnl=15 +char id=97 x=214 y=53 width=11 height=12 xoffset=0 yoffset=13 xadvance=12 page=0 chnl=15 +char id=98 x=155 y=0 width=12 height=18 xoffset=1 yoffset=7 xadvance=14 page=0 chnl=15 +char id=99 x=0 y=76 width=11 height=12 xoffset=0 yoffset=13 xadvance=11 page=0 chnl=15 +char id=100 x=168 y=0 width=12 height=18 xoffset=0 yoffset=7 xadvance=14 page=0 chnl=15 +char id=101 x=162 y=53 width=12 height=12 xoffset=0 yoffset=13 xadvance=13 page=0 chnl=15 +char id=102 x=218 y=0 width=9 height=18 xoffset=0 yoffset=7 xadvance=8 page=0 chnl=15 +char id=103 x=45 y=23 width=12 height=17 xoffset=0 yoffset=13 xadvance=12 page=0 chnl=15 +char id=104 x=181 y=0 width=12 height=18 xoffset=1 yoffset=7 xadvance=14 page=0 chnl=15 +char id=105 x=251 y=0 width=4 height=17 xoffset=1 yoffset=8 xadvance=6 page=0 chnl=15 +char id=106 x=76 y=0 width=6 height=22 xoffset=-1 yoffset=8 xadvance=6 page=0 chnl=15 +char id=107 x=194 y=0 width=11 height=18 xoffset=1 yoffset=7 xadvance=12 page=0 chnl=15 +char id=108 x=233 y=0 width=4 height=18 xoffset=1 yoffset=7 xadvance=6 page=0 chnl=15 +char id=109 x=101 y=57 width=19 height=12 xoffset=1 yoffset=13 xadvance=21 page=0 chnl=15 +char id=110 x=175 y=53 width=12 height=12 xoffset=1 yoffset=13 xadvance=14 page=0 chnl=15 +char id=111 x=121 y=54 width=13 height=12 xoffset=0 yoffset=13 xadvance=14 page=0 chnl=15 +char id=112 x=32 y=23 width=12 height=17 xoffset=1 yoffset=13 xadvance=14 page=0 chnl=15 +char id=113 x=238 y=0 width=12 height=17 xoffset=0 yoffset=13 xadvance=14 page=0 chnl=15 +char id=114 x=34 y=76 width=8 height=12 xoffset=1 yoffset=13 xadvance=9 page=0 chnl=15 +char id=115 x=23 y=76 width=10 height=12 xoffset=0 yoffset=13 xadvance=10 page=0 chnl=15 +char id=116 x=71 y=57 width=9 height=15 xoffset=0 yoffset=10 xadvance=9 page=0 chnl=15 +char id=117 x=226 y=53 width=11 height=12 xoffset=1 yoffset=13 xadvance=14 page=0 chnl=15 +char id=118 x=188 y=53 width=12 height=12 xoffset=0 yoffset=13 xadvance=12 page=0 chnl=15 +char id=119 x=81 y=57 width=19 height=12 xoffset=0 yoffset=13 xadvance=19 page=0 chnl=15 +char id=120 x=238 y=53 width=11 height=12 xoffset=0 yoffset=13 xadvance=11 page=0 chnl=15 +char id=121 x=19 y=24 width=12 height=17 xoffset=0 yoffset=13 xadvance=12 page=0 chnl=15 +char id=122 x=12 y=76 width=10 height=12 xoffset=0 yoffset=13 xadvance=10 page=0 chnl=15 +char id=123 x=67 y=0 width=8 height=22 xoffset=0 yoffset=7 xadvance=8 page=0 chnl=15 +char id=124 x=27 y=0 width=4 height=23 xoffset=4 yoffset=7 xadvance=12 page=0 chnl=15 +char id=125 x=58 y=0 width=8 height=22 xoffset=1 yoffset=7 xadvance=8 page=0 chnl=15 +char id=126 x=100 y=70 width=13 height=5 xoffset=0 yoffset=10 xadvance=13 page=0 chnl=15 +kernings count=228 +kerning first=40 second=106 amount=1 +kerning first=47 second=65 amount=-1 +kerning first=46 second=121 amount=-1 +kerning first=46 second=119 amount=-1 +kerning first=46 second=118 amount=-1 +kerning first=46 second=116 amount=-1 +kerning first=46 second=102 amount=-1 +kerning first=46 second=89 amount=-2 +kerning first=46 second=87 amount=-2 +kerning first=46 second=86 amount=-2 +kerning first=46 second=84 amount=-2 +kerning first=44 second=116 amount=-1 +kerning first=44 second=89 amount=-2 +kerning first=44 second=87 amount=-2 +kerning first=44 second=86 amount=-2 +kerning first=44 second=84 amount=-2 +kerning first=122 second=113 amount=-1 +kerning first=122 second=111 amount=-1 +kerning first=122 second=101 amount=-1 +kerning first=122 second=100 amount=-1 +kerning first=122 second=99 amount=-1 +kerning first=121 second=46 amount=-2 +kerning first=121 second=44 amount=-2 +kerning first=120 second=113 amount=-1 +kerning first=65 second=84 amount=-2 +kerning first=120 second=111 amount=-1 +kerning first=120 second=101 amount=-1 +kerning first=120 second=100 amount=-1 +kerning first=120 second=99 amount=-1 +kerning first=119 second=46 amount=-2 +kerning first=119 second=44 amount=-2 +kerning first=118 second=46 amount=-2 +kerning first=118 second=44 amount=-2 +kerning first=114 second=46 amount=-3 +kerning first=114 second=44 amount=-2 +kerning first=114 second=97 amount=-1 +kerning first=112 second=120 amount=-1 +kerning first=111 second=120 amount=-1 +kerning first=65 second=86 amount=-1 +kerning first=65 second=87 amount=-1 +kerning first=107 second=113 amount=-1 +kerning first=107 second=111 amount=-1 +kerning first=107 second=101 amount=-1 +kerning first=107 second=100 amount=-1 +kerning first=65 second=89 amount=-2 +kerning first=107 second=99 amount=-1 +kerning first=103 second=47 amount=1 +kerning first=102 second=46 amount=-2 +kerning first=102 second=44 amount=-2 +kerning first=65 second=116 amount=-1 +kerning first=102 second=113 amount=-1 +kerning first=102 second=111 amount=-1 +kerning first=102 second=103 amount=-1 +kerning first=65 second=121 amount=-1 +kerning first=102 second=101 amount=-1 +kerning first=102 second=100 amount=-1 +kerning first=102 second=99 amount=-1 +kerning first=102 second=97 amount=-1 +kerning first=65 second=63 amount=-1 +kerning first=98 second=120 amount=-1 +kerning first=90 second=118 amount=-1 +kerning first=89 second=47 amount=-2 +kerning first=89 second=46 amount=-3 +kerning first=89 second=58 amount=-2 +kerning first=89 second=59 amount=-2 +kerning first=89 second=44 amount=-3 +kerning first=89 second=122 amount=-1 +kerning first=89 second=121 amount=-1 +kerning first=89 second=120 amount=-1 +kerning first=89 second=119 amount=-1 +kerning first=89 second=118 amount=-1 +kerning first=89 second=117 amount=-1 +kerning first=89 second=116 amount=-1 +kerning first=89 second=115 amount=-1 +kerning first=89 second=114 amount=-1 +kerning first=89 second=113 amount=-2 +kerning first=89 second=112 amount=-1 +kerning first=89 second=111 amount=-2 +kerning first=89 second=110 amount=-1 +kerning first=89 second=109 amount=-1 +kerning first=89 second=106 amount=-1 +kerning first=89 second=103 amount=-2 +kerning first=89 second=102 amount=-1 +kerning first=89 second=101 amount=-2 +kerning first=89 second=100 amount=-2 +kerning first=89 second=99 amount=-2 +kerning first=89 second=97 amount=-2 +kerning first=89 second=81 amount=-1 +kerning first=89 second=79 amount=-1 +kerning first=89 second=74 amount=-1 +kerning first=89 second=71 amount=-1 +kerning first=89 second=67 amount=-1 +kerning first=89 second=65 amount=-2 +kerning first=88 second=121 amount=-1 +kerning first=88 second=119 amount=-1 +kerning first=88 second=118 amount=-1 +kerning first=88 second=113 amount=-1 +kerning first=88 second=100 amount=-1 +kerning first=88 second=81 amount=-1 +kerning first=88 second=79 amount=-1 +kerning first=88 second=71 amount=-1 +kerning first=88 second=67 amount=-1 +kerning first=87 second=46 amount=-3 +kerning first=87 second=59 amount=-2 +kerning first=87 second=44 amount=-3 +kerning first=87 second=121 amount=-1 +kerning first=87 second=117 amount=-1 +kerning first=87 second=115 amount=-1 +kerning first=87 second=114 amount=-1 +kerning first=87 second=113 amount=-1 +kerning first=87 second=112 amount=-1 +kerning first=87 second=111 amount=-1 +kerning first=87 second=110 amount=-1 +kerning first=87 second=109 amount=-1 +kerning first=87 second=103 amount=-1 +kerning first=87 second=101 amount=-1 +kerning first=87 second=100 amount=-1 +kerning first=87 second=99 amount=-1 +kerning first=87 second=97 amount=-1 +kerning first=87 second=74 amount=-1 +kerning first=87 second=65 amount=-1 +kerning first=86 second=47 amount=-1 +kerning first=86 second=46 amount=-3 +kerning first=86 second=58 amount=-1 +kerning first=86 second=59 amount=-1 +kerning first=86 second=44 amount=-2 +kerning first=86 second=122 amount=-1 +kerning first=86 second=117 amount=-1 +kerning first=86 second=115 amount=-1 +kerning first=86 second=114 amount=-1 +kerning first=86 second=113 amount=-1 +kerning first=86 second=112 amount=-1 +kerning first=86 second=111 amount=-1 +kerning first=86 second=110 amount=-1 +kerning first=86 second=109 amount=-1 +kerning first=86 second=103 amount=-1 +kerning first=86 second=101 amount=-1 +kerning first=86 second=100 amount=-1 +kerning first=86 second=99 amount=-1 +kerning first=86 second=97 amount=-1 +kerning first=86 second=74 amount=-1 +kerning first=86 second=65 amount=-1 +kerning first=85 second=74 amount=-1 +kerning first=85 second=65 amount=-1 +kerning first=84 second=47 amount=-1 +kerning first=84 second=46 amount=-3 +kerning first=84 second=58 amount=-2 +kerning first=84 second=59 amount=-1 +kerning first=84 second=44 amount=-3 +kerning first=84 second=122 amount=-2 +kerning first=84 second=121 amount=-1 +kerning first=84 second=120 amount=-1 +kerning first=84 second=119 amount=-1 +kerning first=84 second=118 amount=-1 +kerning first=84 second=117 amount=-2 +kerning first=84 second=115 amount=-2 +kerning first=84 second=114 amount=-2 +kerning first=84 second=113 amount=-2 +kerning first=84 second=112 amount=-2 +kerning first=84 second=111 amount=-2 +kerning first=84 second=110 amount=-2 +kerning first=84 second=109 amount=-2 +kerning first=84 second=103 amount=-2 +kerning first=84 second=101 amount=-2 +kerning first=84 second=100 amount=-2 +kerning first=84 second=99 amount=-2 +kerning first=84 second=97 amount=-2 +kerning first=84 second=81 amount=-1 +kerning first=84 second=79 amount=-1 +kerning first=84 second=74 amount=-1 +kerning first=84 second=71 amount=-1 +kerning first=84 second=67 amount=-1 +kerning first=84 second=65 amount=-2 +kerning first=82 second=111 amount=-1 +kerning first=81 second=47 amount=2 +kerning first=81 second=59 amount=1 +kerning first=81 second=44 amount=1 +kerning first=81 second=106 amount=1 +kerning first=81 second=103 amount=1 +kerning first=81 second=89 amount=-1 +kerning first=81 second=84 amount=-1 +kerning first=81 second=74 amount=1 +kerning first=80 second=47 amount=-1 +kerning first=80 second=46 amount=-3 +kerning first=80 second=44 amount=-3 +kerning first=80 second=111 amount=-1 +kerning first=80 second=101 amount=-1 +kerning first=80 second=99 amount=-1 +kerning first=80 second=97 amount=-1 +kerning first=80 second=74 amount=-2 +kerning first=80 second=65 amount=-2 +kerning first=79 second=44 amount=-1 +kerning first=79 second=89 amount=-1 +kerning first=79 second=88 amount=-1 +kerning first=79 second=84 amount=-1 +kerning first=76 second=121 amount=-1 +kerning first=76 second=119 amount=-1 +kerning first=76 second=118 amount=-1 +kerning first=76 second=89 amount=-2 +kerning first=76 second=87 amount=-2 +kerning first=76 second=86 amount=-2 +kerning first=76 second=85 amount=-1 +kerning first=76 second=84 amount=-2 +kerning first=76 second=81 amount=-1 +kerning first=76 second=79 amount=-1 +kerning first=76 second=71 amount=-1 +kerning first=75 second=121 amount=-1 +kerning first=75 second=119 amount=-1 +kerning first=75 second=118 amount=-1 +kerning first=75 second=99 amount=-1 +kerning first=75 second=81 amount=-1 +kerning first=75 second=79 amount=-1 +kerning first=75 second=71 amount=-1 +kerning first=75 second=67 amount=-1 +kerning first=70 second=47 amount=-1 +kerning first=70 second=46 amount=-2 +kerning first=70 second=44 amount=-3 +kerning first=70 second=97 amount=-1 +kerning first=70 second=74 amount=-1 +kerning first=70 second=65 amount=-1 +kerning first=69 second=121 amount=-1 +kerning first=69 second=118 amount=-1 +kerning first=69 second=102 amount=-1 +kerning first=68 second=46 amount=-1 +kerning first=68 second=44 amount=-1 +kerning first=66 second=89 amount=-1 +kerning first=66 second=88 amount=-1 +kerning first=66 second=84 amount=-1 diff --git a/modules/ui/resources/fonts/Calibri_0.data b/modules/ui/resources/fonts/Calibri_0.data new file mode 100644 index 0000000000000000000000000000000000000000..40db6d020fdaa1ec73406804c84d32f9b2b1b7ce GIT binary patch literal 65536 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 D`=gyf literal 0 HcmV?d00001 diff --git a/modules/ui/ui.onyx b/modules/ui/ui.onyx index 197ffce9..c99047e7 100644 --- a/modules/ui/ui.onyx +++ b/modules/ui/ui.onyx @@ -275,8 +275,8 @@ get_text_width :: (text: str, size := DEFAULT_TEXT_SIZE) -> f32 { // to a font and it will remain valid. Probably want some kind of arena // with a map from i32 -> ^BMFont. #private init_font :: () { - fnt_file_data := #file_contents "./resources/fonts/test.fnt"; - texture_data := #file_contents "./resources/fonts/test_0.data"; + fnt_file_data := #file_contents "./resources/fonts/Calibri.fnt"; + texture_data := #file_contents "./resources/fonts/Calibri_0.data"; font = bmfont.load_bmfont(fnt_file_data); -- 2.25.1