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

Code formatting + Adding \004 for background color separatedly + Introducing MeasureTextStyled and MeasureTextStyledEx functions

Browse source
This commit is contained in:
SultansOfCode 2025-03-07 16:15:01 -03:00
parent 22dd32cba4
commit 0f5af53166
3 changed files with 129 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/text/text_styled.c
View file

@ -49,13 +49,13 @@ int main(void)
DrawTextStyled("This changes the \0032foreground color", 200, 80, 20, colors, colorCount);
DrawTextStyled("This changes the \0030,2background color", 200, 120, 20, colors, colorCount);
DrawTextStyled("This changes the \0042background color", 200, 120, 20, colors, colorCount);
DrawTextStyled("This changes the \0031,2foreground and background colors", 200, 160, 20, colors, colorCount);
DrawTextStyled("This changes the \0031\0042foreground and background colors", 200, 160, 20, colors, colorCount);
DrawTextStyled("\0031,2This \015restores the colors to the default ones", 200, 200, 20, colors, colorCount);
DrawTextStyled("\0031\0042This \015restores the colors to the default ones", 200, 200, 20, colors, colorCount);
DrawTextStyled("\0031,2This \022inverts\022 the colors", 200, 240, 20, colors, colorCount);
DrawTextStyled("\0031\0042This \022inverts\022 the colors", 200, 240, 20, colors, colorCount);
EndDrawing();
//----------------------------------------------------------------------------------

14
src/raylib.h
View file

@ -1485,12 +1485,14 @@ RLAPI void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float f
RLAPI void DrawTextCodepoints(Font font, const int *codepoints, int codepointCount, Vector2 position, float fontSize, float spacing, Color tint); // Draw multiple character (codepoint)
// Text font info functions
RLAPI void SetTextLineSpacing(int spacing); // Set vertical line spacing when drawing with line-breaks
RLAPI int MeasureText(const char *text, int fontSize); // Measure string width for default font
RLAPI Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing); // Measure string size for Font
RLAPI int GetGlyphIndex(Font font, int codepoint); // Get glyph index position in font for a codepoint (unicode character), fallback to '?' if not found
RLAPI GlyphInfo GetGlyphInfo(Font font, int codepoint); // Get glyph font info data for a codepoint (unicode character), fallback to '?' if not found
RLAPI Rectangle GetGlyphAtlasRec(Font font, int codepoint); // Get glyph rectangle in font atlas for a codepoint (unicode character), fallback to '?' if not found
RLAPI void SetTextLineSpacing(int spacing); // Set vertical line spacing when drawing with line-breaks
RLAPI int MeasureText(const char *text, int fontSize); // Measure string width for default font
RLAPI Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing); // Measure string size for Font
RLAPI int MeasureTextStyled(const char *text, int fontSize); // Measure styled string width for default font
RLAPI Vector2 MeasureTextStyledEx(Font font, const char *text, float fontSize, float spacing); // Measure styled string size for Font
RLAPI int GetGlyphIndex(Font font, int codepoint); // Get glyph index position in font for a codepoint (unicode character), fallback to '?' if not found
RLAPI GlyphInfo GetGlyphInfo(Font font, int codepoint); // Get glyph font info data for a codepoint (unicode character), fallback to '?' if not found
RLAPI Rectangle GetGlyphAtlasRec(Font font, int codepoint); // Get glyph rectangle in font atlas for a codepoint (unicode character), fallback to '?' if not found
// Text codepoints management functions (unicode characters)
RLAPI char *LoadUTF8(const int *codepoints, int length); // Load UTF-8 text encoded from codepoints array

152
src/rtext.c
View file

@ -1247,7 +1247,9 @@ void DrawTextStyledEx(Font font, const char *text, Vector2 position, float fontS
}
else
{
if (codepoint == '\3') {
if (codepoint == '\003' || codepoint == '\004')
{
bool isForeground = codepoint == '\003';
char colorBuffer[16] = { 0 };
int colorBufferIndex = 0;
@ -1255,7 +1257,8 @@ void DrawTextStyledEx(Font font, const char *text, Vector2 position, float fontS
codepoint = GetCodepointNext(&text[i], &codepointByteCount);
while (codepoint >= '0' && codepoint <= '9' && i < size && colorBufferIndex < sizeof(colorBuffer) - 1) {
while (codepoint >= '0' && codepoint <= '9' && i < size && colorBufferIndex < sizeof(colorBuffer) - 1)
{
colorBuffer[colorBufferIndex++] = codepoint;
i += codepointByteCount;
@ -1263,47 +1266,34 @@ void DrawTextStyledEx(Font font, const char *text, Vector2 position, float fontS
codepoint = GetCodepointNext(&text[i], &codepointByteCount);
}
int colorIndex = atoi(&colorBuffer);
if (colorBufferIndex > 0)
{
int colorIndex = atoi(&colorBuffer);
foreground = colorIndex < colorCount ? colors[colorIndex] : defaultForeground;
if (codepoint == ',' && i + codepointByteCount < size) {
int nextCodepointByteCount = 0;
int nextI = i + codepointByteCount;
int nextCodepoint = GetCodepointNext(&text[nextI], &nextCodepointByteCount);
if (nextCodepoint >= '0' && nextCodepoint <= '9') {
memset(colorBuffer, 0, sizeof(colorBuffer));
colorBufferIndex = 0;
i += codepointByteCount;
codepoint = GetCodepointNext(&text[i], &codepointByteCount);
while (codepoint >= '0' && codepoint <= '9' && i < size && colorBufferIndex < sizeof(colorBuffer) - 1) {
colorBuffer[colorBufferIndex++] = codepoint;
i += codepointByteCount;
codepoint = GetCodepointNext(&text[i], &codepointByteCount);
if (colorIndex >= 0)
{
if (isForeground)
{
foreground = colorIndex < colorCount ? colors[colorIndex] : defaultForeground;
}
else
{
background = colorIndex < colorCount ? colors[colorIndex] : defaultBackground;
}
colorIndex = atoi(&colorBuffer);
background = colorIndex < colorCount ? colors[colorIndex] : defaultBackground;
}
}
continue;
}
else if (codepoint == '\15') {
else if (codepoint == '\015') {
foreground = defaultForeground;
background = defaultBackground;
i += codepointByteCount;
codepoint = GetCodepointNext(&text[i], &codepointByteCount);
continue;
}
else if (codepoint == '\22') {
else if (codepoint == '\022') {
Color temp = foreground;
foreground = background;
@ -1311,11 +1301,9 @@ void DrawTextStyledEx(Font font, const char *text, Vector2 position, float fontS
i += codepointByteCount;
codepoint = GetCodepointNext(&text[i], &codepointByteCount);
continue;
}
if (i >= size) break;
int index = GetGlyphIndex(font, codepoint);
float increaseX = 0.0f;
@ -1475,6 +1463,100 @@ Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing
return textSize;
}
// Measure styled string width for default font
int MeasureTextStyled(const char *text, int fontSize)
{
Vector2 textSize = { 0.0f, 0.0f };
// Check if default font has been loaded
if (GetFontDefault().texture.id != 0)
{
int defaultFontSize = 10; // Default Font chars height in pixel
if (fontSize < defaultFontSize) fontSize = defaultFontSize;
int spacing = fontSize/defaultFontSize;
textSize = MeasureTextStyledEx(GetFontDefault(), text, (float)fontSize, (float)spacing);
}
return (int)textSize.x;
}
// Measure styled string size for Font
Vector2 MeasureTextStyledEx(Font font, const char *text, float fontSize, float spacing)
{
Vector2 textSize = { 0 };
if ((isGpuReady && (font.texture.id == 0)) ||
(text == NULL) || (text[0] == '\0')) return textSize; // Security check
int size = TextLength(text); // Get size in bytes of text
int tempByteCounter = 0; // Used to count longer text line num chars
int byteCounter = 0;
float textWidth = 0.0f;
float tempTextWidth = 0.0f; // Used to count longer text line width
float textHeight = fontSize;
float scaleFactor = fontSize/(float)font.baseSize;
int letter = 0; // Current character
int index = 0; // Index position in sprite font
for (int i = 0; i < size;)
{
int codepointByteCount = 0;
letter = GetCodepointNext(&text[i], &codepointByteCount);
i += codepointByteCount;
if (letter == '\015' || letter == '\022')
{
continue;
}
else if (letter == '\003' || letter == '\004')
{
letter = GetCodepointNext(&text[i], &codepointByteCount);
while (letter >= '0' && letter <= '9' && i < size)
{
i += codepointByteCount;
letter = GetCodepointNext(&text[i], &codepointByteCount);
}
continue;
}
byteCounter++;
if (letter != '\n')
{
index = GetGlyphIndex(font, letter);
if (font.glyphs[index].advanceX > 0) textWidth += font.glyphs[index].advanceX;
else textWidth += (font.recs[index].width + font.glyphs[index].offsetX);
}
else
{
if (tempTextWidth < textWidth) tempTextWidth = textWidth;
byteCounter = 0;
textWidth = 0;
// NOTE: Line spacing is a global variable, use SetTextLineSpacing() to setup
textHeight += (fontSize + textLineSpacing);
}
if (tempByteCounter < byteCounter) tempByteCounter = byteCounter;
}
if (tempTextWidth < textWidth) tempTextWidth = textWidth;
textSize.x = tempTextWidth*scaleFactor + (float)((tempByteCounter - 1)*spacing);
textSize.y = textHeight;
return textSize;
}
// Get index position for a unicode character on font
// NOTE: If codepoint is not found in the font it fallbacks to '?'
int GetGlyphIndex(Font font, int codepoint)