aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRay <raysan5@gmail.com>2018-06-30 19:58:44 +0200
committerRay <raysan5@gmail.com>2018-06-30 19:58:44 +0200
commitafe81d94cebd0f803327743c867a38b1dceffe76 (patch)
treecdab986afa43a7530f75357482580987279005fb /src
parent64207b11c07649f034631a3d6fa1916619dcb425 (diff)
downloadraylib-afe81d94cebd0f803327743c867a38b1dceffe76.tar.gz
raylib-afe81d94cebd0f803327743c867a38b1dceffe76.zip
Re-added: LoadFontEx()
Diffstat (limited to 'src')
-rw-r--r--src/raylib.h1
-rw-r--r--src/text.c17
2 files changed, 18 insertions, 0 deletions
diff --git a/src/raylib.h b/src/raylib.h
index eeadbbb7..924d1299 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -965,6 +965,7 @@ RLAPI void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle dest
// Font loading/unloading functions
RLAPI Font GetDefaultFont(void); // Get the default Font
RLAPI Font LoadFont(const char *fileName); // Load font from file into GPU memory (VRAM)
+RLAPI Font LoadFontEx(const char *fileName, int fontSize, int charsCount, int *fontChars); // Load font from file with extended parameters
RLAPI CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int charsCount, bool sdf); // Load font data for further use
RLAPI Image GenImageFontAtlas(CharInfo *chars, int fontSize, int charsCount, int padding, int packMethod); // Generate image font atlas using chars info
RLAPI void UnloadFont(Font font); // Unload Font from GPU memory (VRAM)
diff --git a/src/text.c b/src/text.c
index 5e02a471..c895540b 100644
--- a/src/text.c
+++ b/src/text.c
@@ -310,6 +310,23 @@ Font LoadFont(const char *fileName)
return font;
}
+// Load Font from TTF font file with generation parameters
+// NOTE: You can pass an array with desired characters, those characters should be available in the font
+// if array is NULL, default char set is selected 32..126
+Font LoadFontEx(const char *fileName, int fontSize, int charsCount, int *fontChars)
+{
+ Font font = { 0 };
+
+ font.baseSize = fontSize;
+ font.charsCount = (charsCount > 0) ? charsCount : 95;
+ font.chars = LoadFontData(fileName, font.baseSize, fontChars, font.charsCount, false);
+ Image atlas = GenImageFontAtlas(font.chars, font.charsCount, font.baseSize, 0, 0);
+ font.texture = LoadTextureFromImage(atlas);
+ UnloadImage(atlas);
+
+ return font;
+}
+
// Load font data for further use
// NOTE: Requires TTF font and can generate SDF data
CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int charsCount, bool sdf)