mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #734 from Demizdor/master

Browse Source 
Added DrawTextRecEx()
This commit is contained in:
Ray 2019-02-03 20:47:13 +01:00 committed by GitHub
commit 01ace743d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 79 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/raylib.h
View File

@ -1134,6 +1134,8 @@ RLAPI void DrawFPS(int posX, int posY);
RLAPI void DrawText(const char *text, int posX, int posY, int fontSize, Color color); // Draw text (using default font) RLAPI void DrawText(const char *text, int posX, int posY, int fontSize, Color color); // Draw text (using default font)
RLAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font and additional parameters RLAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font and additional parameters
RLAPI void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits RLAPI void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits
RLAPI void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint,
int selectStart, int selectLength, Color selectText, Color selectBG); // Draw text using font inside rectangle limits with support for text selection
// Text misc. functions // Text misc. functions
RLAPI int MeasureText(const char *text, int fontSize); // Measure string width for default font RLAPI int MeasureText(const char *text, int fontSize); // Measure string width for default font

136
src/text.c
View File

@ -781,6 +781,13 @@ void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, f
// Draw text using font inside rectangle limits // Draw text using font inside rectangle limits
void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint) void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint)
{
DrawTextRecEx(font, text, rec, fontSize, spacing, wordWrap, tint, 0, 0, WHITE, WHITE);
}
// Draw text using font inside rectangle limits with support for text selection
void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint,
int selectStart, int selectLength, Color selectText, Color selectBG)
{ {
int length = strlen(text); int length = strlen(text);
int textOffsetX = 0; // Offset between characters int textOffsetX = 0; // Offset between characters
@ -792,12 +799,10 @@ void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, flo
scaleFactor = fontSize/font.baseSize; scaleFactor = fontSize/font.baseSize;
enum { MEASURE_WORD = 0, DRAW_WORD = 1 }; enum { MEASURE_STATE = 0, DRAW_STATE = 1 };
int state = wordWrap ? MEASURE_WORD : DRAW_WORD; int state = wordWrap?MEASURE_STATE:DRAW_STATE;
int lastTextOffsetX = 0; int startLine = -1; // Index where to begin drawing (where a line begins)
int wordStart = 0; int endLine = -1; // Index where to stop drawing (where a line ends)
bool firstWord = true;
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
{ {
@ -827,76 +832,89 @@ void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, flo
(int)(font.chars[index].advanceX*scaleFactor + spacing); (int)(font.chars[index].advanceX*scaleFactor + spacing);
} }
// NOTE: When word wrap is active first we measure a `word`(measure until a ' ','\n','\t' is found) // NOTE: When wordWrap is ON we first measure how much of the text we can draw
// then set all the variables back to what they were before the measurement, change the state to // before going outside of the `rec` container. We store this info inside
// draw that word then change the state again and repeat until the end of the string...when the word // `startLine` and `endLine` then we change states, draw the text between those two
// doesn't fit inside the rect we simple increase `textOffsetY` to draw it on the next line // variables then change states again and again recursively until the end of the text
if (state == MEASURE_WORD) // (or until we get outside of the container).
// When wordWrap is OFF we don't need the measure state so we go to the drawing
// state immediately and begin drawing on the next line before we can get outside
// the container.
if (state == MEASURE_STATE)
{ {
// Measuring state if((letter == ' ') || (letter == '\t') || (letter == '\n')) endLine = i;
if ((letter == ' ') || (letter == '\n') || (letter == '\t') || ((i + 1) == length))
if(textOffsetX + glyphWidth + 1 >= rec.width)
{ {
int t = textOffsetX + glyphWidth; endLine = (endLine < 1) ? i : endLine;
if(i == endLine) endLine -= 1;
if (textOffsetX+1>=rec.width) if(startLine + 1 == endLine ) endLine = i - 1;
{ state = !state;
textOffsetY += (int)((font.baseSize + font.baseSize/2)*scaleFactor); }
lastTextOffsetX = t - lastTextOffsetX; else if(i + 1 == length)
textOffsetX = 0; {
} endLine = i;
else state = !state;
{
textOffsetX = lastTextOffsetX;
lastTextOffsetX = t;
}
glyphWidth = 0;
state = !state; // Change state
t = i;
i = firstWord?-1:wordStart;
wordStart = t;
} }
else if(letter == '\n')
{
state = !state;
}
if(state == DRAW_STATE) {
textOffsetX = 0;
i = startLine;
glyphWidth = 0;
}
} }
else else
{ {
// Drawing state if (letter == '\n')
int t = textOffsetX + glyphWidth;
if (letter == '\n')
{ {
textOffsetY += (int)((font.baseSize + font.baseSize/2)*scaleFactor); if(!wordWrap){
lastTextOffsetX = t - lastTextOffsetX; textOffsetY += (int)((font.baseSize + font.baseSize/2)*scaleFactor);
if (lastTextOffsetX < 0) lastTextOffsetX = 0; textOffsetX = 0;
textOffsetX = 0; }
} }
else if ((letter != ' ') && (letter != '\t')) else
{ {
if ((t + 1) >= rec.width) if(!wordWrap && textOffsetX + glyphWidth + 1 >= rec.width) {
{
textOffsetY += (int)((font.baseSize + font.baseSize/2)*scaleFactor); textOffsetY += (int)((font.baseSize + font.baseSize/2)*scaleFactor);
textOffsetX = 0; textOffsetX = 0;
} }
if ((textOffsetY + (int)((font.baseSize + font.baseSize/2)*scaleFactor)) > rec.height) break; if ((textOffsetY + (int)((font.baseSize + font.baseSize/2)*scaleFactor)) > rec.height) break;
DrawTexturePro(font.texture, font.chars[index].rec, //draw selected
(Rectangle){ rec.x + textOffsetX + font.chars[index].offsetX*scaleFactor, bool isGlyphSelected = false;
rec.y + textOffsetY + font.chars[index].offsetY*scaleFactor, if(selectStart >= 0 && i >= selectStart && i < selectStart + selectLength) {
font.chars[index].rec.width*scaleFactor, Rectangle strec = {rec.x + textOffsetX-1, rec.y + textOffsetY,
font.chars[index].rec.height*scaleFactor }, (Vector2){ 0, 0 }, 0.0f, tint); glyphWidth,(font.baseSize + font.baseSize/4)*scaleFactor};
DrawRectangleRec(strec, selectBG);
isGlyphSelected = true;
}
//draw glyph
if ((letter != ' ') && (letter != '\t'))
{
DrawTexturePro(font.texture, font.chars[index].rec,
(Rectangle){ rec.x + textOffsetX + font.chars[index].offsetX*scaleFactor,
rec.y + textOffsetY + font.chars[index].offsetY*scaleFactor,
font.chars[index].rec.width*scaleFactor,
font.chars[index].rec.height*scaleFactor }, (Vector2){ 0, 0 }, 0.0f,
(!isGlyphSelected) ? tint : selectText);
}
} }
if (wordWrap) if (wordWrap && i == endLine)
{ {
if ((letter == ' ') || (letter == '\n') || (letter == '\t')) textOffsetY += (int)((font.baseSize + font.baseSize/2)*scaleFactor);
{ textOffsetX = 0;
// After drawing a word change the state startLine = endLine;
firstWord = false; endLine = -1;
i = wordStart; glyphWidth = 0;
textOffsetX = lastTextOffsetX; state = !state;
glyphWidth = 0;
state = !state;
}
} }
} }