mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-09-20 02:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review comments and formatting

Browse Source
This commit is contained in:
raysan5
2016-12-25 02:01:13 +01:00
parent 6d6c542a1d
commit 852f3d4fd0
5 changed files with 66 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/text.c
View File

@@ -249,7 +249,7 @@ SpriteFont GetDefaultFont()
return defaultFont;
}
// Load a SpriteFont image into GPU memory
// Load SpriteFont from file into GPU memory (VRAM)
SpriteFont LoadSpriteFont(const char *fileName)
{
// Default hardcoded values for ttf file loading
@@ -280,7 +280,7 @@ SpriteFont LoadSpriteFont(const char *fileName)
return spriteFont;
}
// Load SpriteFont from TTF file with custom parameters
// Load SpriteFont from TTF font file with generation parameters
// NOTE: You can pass an array with desired characters, those characters should be available in the font
// if array is NULL, default char set is selected 32..126
SpriteFont LoadSpriteFontTTF(const char *fileName, int fontSize, int numChars, int *fontChars)
@@ -311,7 +311,7 @@ SpriteFont LoadSpriteFontTTF(const char *fileName, int fontSize, int numChars, i
return spriteFont;
}
// Unload SpriteFont from GPU memory
// Unload SpriteFont from GPU memory (VRAM)
void UnloadSpriteFont(SpriteFont spriteFont)
{
// NOTE: Make sure spriteFont is not default font (fallback)
@@ -460,13 +460,13 @@ int MeasureText(const char *text, int fontSize)
Vector2 MeasureTextEx(SpriteFont spriteFont, const char *text, float fontSize, int spacing)
{
int len = strlen(text);
int tempLen = 0; // Used to count longer text line num chars
int tempLen = 0; // Used to count longer text line num chars
int lenCounter = 0;
float textWidth = 0;
float tempTextWidth = 0; // Used to count longer text line width
float tempTextWidth = 0; // Used to count longer text line width
float textHeight = (float)spriteFont.size;
float textHeight = (float)spriteFont.size;
float scaleFactor = fontSize/(float)spriteFont.size;
for (int i = 0; i < len; i++)