From 87ab22c2071788690afc8f5ecf2d9a715a606b16 Mon Sep 17 00:00:00 2001 From: Ed_ Date: Fri, 10 Jan 2025 20:50:33 -0500 Subject: [PATCH] Fixed size issue (parsesr_scale convention needs to be em_to_pixels by default). --- examples/sokol_demo/sokol_demo.odin | 10 +++++----- vefontcache/parser.odin | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/sokol_demo/sokol_demo.odin b/examples/sokol_demo/sokol_demo.odin index 9ddb10a..222b578 100644 --- a/examples/sokol_demo/sokol_demo.odin +++ b/examples/sokol_demo/sokol_demo.odin @@ -224,15 +224,15 @@ init :: proc "c" () } glyph_draw_opts := ve.Init_Glyph_Draw_Params_Default - glyph_draw_opts.snap_glyph_height = true + glyph_draw_opts.snap_glyph_height = false shaper_opts := ve.Init_Shaper_Params_Default - shaper_opts.snap_glyph_position = true + shaper_opts.snap_glyph_position = false ve.startup( & demo_ctx.ve_ctx, .STB_TrueType, allocator = context.allocator, glyph_draw_params = glyph_draw_opts, shaper_params = shaper_opts, - px_scalar = 1, + px_scalar = 1.89, alpha_sharpen = 0.1, ) ve_sokol.setup_gfx_objects( & demo_ctx.render_ctx, & demo_ctx.ve_ctx, vert_cap = 256 * 1024, index_cap = 512 * 1024 ) @@ -257,7 +257,7 @@ init :: proc "c" () path_noto_sans_jp_reg := strings.concatenate({ PATH_FONTS, "NotoSansJP-Regular.otf" }) path_firacode := strings.concatenate({ PATH_FONTS, "FiraCode-Regular.ttf" }) - demo_ctx.font_logo = font_load(path_sawarabi_mincho, 300.0, "SawarabiMincho", 12 ) + demo_ctx.font_logo = font_load(path_sawarabi_mincho, 150.0, "SawarabiMincho", 18 ) // demo_ctx.font_title = font_load(path_open_sans, 92.0, "OpenSans", 6 ) demo_ctx.font_print = font_load(path_noto_sans_jp, 19.0, "NotoSansJP") demo_ctx.font_mono = font_load(path_ubuntu_mono, 21.0, "UbuntuMono") @@ -635,7 +635,7 @@ etiam dignissim diam quis enim. Convallis convallis tellus id interdum.` } // Draw grid - draw_text("Cache pressure test (throttled to 120 hz)", demo_ctx.font_title, { 0.2, current_scroll - (section_start + 0.2) }, size = 92) + draw_text("Cache pressure test (throttled to 120 hz)", demo_ctx.font_title, { 0.2, current_scroll - (section_start + 0.2) }, size = 72) for y in 0..< GRID_H do for x in 0 ..< GRID_W { posx := 0.2 + f32(x) * 0.02 diff --git a/vefontcache/parser.odin b/vefontcache/parser.odin index 70a3959..ee05912 100644 --- a/vefontcache/parser.odin +++ b/vefontcache/parser.odin @@ -151,7 +151,7 @@ parser_is_glyph_empty :: #force_inline proc "contextless" ( font : Parser_Font_I parser_scale :: #force_inline proc "contextless" ( font : Parser_Font_Info, size : f32 ) -> f32 { // profile(#procedure) - size_scale := size > 0.0 ? parser_scale_for_pixel_height( font, size ) : parser_scale_for_mapping_em_to_pixels( font, -size ) + size_scale := size > 0.0 ? parser_scale_for_mapping_em_to_pixels( font, size ) : parser_scale_for_pixel_height( font, -size ) return size_scale }