diff options
| author | raysan5 <[email protected]> | 2018-07-05 19:08:24 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2018-07-05 19:08:24 +0200 |
| commit | d881c732578c238bf77b8a6755fa03f61dda9d5d (patch) | |
| tree | cd96b7ac77a97bed0dda8555ffdeef5a158406b1 /src/shapes.c | |
| parent | 1f1d8eeeeb5aa34cfa41784c88cdce11fa525fa1 (diff) | |
| download | raylib-d881c732578c238bf77b8a6755fa03f61dda9d5d.tar.gz raylib-d881c732578c238bf77b8a6755fa03f61dda9d5d.zip | |
Renamed GetDefaultFont() to GetFontDefault()
Library consistency rename... yes, I know, it breaks the API...
Diffstat (limited to 'src/shapes.c')
| -rw-r--r-- | src/shapes.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/shapes.c b/src/shapes.c index 604dcb87..87997546 100644 --- a/src/shapes.c +++ b/src/shapes.c @@ -259,27 +259,27 @@ void DrawRectangleV(Vector2 position, Vector2 size, Color color) #if defined(SUPPORT_QUADS_DRAW_MODE) #if defined(SUPPORT_FONT_TEXTURE) // Draw rectangle using font texture white character - rlEnableTexture(GetDefaultFont().texture.id); + rlEnableTexture(GetFontDefault()().texture.id); rlBegin(RL_QUADS); rlColor4ub(color.r, color.g, color.b, color.a); rlNormal3f(0.0f, 0.0f, 1.0f); // NOTE: Default raylib font character 95 is a white square - rlTexCoord2f((float)GetDefaultFont().chars[95].rec.x/GetDefaultFont().texture.width, - (float)GetDefaultFont().chars[95].rec.y/GetDefaultFont().texture.height); + rlTexCoord2f((float)GetFontDefault()().chars[95].rec.x/GetFontDefault()().texture.width, + (float)GetFontDefault()().chars[95].rec.y/GetFontDefault()().texture.height); rlVertex2f(position.x, position.y); - rlTexCoord2f((float)GetDefaultFont().chars[95].rec.x/GetDefaultFont().texture.width, - (float)(GetDefaultFont().chars[95].rec.y + GetDefaultFont().chars[95].rec.height)/GetDefaultFont().texture.height); + rlTexCoord2f((float)GetFontDefault()().chars[95].rec.x/GetFontDefault()().texture.width, + (float)(GetFontDefault()().chars[95].rec.y + GetFontDefault()().chars[95].rec.height)/GetFontDefault()().texture.height); rlVertex2f(position.x, position.y + size.y); - rlTexCoord2f((float)(GetDefaultFont().chars[95].rec.x + GetDefaultFont().chars[95].rec.width)/GetDefaultFont().texture.width, - (float)(GetDefaultFont().chars[95].rec.y + GetDefaultFont().chars[95].rec.height)/GetDefaultFont().texture.height); + rlTexCoord2f((float)(GetFontDefault()().chars[95].rec.x + GetFontDefault()().chars[95].rec.width)/GetFontDefault()().texture.width, + (float)(GetFontDefault()().chars[95].rec.y + GetFontDefault()().chars[95].rec.height)/GetFontDefault()().texture.height); rlVertex2f(position.x + size.x, position.y + size.y); - rlTexCoord2f((float)(GetDefaultFont().chars[95].rec.x + GetDefaultFont().chars[95].rec.width)/GetDefaultFont().texture.width, - (float)GetDefaultFont().chars[95].rec.y/GetDefaultFont().texture.height); + rlTexCoord2f((float)(GetFontDefault()().chars[95].rec.x + GetFontDefault()().chars[95].rec.width)/GetFontDefault()().texture.width, + (float)GetFontDefault()().chars[95].rec.y/GetFontDefault()().texture.height); rlVertex2f(position.x + size.x, position.y); rlEnd(); @@ -370,30 +370,30 @@ void DrawRectangleGradientEx(Rectangle rec, Color col1, Color col2, Color col3, { #if defined(SUPPORT_FONT_TEXTURE) // Draw rectangle using font texture white character - rlEnableTexture(GetDefaultFont().texture.id); + rlEnableTexture(GetFontDefault()().texture.id); rlBegin(RL_QUADS); rlNormal3f(0.0f, 0.0f, 1.0f); // NOTE: Default raylib font character 95 is a white square rlColor4ub(col1.r, col1.g, col1.b, col1.a); - rlTexCoord2f(GetDefaultFont().chars[95].rec.x/GetDefaultFont().texture.width, - GetDefaultFont().chars[95].rec.y/GetDefaultFont().texture.height); + rlTexCoord2f(GetFontDefault()().chars[95].rec.x/GetFontDefault()().texture.width, + GetFontDefault()().chars[95].rec.y/GetFontDefault()().texture.height); rlVertex2f(rec.x, rec.y); rlColor4ub(col2.r, col2.g, col2.b, col2.a); - rlTexCoord2f(GetDefaultFont().chars[95].rec.x/GetDefaultFont().texture.width, - (GetDefaultFont().chars[95].rec.y + GetDefaultFont().chars[95].rec.height)/GetDefaultFont().texture.height); + rlTexCoord2f(GetFontDefault()().chars[95].rec.x/GetFontDefault()().texture.width, + (GetFontDefault()().chars[95].rec.y + GetFontDefault()().chars[95].rec.height)/GetFontDefault()().texture.height); rlVertex2f(rec.x, rec.y + rec.height); rlColor4ub(col3.r, col3.g, col3.b, col3.a); - rlTexCoord2f((GetDefaultFont().chars[95].rec.x + GetDefaultFont().chars[95].rec.width)/GetDefaultFont().texture.width, - (GetDefaultFont().chars[95].rec.y + GetDefaultFont().chars[95].rec.height)/GetDefaultFont().texture.height); + rlTexCoord2f((GetFontDefault()().chars[95].rec.x + GetFontDefault()().chars[95].rec.width)/GetFontDefault()().texture.width, + (GetFontDefault()().chars[95].rec.y + GetFontDefault()().chars[95].rec.height)/GetFontDefault()().texture.height); rlVertex2f(rec.x + rec.width, rec.y + rec.height); rlColor4ub(col4.r, col4.g, col4.b, col4.a); - rlTexCoord2f((GetDefaultFont().chars[95].rec.x + GetDefaultFont().chars[95].rec.width)/GetDefaultFont().texture.width, - GetDefaultFont().chars[95].rec.y/GetDefaultFont().texture.height); + rlTexCoord2f((GetFontDefault()().chars[95].rec.x + GetFontDefault()().chars[95].rec.width)/GetFontDefault()().texture.width, + GetFontDefault()().chars[95].rec.y/GetFontDefault()().texture.height); rlVertex2f(rec.x + rec.width, rec.y); rlEnd(); |
