From 2a5db55117a64ade35895bf627c49a9075494b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 16 Aug 2014 12:33:32 +0200 Subject: [PATCH] Text: unified and updated pre-rendered glyph set. --- src/Magnum/Text/DistanceFieldGlyphCache.h | 2 +- src/Magnum/Text/GlyphCache.h | 2 +- src/Magnum/Text/fontconverter.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Text/DistanceFieldGlyphCache.h b/src/Magnum/Text/DistanceFieldGlyphCache.h index 0bbd24639..260b8ff9c 100644 --- a/src/Magnum/Text/DistanceFieldGlyphCache.h +++ b/src/Magnum/Text/DistanceFieldGlyphCache.h @@ -49,7 +49,7 @@ Text::AbstractFont* font; Text::GlyphCache* cache = new Text::DistanceFieldGlyphCache(Vector2i(2048), Vector2i(384)); font->createGlyphCache(cache, "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789 "); + "0123456789?!:;,. "); @endcode @see @ref TextureTools::distanceField() diff --git a/src/Magnum/Text/GlyphCache.h b/src/Magnum/Text/GlyphCache.h index 5a327d9d3..59802b1b4 100644 --- a/src/Magnum/Text/GlyphCache.h +++ b/src/Magnum/Text/GlyphCache.h @@ -52,7 +52,7 @@ Text::AbstractFont* font; Text::GlyphCache* cache = new GlyphCache(Vector2i(512)); font->createGlyphCache(cache, "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789 "); + "0123456789?!:;,. "); @endcode See @ref Renderer for information about text rendering. diff --git a/src/Magnum/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp index ab890dcb7..88a76db64 100644 --- a/src/Magnum/Text/fontconverter.cpp +++ b/src/Magnum/Text/fontconverter.cpp @@ -64,7 +64,7 @@ Arguments: - `--plugin-dir DIR` -- base plugin dir (defaults to plugin directory in %Magnum install location) - `--characters CHARACTERS` -- characters to include in the output (default: - `abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?!:,. `) + `abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?!:;,. `) - `--font-size N` -- input font size (default: `128`) - `--atlas-size "X Y"` -- glyph atlas size (default: `"2048 2048"`) - `--output-size "X Y"` -- output atlas size. If set to zero size, distance @@ -107,7 +107,7 @@ FontConverter::FontConverter(const Arguments& arguments): Platform::WindowlessAp .addOption("plugin-dir", MAGNUM_PLUGINS_DIR).setHelpKey("plugin-dir", "DIR").setHelp("plugin-dir", "base plugin dir") .addOption("characters", "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789?!:,. ").setHelp("characters", "characters to include in the output") + "0123456789?!:;,. ").setHelp("characters", "characters to include in the output") .addOption("font-size", "128").setHelpKey("font-size", "N").setHelp("font-size", "input font size") .addOption("atlas-size", "2048 2048").setHelpKey("atlas-size", "\"X Y\"").setHelp("atlas-size", "glyph atlas size") .addOption("output-size", "256 256").setHelpKey("output-size", "\"X Y\"").setHelp("output-size", "output atlas size. If set to zero size, distance field computation will not be used.")