walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Adjust BakeFontBitmap issues

This commit is contained in:
Francesco Abbate 2020-06-01 17:23:18 +02:00
parent c2949edcd7
commit c41d6a82e1
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/font_renderer.cpp
View File

@ -45,14 +45,18 @@ int FontRendererBakeFontBitmap(FontRenderer *fr_, int font_height,
const int ascender_px = int(ascender * font_height + 0.5); const int ascender_px = int(ascender * font_height + 0.5);
const int descender_px = int(descender * font_height + 0.5); const int descender_px = int(descender * font_height + 0.5);
const int pad_y = font_height * 2 / 10; const int pad_y = font_height * 2 / 10, pad_x = 1;
const int y_step = font_height + 2 * pad_y; const int y_step = font_height + 2 * pad_y;
agg::rendering_buffer ren_buf((agg::int8u *) pixels, pixels_width, pixels_height, -pixels_width * pixel_size); agg::rendering_buffer ren_buf((agg::int8u *) pixels, pixels_width, pixels_height, -pixels_width * pixel_size);
int x = 0, y = pixels_height; int x = 0, y = pixels_height;
int res = 0; int res = 0;
const agg::alpha8 text_color(0xff); const agg::alpha8 text_color(0xff);
#ifdef FONT_RENDERER_HEIGHT_HACK
const int font_height_reduced = (font_height * 86) / 100; const int font_height_reduced = (font_height * 86) / 100;
#else
const int font_height_reduced = font_height;
#endif
for (int i = 0; i < num_chars; i++) { for (int i = 0; i < num_chars; i++) {
int codepoint = first_char + i; int codepoint = first_char + i;
if (x + font_height > pixels_width) { if (x + font_height > pixels_width) {
@ -67,7 +71,7 @@ int FontRendererBakeFontBitmap(FontRenderer *fr_, int font_height,
double x_next = x, y_next = y_baseline; double x_next = x, y_next = y_baseline;
font_renderer->render_codepoint(ren_buf, font_height_reduced, text_color, x_next, y_next, codepoint); font_renderer->render_codepoint(ren_buf, font_height_reduced, text_color, x_next, y_next, codepoint);
int x_next_i = int(x_next + 0.5); int x_next_i = int(x_next + 1.0);
GlyphBitmapInfo& glyph_info = glyphs[i]; GlyphBitmapInfo& glyph_info = glyphs[i];
glyph_info.x0 = x; glyph_info.x0 = x;
@ -78,9 +82,9 @@ int FontRendererBakeFontBitmap(FontRenderer *fr_, int font_height,
glyph_info.yoff = -pad_y; glyph_info.yoff = -pad_y;
glyph_info.xadvance = x_next - x; glyph_info.xadvance = x_next - x;
x = x_next_i; x = x_next_i + pad_x;
#ifdef DEBUG_FONT_RENDERER #ifdef FONT_RENDERER_DEBUG
fprintf(stderr, fprintf(stderr,
"glyph codepoint %3d (ascii: %1c), BOX (%3d, %3d) (%3d, %3d), " "glyph codepoint %3d (ascii: %1c), BOX (%3d, %3d) (%3d, %3d), "
"OFFSET (%.5g, %.5g), X ADVANCE %.5g\n", "OFFSET (%.5g, %.5g), X ADVANCE %.5g\n",

3
src/meson.build
View File

@ -10,10 +10,13 @@ lite_sources = [
'main.c', 'main.c',
] ]
renderer_cdefs = ['-DFONT_RENDERER_HEIGHT_HACK']
executable('lite', executable('lite',
lite_sources, lite_sources,
include_directories: lite_include, include_directories: lite_include,
dependencies: [lua_dep, sdl_dep, libagg_dep, freetype_dep, libm, libdl], dependencies: [lua_dep, sdl_dep, libagg_dep, freetype_dep, libm, libdl],
cpp_args: renderer_cdefs,
install: true, install: true,
gui_app: true, gui_app: true,
) )

1
src/renderer.c
View File

@ -127,7 +127,6 @@ retry:
goto retry; goto retry;
} }
// FIXME: to be removed.
/* adjust glyph's xadvance */ /* adjust glyph's xadvance */
for (int i = 0; i < 256; i++) { for (int i = 0; i < 256; i++) {
set->glyphs[i].xadvance = floor(set->glyphs[i].xadvance); set->glyphs[i].xadvance = floor(set->glyphs[i].xadvance);

1
tests/meson.build
View File

@ -8,6 +8,7 @@ executable('stb-font-render-test',
executable('agg-font-render-test', executable('agg-font-render-test',
['../src/agg_font_freetype.cpp', '../src/font_renderer.cpp', 'agg_font_render_test.c'], ['../src/agg_font_freetype.cpp', '../src/font_renderer.cpp', 'agg_font_render_test.c'],
include_directories: lite_include, include_directories: lite_include,
cpp_args: renderer_cdefs,
dependencies: [sdl_dep, libagg_dep, freetype_dep, libm, libdl], dependencies: [sdl_dep, libagg_dep, freetype_dep, libm, libdl],
install: false, install: false,
) )