summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorraysan5 <[email protected]>2017-04-22 19:04:54 +0200
committerraysan5 <[email protected]>2017-04-22 19:04:54 +0200
commitb0f8ea27e3d7417c0f0c9795aa315dac399c97bf (patch)
tree854c517f98f4028e45aa57c4341ef80724f83fec
parent5620e739149ee2a8d3152f11eb444d4e982352ab (diff)
downloadraylib-b0f8ea27e3d7417c0f0c9795aa315dac399c97bf.tar.gz
raylib-b0f8ea27e3d7417c0f0c9795aa315dac399c97bf.zip
Renamed function for lib consistency
LoadSpriteFontTTF() --> LoadSpriteFontEx()
-rw-r--r--docs/examples/src/text/text_ttf_loading.c4
-rw-r--r--docs/examples/web/text/text_ttf_loading.c4
-rw-r--r--docs/examples/web/textures/textures_raw_data.c2
-rw-r--r--examples/text/text_ttf_loading.c4
-rw-r--r--src/raylib.h2
-rw-r--r--src/text.c4
6 files changed, 10 insertions, 10 deletions
diff --git a/docs/examples/src/text/text_ttf_loading.c b/docs/examples/src/text/text_ttf_loading.c
index 4e490399..02b7f95f 100644
--- a/docs/examples/src/text/text_ttf_loading.c
+++ b/docs/examples/src/text/text_ttf_loading.c
@@ -25,7 +25,7 @@ int main()
// NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required)
// TTF SpriteFont loading with custom generation parameters
- SpriteFont font = LoadSpriteFontTTF("resources/KAISG.ttf", 96, 0, 0);
+ SpriteFont font = LoadSpriteFontEx("resources/KAISG.ttf", 96, 0, 0);
// Generate mipmap levels to use trilinear filtering
// NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR
@@ -82,7 +82,7 @@ int main()
if (count == 1) // Only support one ttf file dropped
{
UnloadSpriteFont(font);
- font = LoadSpriteFontTTF(droppedFiles[0], fontSize, 0, 0);
+ font = LoadSpriteFontEx(droppedFiles[0], fontSize, 0, 0);
ClearDroppedFiles();
}
}
diff --git a/docs/examples/web/text/text_ttf_loading.c b/docs/examples/web/text/text_ttf_loading.c
index 9dfdcac2..02097437 100644
--- a/docs/examples/web/text/text_ttf_loading.c
+++ b/docs/examples/web/text/text_ttf_loading.c
@@ -52,7 +52,7 @@ int main()
// NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required)
// TTF SpriteFont loading with custom generation parameters
- font = LoadSpriteFontTTF("resources/KAISG.ttf", 96, 0, 0);
+ font = LoadSpriteFontEx("resources/KAISG.ttf", 96, 0, 0);
// Generate mipmap levels to use trilinear filtering
// NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR
@@ -130,7 +130,7 @@ void UpdateDrawFrame(void)
if (count == 1) // Only support one ttf file dropped
{
UnloadSpriteFont(font);
- font = LoadSpriteFontTTF(droppedFiles[0], fontSize, 0, 0);
+ font = LoadSpriteFontEx(droppedFiles[0], fontSize, 0, 0);
ClearDroppedFiles();
}
}
diff --git a/docs/examples/web/textures/textures_raw_data.c b/docs/examples/web/textures/textures_raw_data.c
index 245af2e3..f06c798b 100644
--- a/docs/examples/web/textures/textures_raw_data.c
+++ b/docs/examples/web/textures/textures_raw_data.c
@@ -111,7 +111,7 @@ void UpdateDrawFrame(void)
ClearBackground(RAYWHITE);
- DrawTexture(checked, screenWidth/2 - checked.width/2, screenHeight/2 - checked.height/2, WHITE);
+ DrawTexture(checked, screenWidth/2 - checked.width/2, screenHeight/2 - checked.height/2, Fade(WHITE, 0.5f));
DrawTexture(fudesumi, 430, -30, WHITE);
DrawText("CHECKED TEXTURE ", 84, 100, 30, BROWN);
diff --git a/examples/text/text_ttf_loading.c b/examples/text/text_ttf_loading.c
index 4e490399..02b7f95f 100644
--- a/examples/text/text_ttf_loading.c
+++ b/examples/text/text_ttf_loading.c
@@ -25,7 +25,7 @@ int main()
// NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required)
// TTF SpriteFont loading with custom generation parameters
- SpriteFont font = LoadSpriteFontTTF("resources/KAISG.ttf", 96, 0, 0);
+ SpriteFont font = LoadSpriteFontEx("resources/KAISG.ttf", 96, 0, 0);
// Generate mipmap levels to use trilinear filtering
// NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR
@@ -82,7 +82,7 @@ int main()
if (count == 1) // Only support one ttf file dropped
{
UnloadSpriteFont(font);
- font = LoadSpriteFontTTF(droppedFiles[0], fontSize, 0, 0);
+ font = LoadSpriteFontEx(droppedFiles[0], fontSize, 0, 0);
ClearDroppedFiles();
}
}
diff --git a/src/raylib.h b/src/raylib.h
index 286494c7..41e1ccb7 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -867,7 +867,7 @@ RLAPI void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle dest
//------------------------------------------------------------------------------------
RLAPI SpriteFont GetDefaultFont(void); // Get the default SpriteFont
RLAPI SpriteFont LoadSpriteFont(const char *fileName); // Load SpriteFont from file into GPU memory (VRAM)
-RLAPI SpriteFont LoadSpriteFontTTF(const char *fileName, int fontSize, int charsCount, int *fontChars); // Load SpriteFont from TTF font file with generation parameters
+RLAPI SpriteFont LoadSpriteFontEx(const char *fileName, int fontSize, int charsCount, int *fontChars); // Load SpriteFont from file with extended parameters
RLAPI void UnloadSpriteFont(SpriteFont spriteFont); // Unload SpriteFont from GPU memory (VRAM)
RLAPI void DrawText(const char *text, int posX, int posY, int fontSize, Color color); // Draw text (using default font)
diff --git a/src/text.c b/src/text.c
index ebc8b0ff..cba9a7d6 100644
--- a/src/text.c
+++ b/src/text.c
@@ -316,7 +316,7 @@ SpriteFont LoadSpriteFont(const char *fileName)
//UnloadResource(rres[0]);
}
#if defined(SUPPORT_FILEFORMAT_TTF)
- else if (IsFileExtension(fileName, ".ttf")) spriteFont = LoadSpriteFontTTF(fileName, DEFAULT_TTF_FONTSIZE, 0, NULL);
+ else if (IsFileExtension(fileName, ".ttf")) spriteFont = LoadSpriteFontEx(fileName, DEFAULT_TTF_FONTSIZE, 0, NULL);
#endif
#if defined(SUPPORT_FILEFORMAT_FNT)
else if (IsFileExtension(fileName, ".fnt")) spriteFont = LoadBMFont(fileName);
@@ -341,7 +341,7 @@ SpriteFont LoadSpriteFont(const char *fileName)
// 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 charsCount, int *fontChars)
+SpriteFont LoadSpriteFontEx(const char *fileName, int fontSize, int charsCount, int *fontChars)
{
SpriteFont spriteFont = { 0 };