aboutsummaryrefslogtreecommitdiff
path: root/src/text.c
diff options
context:
space:
mode:
authorRay <raysan5@gmail.com>2017-12-11 11:55:02 +0100
committerRay <raysan5@gmail.com>2017-12-11 11:55:02 +0100
commita6f9cc5629841b7adf3d9ff21eaa2aaabb3e4bc1 (patch)
tree43c035d81630b22f51e82bad450213a51c61f6d7 /src/text.c
parent3e1d6859db03ba379dda62281bd3867b3d43d980 (diff)
downloadraylib-a6f9cc5629841b7adf3d9ff21eaa2aaabb3e4bc1.tar.gz
raylib-a6f9cc5629841b7adf3d9ff21eaa2aaabb3e4bc1.zip
Remove rres support
Let the user choose if using rres external library
Diffstat (limited to 'src/text.c')
-rw-r--r--src/text.c29
1 files changed, 1 insertions, 28 deletions
diff --git a/src/text.c b/src/text.c
index 8db2fc9f..0215bb5b 100644
--- a/src/text.c
+++ b/src/text.c
@@ -288,35 +288,8 @@ SpriteFont LoadSpriteFont(const char *fileName)
SpriteFont spriteFont = { 0 };
- // Check file extension
- if (IsFileExtension(fileName, ".rres"))
- {
- // TODO: Read multiple resource blocks from file (RRES_FONT_IMAGE, RRES_FONT_CHARDATA)
- RRES rres = LoadResource(fileName, 0);
-
- // Load sprite font texture
- if (rres[0].type == RRES_TYPE_FONT_IMAGE)
- {
- // NOTE: Parameters for RRES_FONT_IMAGE type are: width, height, format, mipmaps
- Image image = LoadImagePro(rres[0].data, rres[0].param1, rres[0].param2, rres[0].param3);
- spriteFont.texture = LoadTextureFromImage(image);
- UnloadImage(image);
- }
-
- // Load sprite characters data
- if (rres[1].type == RRES_TYPE_FONT_CHARDATA)
- {
- // NOTE: Parameters for RRES_FONT_CHARDATA type are: fontSize, charsCount
- spriteFont.baseSize = rres[1].param1;
- spriteFont.charsCount = rres[1].param2;
- spriteFont.chars = rres[1].data;
- }
-
- // TODO: Do not free rres.data memory (chars info data!)
- //UnloadResource(rres[0]);
- }
#if defined(SUPPORT_FILEFORMAT_TTF)
- else if (IsFileExtension(fileName, ".ttf")) spriteFont = LoadSpriteFontEx(fileName, DEFAULT_TTF_FONTSIZE, 0, NULL);
+ if (IsFileExtension(fileName, ".ttf")) spriteFont = LoadSpriteFontEx(fileName, DEFAULT_TTF_FONTSIZE, 0, NULL);
#endif
#if defined(SUPPORT_FILEFORMAT_FNT)
else if (IsFileExtension(fileName, ".fnt")) spriteFont = LoadBMFont(fileName);