Update to version 1.0.3

View CHANGELOG for full list of changes

22 files changed, 60 insertions, 23 deletions

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
--- /dev/null
+++ b/examples/ex05a_sprite_fonts.exe
diff --git a/examples/ex05a_sprite_fonts.png b/examples/ex05a_sprite_fonts.png
index f18ae044..1bd4aa03 100644
--- a/examples/ex05a_sprite_fonts.png
+++ b/examples/ex05a_sprite_fonts.png
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
--- /dev/null
+++ b/examples/ex05b_rbmf_fonts.exe
diff --git a/examples/ex05b_rbmf_fonts.png b/examples/ex05b_rbmf_fonts.png
index f18ae044..58f6d83f 100644
--- a/examples/ex05b_rbmf_fonts.png
+++ b/examples/ex05b_rbmf_fonts.png
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/coin.wav b/examples/resources/audio/coin.wav
index 6007509b..6007509b 100644
--- a/examples/resources/coin.wav
+++ b/examples/resources/audio/coin.wav
diff --git a/examples/resources/spring.wav b/examples/resources/audio/spring.wav
index c7fbf1b9..c7fbf1b9 100644
--- a/examples/resources/spring.wav
+++ b/examples/resources/audio/spring.wav
diff --git a/examples/resources/weird.wav b/examples/resources/audio/weird.wav
index 101029c5..101029c5 100644
--- a/examples/resources/weird.wav
+++ b/examples/resources/audio/weird.wav
diff --git a/examples/resources/fonts/alagard.rbmf b/examples/resources/fonts/alagard.rbmf
new file mode 100644
index 00000000..8c9b68d3
--- /dev/null
+++ b/examples/resources/fonts/alagard.rbmf
diff --git a/examples/resources/fonts/alpha_beta.rbmf b/examples/resources/fonts/alpha_beta.rbmf
new file mode 100644
index 00000000..bdb2e752
--- /dev/null
+++ b/examples/resources/fonts/alpha_beta.rbmf
diff --git a/examples/resources/fonts/custom_alagard.png b/examples/resources/fonts/custom_alagard.png
new file mode 100644
index 00000000..c3eb63b7
--- /dev/null
+++ b/examples/resources/fonts/custom_alagard.png
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
--- /dev/null
+++ b/examples/resources/fonts/custom_jupiter_crash.png
diff --git a/examples/resources/fonts/custom_mecha.png b/examples/resources/fonts/custom_mecha.png
new file mode 100644
index 00000000..59caab2c
--- /dev/null
+++ b/examples/resources/fonts/custom_mecha.png
diff --git a/examples/resources/fonts/jupiter_crash.rbmf b/examples/resources/fonts/jupiter_crash.rbmf
new file mode 100644
index 00000000..d797e0d6
--- /dev/null
+++ b/examples/resources/fonts/jupiter_crash.rbmf
diff --git a/examples/resources/fonts/mecha.rbmf b/examples/resources/fonts/mecha.rbmf
new file mode 100644
index 00000000..0266a065
--- /dev/null
+++ b/examples/resources/fonts/mecha.rbmf
diff --git a/examples/resources/fonts/pixantiqua.rbmf b/examples/resources/fonts/pixantiqua.rbmf
new file mode 100644
index 00000000..04ef0e25
--- /dev/null
+++ b/examples/resources/fonts/pixantiqua.rbmf
diff --git a/examples/resources/fonts/pixelplay.rbmf b/examples/resources/fonts/pixelplay.rbmf
new file mode 100644
index 00000000..31d14038
--- /dev/null
+++ b/examples/resources/fonts/pixelplay.rbmf
diff --git a/examples/resources/fonts/romulus.rbmf b/examples/resources/fonts/romulus.rbmf
new file mode 100644
index 00000000..be9da01a
--- /dev/null
+++ b/examples/resources/fonts/romulus.rbmf
diff --git a/examples/resources/fonts/setback.rbmf b/examples/resources/fonts/setback.rbmf
new file mode 100644
index 00000000..09572215
--- /dev/null
+++ b/examples/resources/fonts/setback.rbmf
diff --git a/examples/resources/mouse.png b/examples/resources/mouse.png
new file mode 100644
index 00000000..543f32b3
--- /dev/null
+++ b/examples/resources/mouse.png