new fonts

diff --git a/src/fonts/vg_font_thin.png b/src/fonts/vg_font_thin.png
index 8d7f50f80bcf485b1c260801a2264621e4cbd854..9684f3ade1756473d8bb1033c54e1de2bd387d1d 100644 (file)
Binary files a/src/fonts/vg_font_thin.png and b/src/fonts/vg_font_thin.png differ

diff --git a/src/fonts/vg_font_thin_old.png b/src/fonts/vg_font_thin_old.png
new file mode 100644 (file)
index 0000000..d13c675
Binary files /dev/null and b/src/fonts/vg_font_thin_old.png differ

diff --git a/vg_imgui.h b/vg_imgui.h
index 7e16b3fc865b12cd6a5f4ec6ee6144932f9b9aae..3fa07d415ca485dad7a10d52d89bc697aa137f6d 100644 (file)
--- a/vg_imgui.h
+++ b/vg_imgui.h
@@ -854,7 +854,7 @@ static u32 ui_ntext( ui_rect rect, const char *str, u32 len, ui_px scale,
          text_cursor[0] -= UI_GLYPH_SPACING_X*scale;
 
                        u8 glyph_base[2];
-                       u8 glyph_index = '\x90';
+                       u8 glyph_index = '\xb6';
                        glyph_base[0] = glyph_index & 0xf;
                        glyph_base[1] = (glyph_index-glyph_base[0])>>4;
                        glyph_base[0] *= 8;

diff --git a/vg_pxfont_thin.h b/vg_pxfont_thin.h
index 0ff18e11ea4052dca294ff1f3fce07f30ec142d8..41080287168ad8267c223e12fc036c0fdc215139 100644 (file)
--- a/vg_pxfont_thin.h
+++ b/vg_pxfont_thin.h
@@ -1,4 +1,4 @@
-/* Font buffer generated from source file: 'vg/src/fonts/vg_font_thin.png' */
+/* Font buffer generated from source file: 'src/fonts/vg_font_thin.png' */
 0xffff0000,0,0,0,0,0,0,0,
 0xffff0000,0,0,0,0,0,0,0,
 0xffff0000,0,0,0,0,0,0,0,
@@ -116,57 +116,32 @@
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0x1800000,0,
-0,0,0x4000000,0,0,0xc0,0x1800300,0x1ce0,
-0,0,0x4000000,0,0,0x100,0x1800080,0x3ff0,
-0x3800380,0x3800380,0x4000440,0x4200820,0x440,0x7c00100,0x1800080,0x3ff0,
-0x4400440,0x4000440,0x4000440,0x4200820,0x4400440,0x400200,0x1800040,0x6203ff0,
-0x4400440,0x4000400,0x7800440,0x4200920,0x2800440,0x800400,0x1800020,0x9203ff0,
-0x4400440,0x4000380,0x4000440,0x2400920,0x10003c0,0x1000400,0x1800020,0x8c01fe0,
-0x78003c0,0x4000040,0x4000440,0x2400920,0x2800040,0x2000200,0x1800040,0x1fe0,
-0x4000040,0x4000440,0x4000440,0x2400aa0,0x4400440,0x4000100,0x1800080,0xfc0,
-0x4000040,0x4000380,0x3800380,0x1800440,0x4400380,0x7c00100,0x1800080,0x300,
+0,0,0x4000000,0,0,0xc0,0x1800300,0,
+0,0,0x4000000,0,0,0x100,0x1800080,0,
+0x3800380,0x3800380,0x4000440,0x4200820,0x440,0x7c00100,0x1800080,0xfe0,
+0x4400440,0x4000440,0x4000440,0x4200820,0x4400440,0x400200,0x1800040,0x6200820,
+0x4400440,0x4000400,0x7800440,0x4200920,0x2800440,0x800400,0x1800020,0x9200820,
+0x4400440,0x4000380,0x4000440,0x2400920,0x10003c0,0x1000400,0x1800020,0x8c00820,
+0x78003c0,0x4000040,0x4000440,0x2400920,0x2800040,0x2000200,0x1800040,0x820,
+0x4000040,0x4000440,0x4000440,0x2400aa0,0x4400440,0x4000100,0x1800080,0x820,
+0x4000040,0x4000380,0x3800380,0x1800440,0x4400380,0x7c00100,0x1800080,0xfe0,
 0,0,0,0,0,0xc0,0x300,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
-0,0x100,0x800100,0x800000,0,0,0,0,
-0,0x100,0x800100,0x800000,0,0,0,0,
-0,0,0,0,0x2000040,0,0x1ff81ff8,0x1ff81ff8,
-0,0x100,0x800100,0x800000,0x4000020,0,0x1c381e78,0x1c381c38,
-0,0x100,0x800100,0x800000,0x8000010,0,0x18181c78,0x18181818,
-0,0,0,0,0x8000010,0,0x19981c78,0x1b981f98,
-0,0x100,0x800100,0x800000,0x8000010,0,0x13081e78,0x1f981f98,
-0x1b66db6,0x6d800100,0x800100,0x800000,0x68000016,0x1800180,0x12081e78,0x1f181e18,
-0,0,0,0,0x8000010,0,0x10481e78,0x1e381e18,
-0x1000000,0x800100,0x8001b6,0x6d806db6,0x8000010,0x1000080,0x10c81e78,0x1c781f98,
-0x1000000,0x800100,0x800000,0,0x8000010,0x1000080,0x19981e78,0x18f81f98,
-0,0,0,0,0x8000010,0,0x18181c38,0x18181818,
-0x1000000,0x800100,0x800000,0,0x4000020,0x1000080,0x1c381c38,0x18181c38,
-0x1000000,0x800100,0x800000,0,0x2000040,0x1000080,0x1ff81ff8,0x1ff81ff8,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0x400070,0,0,0,0,0,0,0,
-0x800730,0,0,0,0,0,0,0,
-0x1000450,0,0,0,0,0,0,0,
-0x1000480,0,0,0,0,0,0,0,
-0x1000420,0,0,0,0,0,0,0,
-0xe00420,0,0,0,0,0,0,0,
-0x7e0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
+0,0,0,0,0x180,0x1800000,0x180,0x18007c0,
+0x1000380,0x8200820,0x4400100,0x60003c0,0x240,0x24003c0,0x240,0x2400820,
+0x2800440,0x4400440,0x4400280,0x9000420,0,0x420,0,0x800,
+0x2800820,0x2800280,0x2800440,0x9000520,0x5200100,0x52005a0,0x5a00180,0x5a00ae0,
+0x4400820,0x1000100,0x1000440,0xf000520,0x9100100,0x9100520,0x9100100,0x9100a40,
+0x4400820,0x2800280,0x10007c0,0x88005a0,0x5a00180,0x5a00520,0x5200100,0x5200b40,
+0x8200440,0x4400440,0x1000820,0x8800420,0,0x420,0,0x800,
+0xfe00380,0x8200820,0x1000820,0xf0003c0,0x240,0x24003c0,0x240,0x2400800,
+0,0,0,0,0x180,0x1800000,0x180,0x1800000,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
@@ -174,6 +149,15 @@
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
+0x1e003c0,0x3c00000,0,0,0,0,0,0,
+0x2100420,0x4200180,0x180,0,0,0,0x100,0,
+0x100000,0x380,0x18001c0,0x7e003c0,0x7c006c0,0x6c006c0,0x6c00280,0x1000dc0,
+0xdd00880,0x6800780,0x3c001e0,0x7e00000,0x4000ea0,0xae00ee0,0x8200820,0x2800880,
+0x8900880,0x8800780,0x7e001e0,0x3c003c0,0x5e00ea0,0xae00ee0,0x1000100,0x4400c80,
+0x89008e0,0x8e00380,0x7e001c0,0x1800000,0x1200ea0,0xae00ee0,0x9200920,0x8200000,
+0x1008a0,0x8a00180,0x180,0x3c0,0x1e00ee0,0xee00ee0,0x1000000,0xee00d00,
+0x1006e0,0x8e00000,0,0,0x820,0x8200820,0x8200aa0,0x2800900,
+0,0,0,0,0,0,0x100,0x38009c0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
@@ -181,12 +165,28 @@
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
+0,0xdc0,0,0,0,0,0,0,
+0xe800000,0x900,0,0,0,0,0,0,
+0xa800000,0xdc0,0x6c00000,0,0,0,0,0,
+0xe800000,0x2200840,0xaa00000,0,0,0,0,0,
+0xae00000,0x4200dc0,0xaa00000,0,0,0,0,0,
+0x420,0x9e00000,0xaa00000,0,0,0,0,0,
+0xe000420,0x4000700,0xee00000,0,0,0,0,0,
+0x40007e0,0x2000400,0x8200000,0,0,0,0,0,
+0x4000000,0x700,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0x400070,
+0,0,0,0,0,0,0,0x800730,
+0,0,0,0,0,0,0,0x1000450,
+0,0,0,0,0,0,0,0x1000480,
+0,0,0,0,0,0,0,0x1000420,
+0,0,0,0,0,0,0,0xe00420,
+0,0,0,0,0,0,0,0x7e0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,