From c41d6a82e1284beb82241b7a0845464d5f516792 Mon Sep 17 00:00:00 2001
From: Francesco Abbate <francesco.bbt@gmail.com>
Date: Mon, 1 Jun 2020 17:23:18 +0200
Subject: [PATCH] Adjust BakeFontBitmap issues

---
 src/font_renderer.cpp | 12 ++++++++----
 src/meson.build       |  3 +++
 src/renderer.c        |  1 -
 tests/meson.build     |  1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/font_renderer.cpp b/src/font_renderer.cpp
index 8e7f1086..a1325af7 100644
--- a/src/font_renderer.cpp
+++ b/src/font_renderer.cpp
@@ -45,14 +45,18 @@ int FontRendererBakeFontBitmap(FontRenderer *fr_, int font_height,
     const int ascender_px  = int(ascender  * 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;
 
     agg::rendering_buffer ren_buf((agg::int8u *) pixels, pixels_width, pixels_height, -pixels_width * pixel_size);
     int x = 0, y = pixels_height;
     int res = 0;
     const agg::alpha8 text_color(0xff);
+#ifdef FONT_RENDERER_HEIGHT_HACK
     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++) {
         int codepoint = first_char + i;
         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;
         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];
         glyph_info.x0 = x;
@@ -78,9 +82,9 @@ int FontRendererBakeFontBitmap(FontRenderer *fr_, int font_height,
         glyph_info.yoff = -pad_y;
         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,
           "glyph codepoint %3d (ascii: %1c), BOX (%3d, %3d) (%3d, %3d), "
           "OFFSET (%.5g, %.5g), X ADVANCE %.5g\n",
diff --git a/src/meson.build b/src/meson.build
index 5baa3e91..55462c7f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -10,10 +10,13 @@ lite_sources = [
     'main.c',
 ]
 
+renderer_cdefs = ['-DFONT_RENDERER_HEIGHT_HACK']
+
 executable('lite',
     lite_sources,
     include_directories: lite_include,
     dependencies: [lua_dep, sdl_dep, libagg_dep, freetype_dep, libm, libdl],
+    cpp_args: renderer_cdefs,
     install: true,
     gui_app: true,
 )
diff --git a/src/renderer.c b/src/renderer.c
index 8c98f38a..6fc00754 100644
--- a/src/renderer.c
+++ b/src/renderer.c
@@ -127,7 +127,6 @@ retry:
     goto retry;
   }
 
-  // FIXME: to be removed.
   /* adjust glyph's xadvance */
   for (int i = 0; i < 256; i++) {
     set->glyphs[i].xadvance = floor(set->glyphs[i].xadvance);
diff --git a/tests/meson.build b/tests/meson.build
index c2a923bd..f7159567 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -8,6 +8,7 @@ executable('stb-font-render-test',
 executable('agg-font-render-test',
     ['../src/agg_font_freetype.cpp', '../src/font_renderer.cpp', 'agg_font_render_test.c'],
     include_directories: lite_include,
+    cpp_args: renderer_cdefs,
     dependencies: [sdl_dep, libagg_dep, freetype_dep, libm, libdl],
     install: false,
 )