UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added comments and more...

Browse source 
Corrected bug on defaultFont.size
Renamed funcs:
ImageConvertFormat() -> ImageFormat()
ImageConvertToPOT() -> ImageToPOT()
This commit is contained in:
raysan5 2015-10-06 17:17:53 +02:00
parent c5377f4e05
commit 9af10686b2
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/text.c
View file

@ -172,7 +172,7 @@ extern void LoadDefaultFont(void)
//fclose(myimage); //fclose(myimage);
Image image = LoadImageEx(imagePixels, imWidth, imHeight); Image image = LoadImageEx(imagePixels, imWidth, imHeight);
ImageConvertFormat(&image, UNCOMPRESSED_GRAY_ALPHA); ImageFormat(&image, UNCOMPRESSED_GRAY_ALPHA);
free(imagePixels); free(imagePixels);
@ -211,7 +211,7 @@ extern void LoadDefaultFont(void)
else currentPosX = testPosX; else currentPosX = testPosX;
} }
defaultFont.size = defaultFont.charRecs[0].y; defaultFont.size = defaultFont.charRecs[0].height;
TraceLog(INFO, "[TEX ID %i] Default font loaded successfully", defaultFont.texture.id); TraceLog(INFO, "[TEX ID %i] Default font loaded successfully", defaultFont.texture.id);
} }
@ -242,10 +242,10 @@ SpriteFont LoadSpriteFont(const char *fileName)
Image image = LoadImage(fileName); Image image = LoadImage(fileName);
#if defined(PLATFORM_WEB) #if defined(PLATFORM_WEB)
ImageConvertToPOT(&image, MAGENTA); ImageToPOT(&image, MAGENTA);
#endif #endif
// Process bitmap font pixel data to get characters measures // Process bitmap font pixel data to get characters measures
// spriteFont.charSet data is filled inside the function and memory is allocated! // spriteFont chars data is filled inside the function and memory is allocated!
int numChars = ParseImageData(image, &spriteFont.charValues, &spriteFont.charRecs); int numChars = ParseImageData(image, &spriteFont.charValues, &spriteFont.charRecs);
TraceLog(DEBUG, "[%s] SpriteFont data parsed correctly", fileName); TraceLog(DEBUG, "[%s] SpriteFont data parsed correctly", fileName);
@ -288,7 +288,6 @@ void DrawText(const char *text, int posX, int posY, int fontSize, Color color)
} }
// Draw text using SpriteFont // Draw text using SpriteFont
// NOTE: If font size is lower than base size, base size is used
// NOTE: chars spacing is NOT proportional to fontSize // NOTE: chars spacing is NOT proportional to fontSize
void DrawTextEx(SpriteFont spriteFont, const char *text, Vector2 position, int fontSize, int spacing, Color tint) void DrawTextEx(SpriteFont spriteFont, const char *text, Vector2 position, int fontSize, int spacing, Color tint)
{ {
@ -299,21 +298,27 @@ void DrawTextEx(SpriteFont spriteFont, const char *text, Vector2 position, int f
Rectangle rec; Rectangle rec;
//if (fontSize <= spriteFont.charRecs[0].height) scaleFactor = 1.0f;
//else scaleFactor = (float)fontSize / spriteFont.charRecs[0].height;
scaleFactor = (float)fontSize/spriteFont.charRecs[0].height; scaleFactor = (float)fontSize/spriteFont.charRecs[0].height;
// NOTE: Some ugly hacks are made to support Latin-1 Extended characters directly
// written in C code files (codified by default as UTF-8)
for(int i = 0; i < length; i++) for(int i = 0; i < length; i++)
{ {
if ((unsigned char)text[i] == 0xc2) // TODO: Right now we are supposing characters follow a continous order and start at FONT_FIRST_CHAR,
// this sytem can be improved to support any characters order and init value...
// An intermediate table could be created to link char values with predefined char position index in chars rectangle array
if ((unsigned char)text[i] == 0xc2) // UTF-8 encoding identification HACK!
{ {
// Support UTF-8 encoded values from [0xc2 0x80] -> [0xc2 0xbf](¿)
letter = (unsigned char)text[i + 1]; letter = (unsigned char)text[i + 1];
rec = spriteFont.charRecs[letter - FONT_FIRST_CHAR]; rec = spriteFont.charRecs[letter - FONT_FIRST_CHAR];
i++; i++;
} }
else if ((unsigned char)text[i] == 0xc3) else if ((unsigned char)text[i] == 0xc3) // UTF-8 encoding identification HACK!
{ {
// Support UTF-8 encoded values from [0xc3 0x80](À) -> [0xc3 0xbf](ÿ)
letter = (unsigned char)text[i + 1]; letter = (unsigned char)text[i + 1];
rec = spriteFont.charRecs[letter - FONT_FIRST_CHAR + 64]; rec = spriteFont.charRecs[letter - FONT_FIRST_CHAR + 64];
i++; i++;
@ -569,7 +574,7 @@ static SpriteFont LoadRBMF(const char *fileName)
} }
Image image = LoadImageEx(imagePixels, rbmfHeader.imgWidth, rbmfHeader.imgHeight); Image image = LoadImageEx(imagePixels, rbmfHeader.imgWidth, rbmfHeader.imgHeight);
ImageConvertFormat(&image, UNCOMPRESSED_GRAY_ALPHA); ImageFormat(&image, UNCOMPRESSED_GRAY_ALPHA);
free(imagePixels); free(imagePixels);