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

Corrected issue on chars drawing

Browse source 
Support by default unordered charsets
This commit is contained in:
raysan5 2016-11-03 18:57:46 +01:00
parent ca96122a7b
commit aa945055fa
1 changed files with 30 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/text.c
View file

@ -344,12 +344,12 @@ void DrawText(const char *text, int posX, int posY, int fontSize, Color color)
void DrawTextEx(SpriteFont spriteFont, const char *text, Vector2 position, float fontSize, int spacing, Color tint) void DrawTextEx(SpriteFont spriteFont, const char *text, Vector2 position, float fontSize, int spacing, Color tint)
{ {
int length = strlen(text); int length = strlen(text);
int textOffsetX = 0; int textOffsetX = 0; // Offset between characters
int textOffsetY = 0; // Line break! int textOffsetY = 0; // Required for line break!
float scaleFactor; float scaleFactor;
unsigned char letter;
Rectangle rec; unsigned char letter; // Current character
int index; // Index position in sprite font
scaleFactor = fontSize/spriteFont.size; scaleFactor = fontSize/spriteFont.size;
@ -357,42 +357,38 @@ void DrawTextEx(SpriteFont spriteFont, const char *text, Vector2 position, float
// written in C code files (codified by default as UTF-8) // 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] == '\n')
{
// NOTE: Fixed line spacing of 1.5 lines
textOffsetY += ((spriteFont.size + spriteFont.size/2)*scaleFactor);
textOffsetX = 0;
}
else
{ {
if ((unsigned char)text[i] == 0xc2) // UTF-8 encoding identification HACK! if ((unsigned char)text[i] == 0xc2) // UTF-8 encoding identification HACK!
{ {
// Support UTF-8 encoded values from [0xc2 0x80] -> [0xc2 0xbf](¿) // 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[GetCharIndex(spriteFont, (int)letter)]; index = GetCharIndex(spriteFont, (int)letter);
i++; i++;
} }
else if ((unsigned char)text[i] == 0xc3) // UTF-8 encoding identification HACK! else if ((unsigned char)text[i] == 0xc3) // UTF-8 encoding identification HACK!
{ {
// Support UTF-8 encoded values from [0xc3 0x80](À) -> [0xc3 0xbf](ÿ) // 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[GetCharIndex(spriteFont, (int)letter + 64)]; index = GetCharIndex(spriteFont, (int)letter + 64);
i++; i++;
} }
else else index = GetCharIndex(spriteFont, (int)text[i]);
{
if ((unsigned char)text[i] == '\n')
{
// NOTE: Fixed line spacing of 1.5 lines
textOffsetY += ((spriteFont.size + spriteFont.size/2)*scaleFactor);
textOffsetX = 0;
rec.x = -1;
}
else rec = spriteFont.charRecs[GetCharIndex(spriteFont, (int)text[i])];
}
if (rec.x >= 0) DrawTexturePro(spriteFont.texture, spriteFont.charRecs[index],
{ (Rectangle){ position.x + textOffsetX + spriteFont.charOffsets[index].x*scaleFactor,
int index = GetCharIndex(spriteFont, (int)text[i]);
DrawTexturePro(spriteFont.texture, rec, (Rectangle){ position.x + textOffsetX + spriteFont.charOffsets[index].x*scaleFactor,
position.y + textOffsetY + spriteFont.charOffsets[index].y*scaleFactor, position.y + textOffsetY + spriteFont.charOffsets[index].y*scaleFactor,
rec.width*scaleFactor, rec.height*scaleFactor} , (Vector2){ 0, 0 }, 0.0f, tint); spriteFont.charRecs[index].width*scaleFactor,
spriteFont.charRecs[index].height*scaleFactor }, (Vector2){ 0, 0 }, 0.0f, tint);
if (spriteFont.charAdvanceX[index] == 0) textOffsetX += (rec.width*scaleFactor + spacing); if (spriteFont.charAdvanceX[index] == 0) textOffsetX += (spriteFont.charRecs[index].width*scaleFactor + spacing);
else textOffsetX += (spriteFont.charAdvanceX[index]*scaleFactor + spacing); else textOffsetX += (spriteFont.charAdvanceX[index]*scaleFactor + spacing);
} }
} }
@ -535,7 +531,7 @@ void DrawFPS(int posX, int posY)
static int GetCharIndex(SpriteFont font, int letter) static int GetCharIndex(SpriteFont font, int letter)
{ {
//#define UNORDERED_CHARSET #define UNORDERED_CHARSET
#if defined(UNORDERED_CHARSET) #if defined(UNORDERED_CHARSET)
int index = 0; int index = 0;