From: Brendan Hansen Date: Wed, 14 Jul 2021 20:07:29 +0000 (-0500) Subject: reworking fonts in ui module X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=5f768611030312574fb139218fa1426a3785278a;p=onyx.git reworking fonts in ui module --- diff --git a/bin/onyx b/bin/onyx index c1f9235b..113dac1c 100755 Binary files a/bin/onyx and b/bin/onyx differ diff --git a/modules/ui/components/button.onyx b/modules/ui/components/button.onyx index 5247d832..58e7d3c8 100644 --- a/modules/ui/components/button.onyx +++ b/modules/ui/components/button.onyx @@ -58,12 +58,12 @@ button :: (use r: Rectangle, text: str, theme := ^default_button_theme, site := surface_color = color_lerp(animation_state.click_time, surface_color, theme.click_color); gfx.rect(.{ x0 + border_width, y0 + border_width }, .{ width - border_width * 2, height - border_width * 2 }, surface_color); - text_width, text_height := main_font->get_dimensions(text, theme.font_size); + text_width, text_height := current_font->get_dimensions(text, theme.font_size); @ThemeConfiguration // This always draws the text centered on the button surface. draw_text_raw(text, x0 + (width - text_width) / 2, - y0 + main_font->get_baseline(theme.font_size) + (height - text_height) / 2, + y0 + current_font->get_baseline(theme.font_size) + (height - text_height) / 2, theme.font_size, theme.text_color); move_towards(^animation_state.click_time, 0.0f, theme.click_decay_speed); diff --git a/modules/ui/components/checkbox.onyx b/modules/ui/components/checkbox.onyx index c0e867c2..391d3287 100644 --- a/modules/ui/components/checkbox.onyx +++ b/modules/ui/components/checkbox.onyx @@ -83,12 +83,12 @@ checkbox :: (use r: Rectangle, value: ^bool, text: str, theme := ^default_checkb surface_color ); - text_width, text_height := main_font->get_dimensions(text, theme.font_size); + text_width, text_height := current_font->get_dimensions(text, theme.font_size); draw_text_raw( text, x0 + box_size + 4 * 2, @Cleanup @ThemeConfiguration - y0 + main_font->get_baseline(theme.font_size) + (height - text_height) / 2, + y0 + current_font->get_baseline(theme.font_size) + (height - text_height) / 2, theme.font_size, theme.text_color); move_towards(^animation_state.click_time, 0.0f, theme.click_decay_speed); diff --git a/modules/ui/components/radio.onyx b/modules/ui/components/radio.onyx index c3379a1a..01dd7f0b 100644 --- a/modules/ui/components/radio.onyx +++ b/modules/ui/components/radio.onyx @@ -76,12 +76,12 @@ radio :: (use r: Rectangle, selected: ^$T, value: T, text: str, theme := ^defaul gfx.circle(.{ cx, cy }, radius - theme.radio_border_radius, color=surface_color); - text_width, text_height := main_font->get_dimensions(text, theme.font_size); + text_width, text_height := current_font->get_dimensions(text, theme.font_size); draw_text_raw( text, x0 + 2 * radius + 4, @ThemeConfiguration - y0 + main_font->get_baseline(theme.font_size) + (height - text_height) / 2, + y0 + current_font->get_baseline(theme.font_size) + (height - text_height) / 2, theme.font_size, theme.text_color); move_towards(^animation_state.click_time, 0.0f, theme.click_decay_speed); diff --git a/modules/ui/components/textbox.onyx b/modules/ui/components/textbox.onyx index 3e528808..d9abd64f 100644 --- a/modules/ui/components/textbox.onyx +++ b/modules/ui/components/textbox.onyx @@ -60,10 +60,10 @@ textbox :: (use r: Rectangle, text_buffer: ^string.String_Buffer, placeholder := text_color = theme.placeholder_text_color; } - text_width, text_height := main_font->get_dimensions(text, theme.font_size); + text_width, text_height := current_font->get_dimensions(text, theme.font_size); text_x := x0 + border_width; - text_y := y0 + main_font->get_baseline(theme.font_size) + (height - text_height) / 2; + text_y := y0 + current_font->get_baseline(theme.font_size) + (height - text_height) / 2; if is_hot_item(hash) && !is_active_item(hash) { if mouse_state.left_button_down && Rectangle.contains(r, mx, my) { @@ -191,8 +191,8 @@ get_cursor_location :: (text_buffer: ^string.String_Buffer, text_x: f32, text_y: text := string.buffer_to_str(text_buffer); - bm_font := ^main_font.font; - for glyph: bmfont.get_character_positions(bm_font, text_size * main_font.em / ~~bm_font.common.line_height, text, text_x, text_y) { + bm_font := ^current_font.font; + for glyph: bmfont.get_character_positions(bm_font, text_size * current_font.em / ~~bm_font.common.line_height, text, text_x, text_y) { if countdown == 0 do return last_x; last_x = glyph.pos_x; @@ -214,8 +214,8 @@ get_cursor_position :: (text_buffer: ^string.String_Buffer, text_x: f32, text_y: text := string.buffer_to_str(text_buffer); @FontCleanup - bm_font := ^main_font.font; - for glyph: bmfont.get_character_positions(bm_font, text_size * main_font.em / ~~bm_font.common.line_height, text, text_x, text_y) { + bm_font := ^current_font.font; + for glyph: bmfont.get_character_positions(bm_font, text_size * current_font.em / ~~bm_font.common.line_height, text, text_x, text_y) { cursor_position += 1; if cursor_position == 1 do continue; diff --git a/modules/ui/font.onyx b/modules/ui/font.onyx index 313d6e64..08788011 100644 --- a/modules/ui/font.onyx +++ b/modules/ui/font.onyx @@ -69,3 +69,11 @@ create_font :: (bmfont_data: [] u8, font_texture_data: [] u8) -> Font { return .{ texture=texture, font=font, rendering_kind=rendering_kind }; } +@Bug // Why is '#type' needed here? +Font_Index :: #type i32; + +#private font_registry : map.Map(Font_Index, Font); +register_font :: (index: Font_Index, font: Font) { + assert(!map.has(^font_registry, index), "Font with this index already exists."); + map.put(^font_registry, index, font); +} \ No newline at end of file diff --git a/modules/ui/module.onyx b/modules/ui/module.onyx index 4d22c578..2b63d20e 100644 --- a/modules/ui/module.onyx +++ b/modules/ui/module.onyx @@ -57,3 +57,4 @@ package ui #private bmfont :: package bmfont #private math :: package core.math +#private map :: package core.map \ No newline at end of file diff --git a/modules/ui/resources/font.data b/modules/ui/resources/font.data deleted file mode 100644 index 615eafbd..00000000 Binary files a/modules/ui/resources/font.data and /dev/null differ diff --git a/modules/ui/resources/font_2.data b/modules/ui/resources/font_2.data deleted file mode 100644 index 85287d47..00000000 Binary files a/modules/ui/resources/font_2.data and /dev/null differ diff --git a/modules/ui/resources/fonts/Calibri.fnt b/modules/ui/resources/fonts/Calibri.fnt deleted file mode 100644 index 5d8a9aba..00000000 --- a/modules/ui/resources/fonts/Calibri.fnt +++ /dev/null @@ -1,329 +0,0 @@ -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 deleted file mode 100644 index 40db6d02..00000000 Binary files a/modules/ui/resources/fonts/Calibri_0.data and /dev/null differ diff --git a/modules/ui/resources/fonts/Calibri_0.png b/modules/ui/resources/fonts/Calibri_0.png deleted file mode 100644 index f971c877..00000000 Binary files a/modules/ui/resources/fonts/Calibri_0.png and /dev/null differ diff --git a/modules/ui/resources/fonts/FiraCode.data b/modules/ui/resources/fonts/FiraCode.data deleted file mode 100644 index f80e70e4..00000000 Binary files a/modules/ui/resources/fonts/FiraCode.data and /dev/null differ diff --git a/modules/ui/resources/fonts/FiraCode.fnt b/modules/ui/resources/fonts/FiraCode.fnt deleted file mode 100644 index 3c7f1870..00000000 --- a/modules/ui/resources/fonts/FiraCode.fnt +++ /dev/null @@ -1,102 +0,0 @@ -info face="Fira Code Retina" size=32 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=1,1,1,1 spacing=-2,-2 -common lineHeight=40 base=30 scaleW=256 scaleH=256 pages=1 packed=0 -page id=0 file="FiraCode.png" -chars count=97 -char id=0 x=109 y=42 width=20 height=28 xoffset=0 yoffset=5 xadvance=20 page=0 chnl=0 -char id=10 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=0 xadvance=0 page=0 chnl=0 -char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=0 xadvance=20 page=0 chnl=0 -char id=33 x=161 y=122 width=8 height=25 xoffset=6 yoffset=6 xadvance=20 page=0 chnl=0 -char id=34 x=57 y=167 width=12 height=11 xoffset=4 yoffset=4 xadvance=20 page=0 chnl=0 -char id=35 x=0 y=0 width=0 height=0 xoffset=0 yoffset=0 xadvance=20 page=0 chnl=0 -char id=36 x=6 y=0 width=18 height=36 xoffset=1 yoffset=0 xadvance=20 page=0 chnl=0 -char id=37 x=25 y=71 width=22 height=26 xoffset=-1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=38 x=235 y=122 width=20 height=25 xoffset=0 yoffset=6 xadvance=20 page=0 chnl=0 -char id=39 x=248 y=71 width=6 height=11 xoffset=7 yoffset=4 xadvance=20 page=0 chnl=0 -char id=40 x=38 y=0 width=14 height=35 xoffset=2 yoffset=1 xadvance=20 page=0 chnl=0 -char id=41 x=52 y=0 width=13 height=35 xoffset=4 yoffset=1 xadvance=20 page=0 chnl=0 -char id=42 x=0 y=167 width=20 height=19 xoffset=0 yoffset=10 xadvance=20 page=0 chnl=0 -char id=43 x=20 y=167 width=19 height=18 xoffset=0 yoffset=11 xadvance=20 page=0 chnl=0 -char id=44 x=243 y=147 width=9 height=14 xoffset=5 yoffset=23 xadvance=20 page=0 chnl=0 -char id=45 x=125 y=167 width=16 height=5 xoffset=2 yoffset=17 xadvance=20 page=0 chnl=0 -char id=46 x=96 y=167 width=9 height=8 xoffset=5 yoffset=23 xadvance=20 page=0 chnl=0 -char id=47 x=116 y=0 width=20 height=33 xoffset=0 yoffset=2 xadvance=20 page=0 chnl=0 -char id=48 x=143 y=122 width=18 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=49 x=36 y=122 width=18 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=50 x=54 y=122 width=18 height=25 xoffset=0 yoffset=6 xadvance=20 page=0 chnl=0 -char id=51 x=72 y=122 width=18 height=25 xoffset=0 yoffset=6 xadvance=20 page=0 chnl=0 -char id=52 x=234 y=42 width=18 height=26 xoffset=1 yoffset=5 xadvance=20 page=0 chnl=0 -char id=53 x=90 y=122 width=17 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=54 x=107 y=122 width=18 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=55 x=0 y=71 width=16 height=26 xoffset=2 yoffset=6 xadvance=20 page=0 chnl=0 -char id=56 x=125 y=122 width=18 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=57 x=216 y=42 width=18 height=27 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=58 x=235 y=147 width=8 height=20 xoffset=6 yoffset=9 xadvance=20 page=0 chnl=0 -char id=59 x=16 y=71 width=9 height=26 xoffset=5 yoffset=11 xadvance=20 page=0 chnl=0 -char id=60 x=0 y=0 width=0 height=0 xoffset=1 yoffset=0 xadvance=20 page=0 chnl=0 -char id=61 x=69 y=167 width=16 height=11 xoffset=2 yoffset=14 xadvance=20 page=0 chnl=0 -char id=62 x=186 y=122 width=49 height=25 xoffset=1 yoffset=7 xadvance=20 page=0 chnl=0 -char id=63 x=169 y=122 width=17 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=64 x=0 y=42 width=22 height=29 xoffset=-1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=65 x=47 y=71 width=22 height=25 xoffset=-1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=66 x=69 y=71 width=18 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=67 x=87 y=71 width=20 height=25 xoffset=0 yoffset=6 xadvance=20 page=0 chnl=0 -char id=68 x=107 y=71 width=19 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=69 x=126 y=71 width=17 height=25 xoffset=2 yoffset=6 xadvance=20 page=0 chnl=0 -char id=70 x=143 y=71 width=16 height=25 xoffset=3 yoffset=6 xadvance=20 page=0 chnl=0 -char id=71 x=159 y=71 width=19 height=25 xoffset=0 yoffset=6 xadvance=20 page=0 chnl=0 -char id=72 x=178 y=71 width=18 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=73 x=196 y=71 width=16 height=25 xoffset=2 yoffset=6 xadvance=20 page=0 chnl=0 -char id=74 x=212 y=71 width=17 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=75 x=229 y=71 width=19 height=25 xoffset=2 yoffset=6 xadvance=20 page=0 chnl=0 -char id=76 x=0 y=97 width=16 height=25 xoffset=3 yoffset=6 xadvance=20 page=0 chnl=0 -char id=77 x=16 y=97 width=21 height=25 xoffset=-1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=78 x=37 y=97 width=18 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=79 x=55 y=97 width=20 height=25 xoffset=0 yoffset=6 xadvance=20 page=0 chnl=0 -char id=80 x=75 y=97 width=18 height=25 xoffset=2 yoffset=6 xadvance=20 page=0 chnl=0 -char id=81 x=156 y=0 width=21 height=31 xoffset=0 yoffset=6 xadvance=20 page=0 chnl=0 -char id=82 x=93 y=97 width=18 height=25 xoffset=2 yoffset=6 xadvance=20 page=0 chnl=0 -char id=83 x=111 y=97 width=19 height=25 xoffset=0 yoffset=6 xadvance=20 page=0 chnl=0 -char id=84 x=130 y=97 width=20 height=25 xoffset=0 yoffset=6 xadvance=20 page=0 chnl=0 -char id=85 x=150 y=97 width=18 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=86 x=168 y=97 width=22 height=25 xoffset=-1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=87 x=190 y=97 width=22 height=25 xoffset=-1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=88 x=212 y=97 width=21 height=25 xoffset=-1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=89 x=233 y=97 width=22 height=25 xoffset=-1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=90 x=0 y=122 width=18 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=91 x=93 y=0 width=12 height=33 xoffset=4 yoffset=2 xadvance=20 page=0 chnl=0 -char id=92 x=136 y=0 width=20 height=33 xoffset=0 yoffset=2 xadvance=20 page=0 chnl=0 -char id=93 x=105 y=0 width=11 height=33 xoffset=4 yoffset=2 xadvance=20 page=0 chnl=0 -char id=94 x=39 y=167 width=18 height=13 xoffset=1 yoffset=0 xadvance=20 page=0 chnl=0 -char id=95 x=177 y=0 width=54 height=31 xoffset=0 yoffset=6 xadvance=20 page=0 chnl=0 -char id=96 x=85 y=167 width=11 height=9 xoffset=4 yoffset=2 xadvance=20 page=0 chnl=0 -char id=97 x=0 y=147 width=18 height=20 xoffset=1 yoffset=11 xadvance=20 page=0 chnl=0 -char id=98 x=22 y=42 width=17 height=28 xoffset=2 yoffset=3 xadvance=20 page=0 chnl=0 -char id=99 x=18 y=147 width=18 height=20 xoffset=1 yoffset=11 xadvance=20 page=0 chnl=0 -char id=100 x=39 y=42 width=17 height=28 xoffset=1 yoffset=3 xadvance=20 page=0 chnl=0 -char id=101 x=36 y=147 width=18 height=20 xoffset=1 yoffset=11 xadvance=20 page=0 chnl=0 -char id=102 x=129 y=42 width=19 height=27 xoffset=1 yoffset=4 xadvance=20 page=0 chnl=0 -char id=103 x=231 y=0 width=20 height=29 xoffset=0 yoffset=9 xadvance=20 page=0 chnl=0 -char id=104 x=148 y=42 width=16 height=27 xoffset=2 yoffset=4 xadvance=20 page=0 chnl=0 -char id=105 x=56 y=42 width=16 height=28 xoffset=2 yoffset=3 xadvance=20 page=0 chnl=0 -char id=106 x=24 y=0 width=14 height=35 xoffset=2 yoffset=3 xadvance=20 page=0 chnl=0 -char id=107 x=72 y=42 width=18 height=28 xoffset=2 yoffset=3 xadvance=20 page=0 chnl=0 -char id=108 x=164 y=42 width=18 height=27 xoffset=0 yoffset=4 xadvance=20 page=0 chnl=0 -char id=109 x=54 y=147 width=20 height=20 xoffset=0 yoffset=11 xadvance=20 page=0 chnl=0 -char id=110 x=74 y=147 width=16 height=20 xoffset=2 yoffset=11 xadvance=20 page=0 chnl=0 -char id=111 x=90 y=147 width=18 height=20 xoffset=1 yoffset=11 xadvance=20 page=0 chnl=0 -char id=112 x=182 y=42 width=17 height=27 xoffset=2 yoffset=11 xadvance=20 page=0 chnl=0 -char id=113 x=199 y=42 width=17 height=27 xoffset=1 yoffset=11 xadvance=20 page=0 chnl=0 -char id=114 x=108 y=147 width=17 height=20 xoffset=2 yoffset=11 xadvance=20 page=0 chnl=0 -char id=115 x=125 y=147 width=17 height=20 xoffset=1 yoffset=11 xadvance=20 page=0 chnl=0 -char id=116 x=18 y=122 width=18 height=25 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=0 -char id=117 x=142 y=147 width=16 height=20 xoffset=2 yoffset=11 xadvance=20 page=0 chnl=0 -char id=118 x=158 y=147 width=19 height=20 xoffset=0 yoffset=11 xadvance=20 page=0 chnl=0 -char id=119 x=177 y=147 width=22 height=20 xoffset=-1 yoffset=11 xadvance=20 page=0 chnl=0 -char id=120 x=199 y=147 width=20 height=20 xoffset=0 yoffset=11 xadvance=20 page=0 chnl=0 -char id=121 x=90 y=42 width=19 height=28 xoffset=0 yoffset=11 xadvance=20 page=0 chnl=0 -char id=122 x=219 y=147 width=16 height=20 xoffset=2 yoffset=11 xadvance=20 page=0 chnl=0 -char id=123 x=65 y=0 width=14 height=35 xoffset=2 yoffset=1 xadvance=20 page=0 chnl=0 -char id=124 x=0 y=0 width=6 height=42 xoffset=7 yoffset=-1 xadvance=20 page=0 chnl=0 -char id=125 x=79 y=0 width=14 height=35 xoffset=3 yoffset=1 xadvance=20 page=0 chnl=0 -char id=126 x=105 y=167 width=20 height=8 xoffset=0 yoffset=15 xadvance=20 page=0 chnl=0 -kernings count=0 diff --git a/modules/ui/resources/fonts/FiraCode.png b/modules/ui/resources/fonts/FiraCode.png deleted file mode 100644 index 4d7743f2..00000000 Binary files a/modules/ui/resources/fonts/FiraCode.png and /dev/null differ diff --git a/modules/ui/resources/fonts/test.fnt b/modules/ui/resources/fonts/test.fnt deleted file mode 100644 index 15addba6..00000000 --- a/modules/ui/resources/fonts/test.fnt +++ /dev/null @@ -1,100 +0,0 @@ -info face="Fira Code Retina" 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=24 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=4 greenChnl=4 blueChnl=4 -page id=0 file="test_0.tga" -chars count=96 -char id=-1 x=159 y=0 width=16 height=22 xoffset=0 yoffset=4 xadvance=16 page=0 chnl=15 -char id=32 x=252 y=0 width=3 height=1 xoffset=-1 yoffset=31 xadvance=16 page=0 chnl=15 -char id=33 x=249 y=42 width=6 height=19 xoffset=5 yoffset=5 xadvance=16 page=0 chnl=15 -char id=34 x=226 y=79 width=10 height=7 xoffset=3 yoffset=4 xadvance=16 page=0 chnl=15 -char id=35 x=129 y=46 width=14 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=36 x=5 y=0 width=14 height=28 xoffset=1 yoffset=0 xadvance=16 page=0 chnl=15 -char id=37 x=97 y=26 width=16 height=20 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=38 x=98 y=47 width=15 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=39 x=237 y=79 width=4 height=7 xoffset=6 yoffset=4 xadvance=16 page=0 chnl=15 -char id=40 x=56 y=0 width=10 height=27 xoffset=2 yoffset=1 xadvance=16 page=0 chnl=15 -char id=41 x=67 y=0 width=10 height=27 xoffset=4 yoffset=1 xadvance=16 page=0 chnl=15 -char id=42 x=161 y=86 width=14 height=14 xoffset=1 yoffset=8 xadvance=16 page=0 chnl=15 -char id=43 x=176 y=84 width=14 height=13 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=44 x=191 y=83 width=6 height=10 xoffset=5 yoffset=19 xadvance=16 page=0 chnl=15 -char id=45 x=17 y=71 width=12 height=3 xoffset=2 yoffset=13 xadvance=16 page=0 chnl=15 -char id=46 x=17 y=111 width=6 height=5 xoffset=5 yoffset=19 xadvance=16 page=0 chnl=15 -char id=47 x=96 y=0 width=14 height=25 xoffset=1 yoffset=2 xadvance=16 page=0 chnl=15 -char id=48 x=15 y=75 width=14 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=49 x=44 y=71 width=13 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=50 x=72 y=70 width=13 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=51 x=100 y=67 width=13 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=52 x=114 y=26 width=14 height=20 xoffset=1 yoffset=4 xadvance=16 page=0 chnl=15 -char id=53 x=128 y=67 width=13 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=54 x=0 y=75 width=14 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=55 x=129 y=25 width=12 height=20 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=56 x=114 y=47 width=14 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=57 x=237 y=0 width=14 height=21 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=58 x=154 y=86 width=6 height=15 xoffset=5 yoffset=9 xadvance=16 page=0 chnl=15 -char id=59 x=142 y=25 width=6 height=20 xoffset=5 yoffset=9 xadvance=16 page=0 chnl=15 -char id=60 x=128 y=87 width=12 height=15 xoffset=2 yoffset=8 xadvance=16 page=0 chnl=15 -char id=61 x=213 y=79 width=12 height=8 xoffset=2 yoffset=11 xadvance=16 page=0 chnl=15 -char id=62 x=60 y=90 width=13 height=15 xoffset=2 yoffset=8 xadvance=16 page=0 chnl=15 -char id=63 x=181 y=63 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=64 x=176 y=0 width=16 height=22 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=65 x=17 y=51 width=16 height=19 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=66 x=114 y=67 width=13 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=67 x=82 y=50 width=15 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=68 x=50 y=50 width=15 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=69 x=86 y=70 width=13 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=70 x=168 y=64 width=12 height=19 xoffset=3 yoffset=5 xadvance=16 page=0 chnl=15 -char id=71 x=34 y=51 width=15 height=19 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=72 x=204 y=43 width=14 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=73 x=155 y=66 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=74 x=58 y=70 width=13 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=75 x=189 y=43 width=14 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=76 x=142 y=66 width=12 height=19 xoffset=3 yoffset=5 xadvance=16 page=0 chnl=15 -char id=77 x=0 y=55 width=16 height=19 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=78 x=159 y=44 width=14 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=79 x=168 y=23 width=16 height=19 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=80 x=234 y=43 width=14 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=81 x=126 y=0 width=17 height=24 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=82 x=144 y=46 width=14 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=83 x=66 y=50 width=15 height=19 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=84 x=236 y=22 width=16 height=19 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=85 x=174 y=43 width=14 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=86 x=219 y=23 width=16 height=19 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=87 x=149 y=24 width=18 height=19 xoffset=-1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=88 x=202 y=23 width=16 height=19 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=89 x=185 y=23 width=16 height=19 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=90 x=219 y=43 width=14 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=91 x=78 y=0 width=8 height=26 xoffset=4 yoffset=1 xadvance=16 page=0 chnl=15 -char id=92 x=111 y=0 width=14 height=25 xoffset=1 yoffset=2 xadvance=16 page=0 chnl=15 -char id=93 x=87 y=0 width=8 height=26 xoffset=4 yoffset=1 xadvance=16 page=0 chnl=15 -char id=94 x=198 y=79 width=14 height=9 xoffset=1 yoffset=0 xadvance=16 page=0 chnl=15 -char id=95 x=24 y=111 width=14 height=3 xoffset=1 yoffset=26 xadvance=16 page=0 chnl=15 -char id=96 x=242 y=79 width=8 height=5 xoffset=4 yoffset=3 xadvance=16 page=0 chnl=15 -char id=97 x=45 y=91 width=14 height=15 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=98 x=56 y=28 width=13 height=21 xoffset=2 yoffset=3 xadvance=16 page=0 chnl=15 -char id=99 x=243 y=63 width=12 height=15 xoffset=2 yoffset=9 xadvance=16 page=0 chnl=15 -char id=100 x=42 y=28 width=13 height=21 xoffset=1 yoffset=3 xadvance=16 page=0 chnl=15 -char id=101 x=228 y=63 width=14 height=15 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=102 x=28 y=29 width=13 height=21 xoffset=2 yoffset=3 xadvance=16 page=0 chnl=15 -char id=103 x=144 y=0 width=14 height=23 xoffset=1 yoffset=7 xadvance=16 page=0 chnl=15 -char id=104 x=84 y=27 width=12 height=21 xoffset=2 yoffset=3 xadvance=16 page=0 chnl=15 -char id=105 x=208 y=0 width=13 height=22 xoffset=2 yoffset=2 xadvance=16 page=0 chnl=15 -char id=106 x=20 y=0 width=11 height=28 xoffset=2 yoffset=2 xadvance=16 page=0 chnl=15 -char id=107 x=193 y=0 width=14 height=22 xoffset=2 yoffset=2 xadvance=16 page=0 chnl=15 -char id=108 x=0 y=33 width=13 height=21 xoffset=1 yoffset=3 xadvance=16 page=0 chnl=15 -char id=109 x=211 y=63 width=16 height=15 xoffset=0 yoffset=9 xadvance=16 page=0 chnl=15 -char id=110 x=102 y=87 width=12 height=15 xoffset=2 yoffset=9 xadvance=16 page=0 chnl=15 -char id=111 x=0 y=95 width=14 height=15 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=112 x=70 y=28 width=13 height=21 xoffset=2 yoffset=9 xadvance=16 page=0 chnl=15 -char id=113 x=14 y=29 width=13 height=21 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=114 x=74 y=90 width=13 height=15 xoffset=2 yoffset=9 xadvance=16 page=0 chnl=15 -char id=115 x=88 y=90 width=13 height=15 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=116 x=30 y=71 width=13 height=19 xoffset=1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=117 x=115 y=87 width=12 height=15 xoffset=2 yoffset=9 xadvance=16 page=0 chnl=15 -char id=118 x=15 y=95 width=14 height=15 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=119 x=194 y=63 width=16 height=15 xoffset=0 yoffset=9 xadvance=16 page=0 chnl=15 -char id=120 x=30 y=91 width=14 height=15 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=121 x=222 y=0 width=14 height=21 xoffset=1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=122 x=141 y=87 width=12 height=15 xoffset=2 yoffset=9 xadvance=16 page=0 chnl=15 -char id=123 x=44 y=0 width=11 height=27 xoffset=2 yoffset=1 xadvance=16 page=0 chnl=15 -char id=124 x=0 y=0 width=4 height=32 xoffset=6 yoffset=0 xadvance=16 page=0 chnl=15 -char id=125 x=32 y=0 width=11 height=27 xoffset=3 yoffset=1 xadvance=16 page=0 chnl=15 -char id=126 x=0 y=111 width=16 height=5 xoffset=0 yoffset=13 xadvance=16 page=0 chnl=15 diff --git a/modules/ui/resources/fonts/test_0.data b/modules/ui/resources/fonts/test_0.data deleted file mode 100644 index 7b2450bd..00000000 Binary files a/modules/ui/resources/fonts/test_0.data and /dev/null differ diff --git a/modules/ui/ui.onyx b/modules/ui/ui.onyx index 3a4f4df2..80c22cc3 100644 --- a/modules/ui/ui.onyx +++ b/modules/ui/ui.onyx @@ -2,10 +2,6 @@ package ui use package core -@Cleanup // Move these to the theme? -// Or create a cache of fonts and put pointers/string in the themes? -#private main_font : Font; - @Temporary DEFAULT_TEXT_SIZE :: 1.0f @@ -16,12 +12,13 @@ UI_Id :: #type u32 #private active_item : UI_Id = 0 #private hot_item_was_set := false +#private current_font : Font; init_ui :: () { - init_font(); - map.init(^animation_states, default=.{}, hash_count=4); map.init(^workspace_states, default=.{}, hash_count=4); + + map.init(^font_registry, hash_count=4); } // This function should be called at the end of drawing a frame, after all of the UI elements @@ -75,9 +72,9 @@ is_hot_item :: (id: UI_Id) -> bool { return hot_item == id; } -@FontSizing // Currently, `size` is just a multipler for the baked font size. This should be changed to be height in pixels, or 'em's. +@FontSizing // In the new font system, size is in ems, which can be set per font. draw_text_raw :: (text: str, x: f32, y: f32, size := DEFAULT_TEXT_SIZE, color := gfx.Color4.{1,1,1}) { - main_font->render(text, x, y, size, color); + current_font->render(text, x, y, size, color); } draw_rect :: #match { @@ -95,7 +92,7 @@ draw_rect :: #match { } draw_text :: (use r: Rectangle, text: str, theme := ^default_text_theme, site := #callsite) -> bool { - draw_text_raw(text, x0, y0 + main_font->get_baseline(theme.font_size), theme.font_size, theme.text_color); + draw_text_raw(text, x0, y0 + current_font->get_baseline(theme.font_size), theme.font_size, theme.text_color); } Rectangle :: struct { @@ -135,6 +132,8 @@ Rectangle :: struct { @Relocate Text_Theme :: struct { text_color := gfx.Color4.{ 1, 1, 1 }; + + font : i32 = 0; // Default to font index 0 font_size := 1.0f; } @@ -173,28 +172,9 @@ get_site_hash :: (site: CallSite, increment := 0) -> UI_Id { } get_text_width :: (text: str, size := DEFAULT_TEXT_SIZE) -> f32 { - return main_font->get_width(text, size); -} - - -@Cleanup -// There should be a way to load multiple fonts and have a font cache. -// The font cache pointers should be stable so you can take a pointer -// 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/FiraCode.fnt"; - texture_data := #file_contents "./resources/fonts/FiraCode.data"; - - main_font = create_font(fnt_file_data, texture_data); + return current_font->get_width(text, size); } -TEMP_switch_font :: () { - fnt_file_data := #file_contents "./resources/fonts/Calibri.fnt"; - texture_data := #file_contents "./resources/fonts/Calibri_0.data"; - - main_font = create_font(fnt_file_data, texture_data); -} @Relocate diff --git a/src/onyxwasm.c b/src/onyxwasm.c index 1f1b43b3..15523302 100644 --- a/src/onyxwasm.c +++ b/src/onyxwasm.c @@ -265,6 +265,8 @@ EMIT_FUNC(zero_value_for_type, Type* type, OnyxToken* where); EMIT_FUNC(enter_structured_block, StructuredBlockType sbt); EMIT_FUNC_NO_ARGS(leave_structured_block); +static void emit_raw_data(OnyxWasmModule* mod, ptr data, AstTyped* node); + #include "onyxwasm_intrinsics.c" #include "onyxwasm_type_table.c"