From d9d9c6111b7dd7de65f178ca6375fe80a719ac86 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 12 Sep 2019 16:30:39 +0200 Subject: RENAMED: text_sprite_font > text_font_spritefont --- examples/Makefile | 6 +-- examples/text/text_font_spritefont.c | 85 +++++++++++++++++++++++++++++++++ examples/text/text_font_spritefont.png | Bin 0 -> 19567 bytes examples/text/text_sprite_fonts.c | 76 ----------------------------- examples/text/text_sprite_fonts.png | Bin 19567 -> 0 bytes 5 files changed, 88 insertions(+), 79 deletions(-) create mode 100644 examples/text/text_font_spritefont.c create mode 100644 examples/text/text_font_spritefont.png delete mode 100644 examples/text/text_sprite_fonts.c delete mode 100644 examples/text/text_sprite_fonts.png diff --git a/examples/Makefile b/examples/Makefile index 26cb2328..278cdee3 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -385,9 +385,9 @@ EXAMPLES = \ shapes/shapes_draw_circle_sector \ shapes/shapes_draw_rectangle_rounded \ text/text_raylib_fonts \ - text/text_sprite_fonts \ - text/text_ttf_loading \ - text/text_bmfont_ttf \ + text/text_font_spritefont \ + text/text_font_loading \ + text/text_font_filters \ text/text_font_sdf \ text/text_format_text \ text/text_input_box \ diff --git a/examples/text/text_font_spritefont.c b/examples/text/text_font_spritefont.c new file mode 100644 index 00000000..dff2b47a --- /dev/null +++ b/examples/text/text_font_spritefont.c @@ -0,0 +1,85 @@ +/******************************************************************************************* +* +* raylib [text] example - Sprite font loading +* +* Loaded sprite fonts have been generated following XNA SpriteFont conventions: +* - Characters must be ordered starting with character 32 (Space) +* - Every character must be contained within the same Rectangle height +* - Every character and every line must be separated the same distance +* - Rectangles must be defined by a MAGENTA color background +* +* If following this constraints, a font can be provided just by an image, +* this is quite handy to avoid additional information files (like BMFonts use). +* +* This example has been created using raylib 1.0 (www.raylib.com) +* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) +* +* Copyright (c) 2014 Ramon Santamaria (@raysan5) +* +********************************************************************************************/ + +#include "raylib.h" + +int main(void) +{ + // Initialization + //-------------------------------------------------------------------------------------- + const int screenWidth = 800; + const int screenHeight = 450; + + InitWindow(screenWidth, screenHeight, "raylib [text] example - sprite font loading"); + + const char msg1[50] = "THIS IS A custom SPRITE FONT..."; + const char msg2[50] = "...and this is ANOTHER CUSTOM font..."; + const char msg3[50] = "...and a THIRD one! GREAT! :D"; + + // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required) + Font font1 = LoadFont("resources/custom_mecha.png"); // Font loading + Font font2 = LoadFont("resources/custom_alagard.png"); // Font loading + Font font3 = LoadFont("resources/custom_jupiter_crash.png"); // Font loading + + Vector2 fontPosition1 = { screenWidth/2 - MeasureTextEx(font1, msg1, font1.baseSize, -3).x/2, + screenHeight/2 - font1.baseSize/2 - 80 }; + + Vector2 fontPosition2 = { screenWidth/2 - MeasureTextEx(font2, msg2, font2.baseSize, -2).x/2, + screenHeight/2 - font2.baseSize/2 - 10 }; + + Vector2 fontPosition3 = { screenWidth/2 - MeasureTextEx(font3, msg3, font3.baseSize, 2).x/2, + screenHeight/2 - font3.baseSize/2 + 50 }; + + SetTargetFPS(60); // Set our game to run at 60 frames-per-second + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!WindowShouldClose()) // Detect window close button or ESC key + { + // Update + //---------------------------------------------------------------------------------- + // TODO: Update variables here... + //---------------------------------------------------------------------------------- + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(RAYWHITE); + + DrawTextEx(font1, msg1, fontPosition1, font1.baseSize, -3, WHITE); + DrawTextEx(font2, msg2, fontPosition2, font2.baseSize, -2, WHITE); + DrawTextEx(font3, msg3, fontPosition3, font3.baseSize, 2, WHITE); + + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + UnloadFont(font1); // Font unloading + UnloadFont(font2); // Font unloading + UnloadFont(font3); // Font unloading + + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + + return 0; +} \ No newline at end of file diff --git a/examples/text/text_font_spritefont.png b/examples/text/text_font_spritefont.png new file mode 100644 index 00000000..1bd4aa03 Binary files /dev/null and b/examples/text/text_font_spritefont.png differ diff --git a/examples/text/text_sprite_fonts.c b/examples/text/text_sprite_fonts.c deleted file mode 100644 index b7c9ab10..00000000 --- a/examples/text/text_sprite_fonts.c +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************************* -* -* raylib [text] example - Font loading and usage -* -* This example has been created using raylib 1.0 (www.raylib.com) -* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) -* -* Copyright (c) 2014 Ramon Santamaria (@raysan5) -* -********************************************************************************************/ - -#include "raylib.h" - -int main(void) -{ - // Initialization - //-------------------------------------------------------------------------------------- - const int screenWidth = 800; - const int screenHeight = 450; - - InitWindow(screenWidth, screenHeight, "raylib [text] example - sprite fonts usage"); - - const char msg1[50] = "THIS IS A custom SPRITE FONT..."; - const char msg2[50] = "...and this is ANOTHER CUSTOM font..."; - const char msg3[50] = "...and a THIRD one! GREAT! :D"; - - // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required) - Font font1 = LoadFont("resources/custom_mecha.png"); // Font loading - Font font2 = LoadFont("resources/custom_alagard.png"); // Font loading - Font font3 = LoadFont("resources/custom_jupiter_crash.png"); // Font loading - - Vector2 fontPosition1 = { screenWidth/2 - MeasureTextEx(font1, msg1, font1.baseSize, -3).x/2, - screenHeight/2 - font1.baseSize/2 - 80 }; - - Vector2 fontPosition2 = { screenWidth/2 - MeasureTextEx(font2, msg2, font2.baseSize, -2).x/2, - screenHeight/2 - font2.baseSize/2 - 10 }; - - Vector2 fontPosition3 = { screenWidth/2 - MeasureTextEx(font3, msg3, font3.baseSize, 2).x/2, - screenHeight/2 - font3.baseSize/2 + 50 }; - - SetTargetFPS(60); // Set our game to run at 60 frames-per-second - //-------------------------------------------------------------------------------------- - - // Main game loop - while (!WindowShouldClose()) // Detect window close button or ESC key - { - // Update - //---------------------------------------------------------------------------------- - // TODO: Update variables here... - //---------------------------------------------------------------------------------- - - // Draw - //---------------------------------------------------------------------------------- - BeginDrawing(); - - ClearBackground(RAYWHITE); - - DrawTextEx(font1, msg1, fontPosition1, font1.baseSize, -3, WHITE); - DrawTextEx(font2, msg2, fontPosition2, font2.baseSize, -2, WHITE); - DrawTextEx(font3, msg3, fontPosition3, font3.baseSize, 2, WHITE); - - EndDrawing(); - //---------------------------------------------------------------------------------- - } - - // De-Initialization - //-------------------------------------------------------------------------------------- - UnloadFont(font1); // Font unloading - UnloadFont(font2); // Font unloading - UnloadFont(font3); // Font unloading - - CloseWindow(); // Close window and OpenGL context - //-------------------------------------------------------------------------------------- - - return 0; -} \ No newline at end of file diff --git a/examples/text/text_sprite_fonts.png b/examples/text/text_sprite_fonts.png deleted file mode 100644 index 1bd4aa03..00000000 Binary files a/examples/text/text_sprite_fonts.png and /dev/null differ -- cgit v1.2.3