From 5bf9675d38c2016653a261182d4dd0c8fbb419a0 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 19 Dec 2013 12:08:06 +0100 Subject: Update to version 1.0.3 View CHANGELOG for full list of changes --- examples/ex05a_sprite_fonts.c | 39 ++++++++++++++------ examples/ex05a_sprite_fonts.exe | Bin 0 -> 323089 bytes examples/ex05a_sprite_fonts.png | Bin 3913 -> 19567 bytes examples/ex05b_rbmf_fonts.c | 42 +++++++++++++++------- examples/ex05b_rbmf_fonts.exe | Bin 0 -> 325343 bytes examples/ex05b_rbmf_fonts.png | Bin 3913 -> 14877 bytes examples/ex08_audio.c | 2 +- examples/resources/audio/coin.wav | Bin 0 -> 4776 bytes examples/resources/audio/spring.wav | Bin 0 -> 10850 bytes examples/resources/audio/weird.wav | Bin 0 -> 6246 bytes examples/resources/coin.wav | Bin 4776 -> 0 bytes examples/resources/fonts/alagard.rbmf | Bin 0 -> 2159 bytes examples/resources/fonts/alpha_beta.rbmf | Bin 0 -> 2160 bytes examples/resources/fonts/custom_alagard.png | Bin 0 -> 37935 bytes examples/resources/fonts/custom_jupiter_crash.png | Bin 0 -> 23596 bytes examples/resources/fonts/custom_mecha.png | Bin 0 -> 26597 bytes examples/resources/fonts/jupiter_crash.rbmf | Bin 0 -> 2160 bytes examples/resources/fonts/mecha.rbmf | Bin 0 -> 2160 bytes examples/resources/fonts/pixantiqua.rbmf | Bin 0 -> 2160 bytes examples/resources/fonts/pixelplay.rbmf | Bin 0 -> 2160 bytes examples/resources/fonts/romulus.rbmf | Bin 0 -> 2160 bytes examples/resources/fonts/setback.rbmf | Bin 0 -> 2160 bytes examples/resources/mouse.png | Bin 0 -> 1773 bytes examples/resources/spring.wav | Bin 10850 -> 0 bytes examples/resources/weird.wav | Bin 6246 -> 0 bytes 25 files changed, 60 insertions(+), 23 deletions(-) create mode 100644 examples/ex05a_sprite_fonts.exe create mode 100644 examples/ex05b_rbmf_fonts.exe create mode 100644 examples/resources/audio/coin.wav create mode 100644 examples/resources/audio/spring.wav create mode 100644 examples/resources/audio/weird.wav delete mode 100644 examples/resources/coin.wav create mode 100644 examples/resources/fonts/alagard.rbmf create mode 100644 examples/resources/fonts/alpha_beta.rbmf create mode 100644 examples/resources/fonts/custom_alagard.png create mode 100644 examples/resources/fonts/custom_jupiter_crash.png create mode 100644 examples/resources/fonts/custom_mecha.png create mode 100644 examples/resources/fonts/jupiter_crash.rbmf create mode 100644 examples/resources/fonts/mecha.rbmf create mode 100644 examples/resources/fonts/pixantiqua.rbmf create mode 100644 examples/resources/fonts/pixelplay.rbmf create mode 100644 examples/resources/fonts/romulus.rbmf create mode 100644 examples/resources/fonts/setback.rbmf create mode 100644 examples/resources/mouse.png delete mode 100644 examples/resources/spring.wav delete mode 100644 examples/resources/weird.wav (limited to 'examples') diff --git a/examples/ex05a_sprite_fonts.c b/examples/ex05a_sprite_fonts.c index 03d46040..f4a1c1cb 100644 --- a/examples/ex05a_sprite_fonts.c +++ b/examples/ex05a_sprite_fonts.c @@ -17,11 +17,29 @@ int main() //-------------------------------------------------------------------------------------- int screenWidth = 800; int screenHeight = 450; - + + 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"; + InitWindow(screenWidth, screenHeight, "raylib example 05a - sprite fonts"); - // NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required) - SpriteFont font = LoadSpriteFont("resources/custom_font.png"); // SpriteFont loading + // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required) + SpriteFont font1 = LoadSpriteFont("resources/fonts/custom_mecha.png"); // SpriteFont loading + SpriteFont font2 = LoadSpriteFont("resources/fonts/custom_alagard.png"); // SpriteFont loading + SpriteFont font3 = LoadSpriteFont("resources/fonts/custom_jupiter_crash.png"); // SpriteFont loading + + Vector2 fontPosition1, fontPosition2, fontPosition3; + + fontPosition1.x = screenWidth/2 - MeasureTextEx(font1, msg1, GetFontBaseSize(font1), -3).x/2; + fontPosition1.y = screenHeight/2 - GetFontBaseSize(font1)/2 - 80; + + fontPosition2.x = screenWidth/2 - MeasureTextEx(font2, msg2, GetFontBaseSize(font2), -2).x/2; + fontPosition2.y = screenHeight/2 - GetFontBaseSize(font2)/2 - 10; + + fontPosition3.x = screenWidth/2 - MeasureTextEx(font3, msg3, GetFontBaseSize(font3), 2).x/2; + fontPosition3.y = screenHeight/2 - GetFontBaseSize(font3)/2 + 50; + //-------------------------------------------------------------------------------------- // Main game loop @@ -29,7 +47,7 @@ int main() { // Update //---------------------------------------------------------------------------------- - // TODO: Update your variables here + // TODO: Update variables here... //---------------------------------------------------------------------------------- // Draw @@ -38,18 +56,19 @@ int main() ClearBackground(RAYWHITE); - // TODO: Comming soon... - // TIP: Use DrawTextEx() function -/* -void DrawTextEx(SpriteFont spriteFont, const char* text, Vector2 position, int fontSize, int spacing, Color tint); -*/ + DrawTextEx(font1, msg1, fontPosition1, GetFontBaseSize(font1), -3, WHITE); + DrawTextEx(font2, msg2, fontPosition2, GetFontBaseSize(font2), -2, WHITE); + DrawTextEx(font3, msg3, fontPosition3, GetFontBaseSize(font3), 2, WHITE); + EndDrawing(); //---------------------------------------------------------------------------------- } // De-Initialization //-------------------------------------------------------------------------------------- - UnloadSpriteFont(font); // SpriteFont unloading + UnloadSpriteFont(font1); // SpriteFont unloading + UnloadSpriteFont(font2); // SpriteFont unloading + UnloadSpriteFont(font3); // SpriteFont unloading CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/ex05a_sprite_fonts.exe b/examples/ex05a_sprite_fonts.exe new file mode 100644 index 00000000..9f5994eb Binary files /dev/null and b/examples/ex05a_sprite_fonts.exe differ diff --git a/examples/ex05a_sprite_fonts.png b/examples/ex05a_sprite_fonts.png index f18ae044..1bd4aa03 100644 Binary files a/examples/ex05a_sprite_fonts.png and b/examples/ex05a_sprite_fonts.png differ diff --git a/examples/ex05b_rbmf_fonts.c b/examples/ex05b_rbmf_fonts.c index eeb5f61b..bc7fc852 100644 --- a/examples/ex05b_rbmf_fonts.c +++ b/examples/ex05b_rbmf_fonts.c @@ -9,19 +9,26 @@ * ********************************************************************************************/ -#include "raylib.h" +#include "../raylib.h" int main() { // Initialization //-------------------------------------------------------------------------------------- - int screenWidth = 800; - int screenHeight = 450; + int screenWidth = 560; + int screenHeight = 800; - InitWindow(screenWidth, screenHeight, "raylib example 04b - texture rectangle"); + InitWindow(screenWidth, screenHeight, "raylib example 05b - rBMF fonts"); // NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required) - SpriteFont font = LoadSpriteFont("resources/custom_font.rbmf"); // SpriteFont loading + SpriteFont font1 = LoadSpriteFont("resources/fonts/alagard.rbmf"); // SpriteFont loading + SpriteFont font2 = LoadSpriteFont("resources/fonts/pixelplay.rbmf"); // SpriteFont loading + SpriteFont font3 = LoadSpriteFont("resources/fonts/mecha.rbmf"); // SpriteFont loading + SpriteFont font4 = LoadSpriteFont("resources/fonts/setback.rbmf"); // SpriteFont loading + SpriteFont font5 = LoadSpriteFont("resources/fonts/romulus.rbmf"); // SpriteFont loading + SpriteFont font6 = LoadSpriteFont("resources/fonts/pixantiqua.rbmf"); // SpriteFont loading + SpriteFont font7 = LoadSpriteFont("resources/fonts/alpha_beta.rbmf"); // SpriteFont loading + SpriteFont font8 = LoadSpriteFont("resources/fonts/jupiter_crash.rbmf"); // SpriteFont loading //-------------------------------------------------------------------------------------- // Main game loop @@ -38,20 +45,31 @@ int main() ClearBackground(RAYWHITE); - // TODO: Comming soon... - // TIP: Use DrawTextEx() function -/* -void DrawTextEx(SpriteFont spriteFont, const char* text, Vector2 position, int fontSize, int spacing, Color tint); -*/ + DrawTextEx(font1, "TESTING ALAGARD FONT", (Vector2){ 100, 100 }, GetFontBaseSize(font1)*2, 2, MAROON); + DrawTextEx(font2, "TESTING PIXELPLAY FONT", (Vector2){ 100, 180 }, GetFontBaseSize(font2)*2, 4, ORANGE); + DrawTextEx(font3, "TESTING MECHA FONT", (Vector2){ 100, 260 }, GetFontBaseSize(font3)*2, 8, DARKGREEN); + DrawTextEx(font4, "TESTING SETBACK FONT", (Vector2){ 100, 350 }, GetFontBaseSize(font4)*2, 4, DARKBLUE); + DrawTextEx(font5, "TESTING ROMULUS FONT", (Vector2){ 100, 430 }, GetFontBaseSize(font5)*2, 3, DARKPURPLE); + DrawTextEx(font6, "TESTING PIXANTIQUA FONT", (Vector2){ 100, 510 }, GetFontBaseSize(font6)*2, 4, LIME); + DrawTextEx(font7, "TESTING ALPHA_BETA FONT", (Vector2){ 100, 590 }, GetFontBaseSize(font7)*2, 4, GOLD); + DrawTextEx(font8, "TESTING JUPITER_CRASH FONT", (Vector2){ 100, 660 }, GetFontBaseSize(font8)*2, 1, RED); + EndDrawing(); //---------------------------------------------------------------------------------- } // De-Initialization //-------------------------------------------------------------------------------------- - UnloadSpriteFont(font); // SpriteFont unloading + UnloadSpriteFont(font1); // SpriteFont unloading + UnloadSpriteFont(font2); // SpriteFont unloading + UnloadSpriteFont(font3); // SpriteFont unloading + UnloadSpriteFont(font4); // SpriteFont unloading + UnloadSpriteFont(font5); // SpriteFont unloading + UnloadSpriteFont(font6); // SpriteFont unloading + UnloadSpriteFont(font7); // SpriteFont unloading + UnloadSpriteFont(font8); // SpriteFont unloading - CloseWindow(); // Close window and OpenGL context + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- return 0; diff --git a/examples/ex05b_rbmf_fonts.exe b/examples/ex05b_rbmf_fonts.exe new file mode 100644 index 00000000..c3b21f29 Binary files /dev/null and b/examples/ex05b_rbmf_fonts.exe differ diff --git a/examples/ex05b_rbmf_fonts.png b/examples/ex05b_rbmf_fonts.png index f18ae044..58f6d83f 100644 Binary files a/examples/ex05b_rbmf_fonts.png and b/examples/ex05b_rbmf_fonts.png differ diff --git a/examples/ex08_audio.c b/examples/ex08_audio.c index 5d1d365d..5849b84e 100644 --- a/examples/ex08_audio.c +++ b/examples/ex08_audio.c @@ -24,7 +24,7 @@ int main() InitAudioDevice(); // Initialize audio device - Sound fx = LoadSound("resources/weird.wav"); // Load WAV audio file + Sound fx = LoadSound("resources/audio/weird.wav"); // Load WAV audio file //-------------------------------------------------------------------------------------- // Main game loop diff --git a/examples/resources/audio/coin.wav b/examples/resources/audio/coin.wav new file mode 100644 index 00000000..6007509b Binary files /dev/null and b/examples/resources/audio/coin.wav differ diff --git a/examples/resources/audio/spring.wav b/examples/resources/audio/spring.wav new file mode 100644 index 00000000..c7fbf1b9 Binary files /dev/null and b/examples/resources/audio/spring.wav differ diff --git a/examples/resources/audio/weird.wav b/examples/resources/audio/weird.wav new file mode 100644 index 00000000..101029c5 Binary files /dev/null and b/examples/resources/audio/weird.wav differ diff --git a/examples/resources/coin.wav b/examples/resources/coin.wav deleted file mode 100644 index 6007509b..00000000 Binary files a/examples/resources/coin.wav and /dev/null differ diff --git a/examples/resources/fonts/alagard.rbmf b/examples/resources/fonts/alagard.rbmf new file mode 100644 index 00000000..8c9b68d3 Binary files /dev/null and b/examples/resources/fonts/alagard.rbmf differ diff --git a/examples/resources/fonts/alpha_beta.rbmf b/examples/resources/fonts/alpha_beta.rbmf new file mode 100644 index 00000000..bdb2e752 Binary files /dev/null and b/examples/resources/fonts/alpha_beta.rbmf differ diff --git a/examples/resources/fonts/custom_alagard.png b/examples/resources/fonts/custom_alagard.png new file mode 100644 index 00000000..c3eb63b7 Binary files /dev/null and b/examples/resources/fonts/custom_alagard.png differ diff --git a/examples/resources/fonts/custom_jupiter_crash.png b/examples/resources/fonts/custom_jupiter_crash.png new file mode 100644 index 00000000..451b591f Binary files /dev/null and b/examples/resources/fonts/custom_jupiter_crash.png differ diff --git a/examples/resources/fonts/custom_mecha.png b/examples/resources/fonts/custom_mecha.png new file mode 100644 index 00000000..59caab2c Binary files /dev/null and b/examples/resources/fonts/custom_mecha.png differ diff --git a/examples/resources/fonts/jupiter_crash.rbmf b/examples/resources/fonts/jupiter_crash.rbmf new file mode 100644 index 00000000..d797e0d6 Binary files /dev/null and b/examples/resources/fonts/jupiter_crash.rbmf differ diff --git a/examples/resources/fonts/mecha.rbmf b/examples/resources/fonts/mecha.rbmf new file mode 100644 index 00000000..0266a065 Binary files /dev/null and b/examples/resources/fonts/mecha.rbmf differ diff --git a/examples/resources/fonts/pixantiqua.rbmf b/examples/resources/fonts/pixantiqua.rbmf new file mode 100644 index 00000000..04ef0e25 Binary files /dev/null and b/examples/resources/fonts/pixantiqua.rbmf differ diff --git a/examples/resources/fonts/pixelplay.rbmf b/examples/resources/fonts/pixelplay.rbmf new file mode 100644 index 00000000..31d14038 Binary files /dev/null and b/examples/resources/fonts/pixelplay.rbmf differ diff --git a/examples/resources/fonts/romulus.rbmf b/examples/resources/fonts/romulus.rbmf new file mode 100644 index 00000000..be9da01a Binary files /dev/null and b/examples/resources/fonts/romulus.rbmf differ diff --git a/examples/resources/fonts/setback.rbmf b/examples/resources/fonts/setback.rbmf new file mode 100644 index 00000000..09572215 Binary files /dev/null and b/examples/resources/fonts/setback.rbmf differ diff --git a/examples/resources/mouse.png b/examples/resources/mouse.png new file mode 100644 index 00000000..543f32b3 Binary files /dev/null and b/examples/resources/mouse.png differ diff --git a/examples/resources/spring.wav b/examples/resources/spring.wav deleted file mode 100644 index c7fbf1b9..00000000 Binary files a/examples/resources/spring.wav and /dev/null differ diff --git a/examples/resources/weird.wav b/examples/resources/weird.wav deleted file mode 100644 index 101029c5..00000000 Binary files a/examples/resources/weird.wav and /dev/null differ -- cgit v1.2.3