Skip to content

Add DrawTextLen variants #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Peter0x44 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add DrawTextLen variants #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/raygpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,8 +1601,11 @@ RGAPI int *LoadCodepoints(const char *text, int *count);
RGAPI int GetCodepoint(const char *text, int *codepointSize);
RGAPI int GetCodepointPrevious(const char *text, int *codepointSize);
RGAPI void DrawText(const char *text, int posX, int posY, int fontSize, Color color); // Draw text (using default font)
RGAPI void DrawTextLen(const char *text, int length, int posX, int posY, int fontSize, Color color); // Draw text with length (using default font)
RGAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font and additional parameters
RGAPI void DrawTextExLen(Font font, const char *text, int length, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font with length
RGAPI void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint); // Draw text using Font and pro parameters (rotation)
RGAPI void DrawTextProLen(Font font, const char *text, int length, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint); // Draw text using Font and pro parameters with length (rotation)
RGAPI void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSize, Color tint); // Draw one character (codepoint)
RGAPI void DrawTextCodepoints(Font font, const int *codepoints, int codepointCount, Vector2 position, float fontSize, float spacing, Color tint); // Draw multiple character (codepoint)
RGAPI int GetCodepointNext(const char *text, int *codepointSize);
Expand Down
69 changes: 69 additions & 0 deletions src/rtext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,6 +1074,22 @@ void DrawText(const char *text, int posX, int posY, int fontSize, Color color)
}
}

// Draw text with length (using default font)
void DrawTextLen(const char *text, int length, int posX, int posY, int fontSize, Color color)
{
// Check if default font has been loaded
if (GetFontDefault().texture.id != 0)
{
Vector2 position = { (float)posX, (float)posY };

int defaultFontSize = 10; // Default Font chars height in pixel
//if (fontSize < defaultFontSize) fontSize = defaultFontSize;
int spacing = fontSize/defaultFontSize;

DrawTextExLen(GetFontDefault(), text, length, position, (float)fontSize, (float)spacing, color);
}
}

// Draw text using Font
// NOTE: chars spacing is NOT proportional to fontSize
void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint)
Expand Down Expand Up @@ -1117,6 +1133,48 @@ void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, f
}
}

// Draw text using Font with length
// NOTE: chars spacing is NOT proportional to fontSize
void DrawTextExLen(Font font, const char *text, int length, Vector2 position, float fontSize, float spacing, Color tint)
{
if (font.texture.id == 0) font = GetFontDefault(); // Security check in case of not valid font

float textOffsetY = 0; // Offset between lines (on linebreak '\n')
float textOffsetX = 0.0f; // Offset X to next character to draw

float scaleFactor = fontSize / font.baseSize; // Character quad scaling factor

for (int i = 0; i < length;)
{
// Get next codepoint from byte string and glyph index in font
int codepointByteCount = 0;
int codepoint = GetCodepointNext(&text[i], &codepointByteCount);
int index = GetGlyphIndex(font, codepoint);

// Ensure we don't go beyond the specified length
if (i + codepointByteCount > length) break;

if (codepoint == '\n')
{
// NOTE: Line spacing is a global variable, use SetTextLineSpacing() to setup
textOffsetY += (fontSize + textLineSpacing);
textOffsetX = 0.0f;
}
else
{
if ((codepoint != ' ') && (codepoint != '\t'))
{
DrawTextCodepoint(font, codepoint, (Vector2){ position.x + textOffsetX, position.y + textOffsetY }, fontSize, tint);
}

if (font.glyphs[index].advanceX == 0) textOffsetX += ((float)font.recs[index].width*scaleFactor + spacing);
else textOffsetX += ((float)font.glyphs[index].advanceX*scaleFactor + spacing);
}

i += codepointByteCount; // Move text bytes counter to next codepoint
}
}

// Draw text using Font and pro parameters (rotation)
void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint)
{
Expand All @@ -1128,6 +1186,17 @@ void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin,
//rlPopMatrix();
}

// Draw text using Font and pro parameters with length (rotation)
void DrawTextProLen(Font font, const char *text, int length, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint)
{
//rlPushMatrix();
//rlTranslatef(position.x, position.y, 0.0f);
//rlRotatef(rotation, 0.0f, 0.0f, 1.0f);
//rlTranslatef(-origin.x, -origin.y, 0.0f);
DrawTextExLen(font, text, length, (Vector2){ 0.0f, 0.0f }, fontSize, spacing, tint);
//rlPopMatrix();
}

// Draw one character (codepoint)
void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSize, Color tint)
{
Expand Down