mirrors
/
raylib
mirror of https://github.com/raysan5/raylib
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected issue on chars drawing 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/text.c
View File

@ -344,13 +344,13 @@ 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;
unsigned char letter; // Current character
Rectangle rec; int index; // Index position in sprite font
scaleFactor = fontSize/spriteFont.size; scaleFactor = fontSize/spriteFont.size;
// NOTE: Some ugly hacks are made to support Latin-1 Extended characters directly // NOTE: Some ugly hacks are made to support Latin-1 Extended characters directly
@ -358,41 +358,37 @@ void DrawTextEx(SpriteFont spriteFont, const char *text, Vector2 position, float
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
{ {
if ((unsigned char)text[i] == 0xc2) // UTF-8 encoding identification HACK! if ((unsigned char)text[i] == '\n')
{ {
// Support UTF-8 encoded values from [0xc2 0x80] -> [0xc2 0xbf](¿) // NOTE: Fixed line spacing of 1.5 lines
letter = (unsigned char)text[i + 1]; textOffsetY += ((spriteFont.size + spriteFont.size/2)*scaleFactor);
rec = spriteFont.charRecs[GetCharIndex(spriteFont, (int)letter)]; textOffsetX = 0;
i++;
}
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];
rec = spriteFont.charRecs[GetCharIndex(spriteFont, (int)letter + 64)];
i++;
} }
else else
{ {
if ((unsigned char)text[i] == '\n') if ((unsigned char)text[i] == 0xc2) // UTF-8 encoding identification HACK!
{ {
// NOTE: Fixed line spacing of 1.5 lines // Support UTF-8 encoded values from [0xc2 0x80] -> [0xc2 0xbf](¿)
textOffsetY += ((spriteFont.size + spriteFont.size/2)*scaleFactor); letter = (unsigned char)text[i + 1];
textOffsetX = 0; index = GetCharIndex(spriteFont, (int)letter);
rec.x = -1; i++;
} }
else rec = spriteFont.charRecs[GetCharIndex(spriteFont, (int)text[i])]; 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];
index = GetCharIndex(spriteFont, (int)letter + 64);
i++;
}
else index = 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]); position.y + textOffsetY + spriteFont.charOffsets[index].y*scaleFactor,
spriteFont.charRecs[index].width*scaleFactor,
DrawTexturePro(spriteFont.texture, rec, (Rectangle){ position.x + textOffsetX + spriteFont.charOffsets[index].x*scaleFactor, spriteFont.charRecs[index].height*scaleFactor }, (Vector2){ 0, 0 }, 0.0f, tint);
position.y + textOffsetY + spriteFont.charOffsets[index].y*scaleFactor,
rec.width*scaleFactor, rec.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;