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

Rectangle parameters changed to float

Browse source 
- Some examples tweaks
- Reviewed ImageFormat()
- Use float for text fontSize
This commit is contained in:
Ray San 2018-05-04 16:25:31 +02:00
parent 9d103b7c2f
commit 6324697ffd
7 changed files with 71 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/text.c
View file

@ -364,13 +364,13 @@ void DrawText(const char *text, int posX, int posY, int fontSize, Color color)
if (fontSize < defaultFontSize) fontSize = defaultFontSize;
int spacing = fontSize/defaultFontSize;
DrawTextEx(GetDefaultFont(), text, position, (float)fontSize, spacing, color);
DrawTextEx(GetDefaultFont(), text, position, (float)fontSize, (float)spacing, color);
}
}
// Draw text using SpriteFont
// NOTE: chars spacing is NOT proportional to fontSize
void DrawTextEx(SpriteFont font, const char *text, Vector2 position, float fontSize, int spacing, Color tint)
void DrawTextEx(SpriteFont font, const char *text, Vector2 position, float fontSize, float spacing, Color tint)
{
int length = strlen(text);
int textOffsetX = 0; // Offset between characters
@ -476,14 +476,14 @@ int MeasureText(const char *text, int fontSize)
if (fontSize < defaultFontSize) fontSize = defaultFontSize;
int spacing = fontSize/defaultFontSize;
vec = MeasureTextEx(GetDefaultFont(), text, (float)fontSize, spacing);
vec = MeasureTextEx(GetDefaultFont(), text, (float)fontSize, (float)spacing);
}
return (int)vec.x;
}
// Measure string size for SpriteFont
Vector2 MeasureTextEx(SpriteFont font, const char *text, float fontSize, int spacing)
Vector2 MeasureTextEx(SpriteFont font, const char *text, float fontSize, float spacing)
{
int len = strlen(text);
int tempLen = 0; // Used to count longer text line num chars