summaryrefslogtreecommitdiffhomepage
path: root/examples/text
diff options
context:
space:
mode:
authorraysan5 <[email protected]>2017-04-16 19:08:19 +0200
committerraysan5 <[email protected]>2017-04-16 19:08:19 +0200
commitb4d28cc7a1a0d9f5ce0c556535c612e67215bd18 (patch)
tree51ad480c49cddf96a966c24695d9af55ee8b1995 /examples/text
parentc67cffea38637f20dc733fec1986111b69a11119 (diff)
downloadraylib-b4d28cc7a1a0d9f5ce0c556535c612e67215bd18.tar.gz
raylib-b4d28cc7a1a0d9f5ce0c556535c612e67215bd18.zip
Working on examples...
- Removed rbmf font example - Reviewed physac examples
Diffstat (limited to 'examples/text')
-rw-r--r--examples/text/resources/fonts/alagard.pngbin0 -> 4424 bytes
-rw-r--r--examples/text/resources/fonts/alagard.rbmfbin2159 -> 0 bytes
-rw-r--r--examples/text/resources/fonts/alpha_beta.pngbin0 -> 2442 bytes
-rw-r--r--examples/text/resources/fonts/alpha_beta.rbmfbin2160 -> 0 bytes
-rw-r--r--examples/text/resources/fonts/jupiter_crash.pngbin0 -> 3478 bytes
-rw-r--r--examples/text/resources/fonts/jupiter_crash.rbmfbin2160 -> 0 bytes
-rw-r--r--examples/text/resources/fonts/mecha.pngbin0 -> 2399 bytes
-rw-r--r--examples/text/resources/fonts/mecha.rbmfbin2160 -> 0 bytes
-rw-r--r--examples/text/resources/fonts/pixantiqua.pngbin0 -> 3003 bytes
-rw-r--r--examples/text/resources/fonts/pixantiqua.rbmfbin2160 -> 0 bytes
-rw-r--r--examples/text/resources/fonts/pixelplay.pngbin0 -> 2912 bytes
-rw-r--r--examples/text/resources/fonts/pixelplay.rbmfbin2160 -> 0 bytes
-rw-r--r--examples/text/resources/fonts/romulus.pngbin0 -> 2932 bytes
-rw-r--r--examples/text/resources/fonts/romulus.rbmfbin2160 -> 0 bytes
-rw-r--r--examples/text/resources/fonts/setback.pngbin0 -> 2539 bytes
-rw-r--r--examples/text/resources/fonts/setback.rbmfbin2160 -> 0 bytes
-rw-r--r--examples/text/resources/pixantiqua.fnt (renamed from examples/text/resources/fonts/pixantiqua.fnt)0
-rw-r--r--examples/text/text_raylib_fonts.c (renamed from examples/text/text_rbmf_fonts.c)49
-rw-r--r--examples/text/text_raylib_fonts.pngbin0 -> 20204 bytes
-rw-r--r--examples/text/text_rbmf_fonts.pngbin19458 -> 0 bytes
20 files changed, 28 insertions, 21 deletions
diff --git a/examples/text/resources/fonts/alagard.png b/examples/text/resources/fonts/alagard.png
new file mode 100644
index 00000000..3ac4bf1c
--- /dev/null
+++ b/examples/text/resources/fonts/alagard.png
Binary files differ
diff --git a/examples/text/resources/fonts/alagard.rbmf b/examples/text/resources/fonts/alagard.rbmf
deleted file mode 100644
index 8c9b68d3..00000000
--- a/examples/text/resources/fonts/alagard.rbmf
+++ /dev/null
Binary files differ
diff --git a/examples/text/resources/fonts/alpha_beta.png b/examples/text/resources/fonts/alpha_beta.png
new file mode 100644
index 00000000..c362bfb1
--- /dev/null
+++ b/examples/text/resources/fonts/alpha_beta.png
Binary files differ
diff --git a/examples/text/resources/fonts/alpha_beta.rbmf b/examples/text/resources/fonts/alpha_beta.rbmf
deleted file mode 100644
index bdb2e752..00000000
--- a/examples/text/resources/fonts/alpha_beta.rbmf
+++ /dev/null
Binary files differ
diff --git a/examples/text/resources/fonts/jupiter_crash.png b/examples/text/resources/fonts/jupiter_crash.png
new file mode 100644
index 00000000..1f5172fb
--- /dev/null
+++ b/examples/text/resources/fonts/jupiter_crash.png
Binary files differ
diff --git a/examples/text/resources/fonts/jupiter_crash.rbmf b/examples/text/resources/fonts/jupiter_crash.rbmf
deleted file mode 100644
index d797e0d6..00000000
--- a/examples/text/resources/fonts/jupiter_crash.rbmf
+++ /dev/null
Binary files differ
diff --git a/examples/text/resources/fonts/mecha.png b/examples/text/resources/fonts/mecha.png
new file mode 100644
index 00000000..8022d18c
--- /dev/null
+++ b/examples/text/resources/fonts/mecha.png
Binary files differ
diff --git a/examples/text/resources/fonts/mecha.rbmf b/examples/text/resources/fonts/mecha.rbmf
deleted file mode 100644
index 0266a065..00000000
--- a/examples/text/resources/fonts/mecha.rbmf
+++ /dev/null
Binary files differ
diff --git a/examples/text/resources/fonts/pixantiqua.png b/examples/text/resources/fonts/pixantiqua.png
new file mode 100644
index 00000000..ce422e7e
--- /dev/null
+++ b/examples/text/resources/fonts/pixantiqua.png
Binary files differ
diff --git a/examples/text/resources/fonts/pixantiqua.rbmf b/examples/text/resources/fonts/pixantiqua.rbmf
deleted file mode 100644
index 04ef0e25..00000000
--- a/examples/text/resources/fonts/pixantiqua.rbmf
+++ /dev/null
Binary files differ
diff --git a/examples/text/resources/fonts/pixelplay.png b/examples/text/resources/fonts/pixelplay.png
new file mode 100644
index 00000000..bf8f8818
--- /dev/null
+++ b/examples/text/resources/fonts/pixelplay.png
Binary files differ
diff --git a/examples/text/resources/fonts/pixelplay.rbmf b/examples/text/resources/fonts/pixelplay.rbmf
deleted file mode 100644
index 31d14038..00000000
--- a/examples/text/resources/fonts/pixelplay.rbmf
+++ /dev/null
Binary files differ
diff --git a/examples/text/resources/fonts/romulus.png b/examples/text/resources/fonts/romulus.png
new file mode 100644
index 00000000..46ccc327
--- /dev/null
+++ b/examples/text/resources/fonts/romulus.png
Binary files differ
diff --git a/examples/text/resources/fonts/romulus.rbmf b/examples/text/resources/fonts/romulus.rbmf
deleted file mode 100644
index be9da01a..00000000
--- a/examples/text/resources/fonts/romulus.rbmf
+++ /dev/null
Binary files differ
diff --git a/examples/text/resources/fonts/setback.png b/examples/text/resources/fonts/setback.png
new file mode 100644
index 00000000..086f3e27
--- /dev/null
+++ b/examples/text/resources/fonts/setback.png
Binary files differ
diff --git a/examples/text/resources/fonts/setback.rbmf b/examples/text/resources/fonts/setback.rbmf
deleted file mode 100644
index 09572215..00000000
--- a/examples/text/resources/fonts/setback.rbmf
+++ /dev/null
Binary files differ
diff --git a/examples/text/resources/fonts/pixantiqua.fnt b/examples/text/resources/pixantiqua.fnt
index 971b9b0b..971b9b0b 100644
--- a/examples/text/resources/fonts/pixantiqua.fnt
+++ b/examples/text/resources/pixantiqua.fnt
diff --git a/examples/text/text_rbmf_fonts.c b/examples/text/text_raylib_fonts.c
index f4778b45..6d8ef2b6 100644
--- a/examples/text/text_rbmf_fonts.c
+++ b/examples/text/text_raylib_fonts.c
@@ -1,19 +1,21 @@
/*******************************************************************************************
*
-* raylib [text] example - raylib bitmap font (rbmf) loading and usage
+* raylib [text] example - raylib font loading and usage
*
* NOTE: raylib is distributed with some free to use fonts (even for commercial pourposes!)
* To view details and credits for those fonts, check raylib license file
*
-* This example has been created using raylib 1.3 (www.raylib.com)
+* This example has been created using raylib 1.7 (www.raylib.com)
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
*
-* Copyright (c) 2015 Ramon Santamaria (@raysan5)
+* Copyright (c) 2017 Ramon Santamaria (@raysan5)
*
********************************************************************************************/
#include "raylib.h"
+#define MAX_FONTS 8
+
int main()
{
// Initialization
@@ -21,21 +23,21 @@ int main()
int screenWidth = 800;
int screenHeight = 450;
- InitWindow(screenWidth, screenHeight, "raylib [text] example - rBMF fonts");
+ InitWindow(screenWidth, screenHeight, "raylib [text] example - raylib fonts");
// NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required)
- SpriteFont fonts[8];
+ SpriteFont fonts[MAX_FONTS];
- fonts[0] = LoadSpriteFont("resources/fonts/alagard.rbmf"); // rBMF font loading
- fonts[1] = LoadSpriteFont("resources/fonts/pixelplay.rbmf"); // rBMF font loading
- fonts[2] = LoadSpriteFont("resources/fonts/mecha.rbmf"); // rBMF font loading
- fonts[3] = LoadSpriteFont("resources/fonts/setback.rbmf"); // rBMF font loading
- fonts[4] = LoadSpriteFont("resources/fonts/romulus.rbmf"); // rBMF font loading
- fonts[5] = LoadSpriteFont("resources/fonts/pixantiqua.rbmf"); // rBMF font loading
- fonts[6] = LoadSpriteFont("resources/fonts/alpha_beta.rbmf"); // rBMF font loading
- fonts[7] = LoadSpriteFont("resources/fonts/jupiter_crash.rbmf"); // rBMF font loading
+ fonts[0] = LoadSpriteFont("resources/fonts/alagard.png");
+ fonts[1] = LoadSpriteFont("resources/fonts/pixelplay.png");
+ fonts[2] = LoadSpriteFont("resources/fonts/mecha.png");
+ fonts[3] = LoadSpriteFont("resources/fonts/setback.png");
+ fonts[4] = LoadSpriteFont("resources/fonts/romulus.png");
+ fonts[5] = LoadSpriteFont("resources/fonts/pixantiqua.png");
+ fonts[6] = LoadSpriteFont("resources/fonts/alpha_beta.png");
+ fonts[7] = LoadSpriteFont("resources/fonts/jupiter_crash.png");
- const char *messages[8] = { "ALAGARD FONT designed by Hewett Tsoi",
+ const char *messages[MAX_FONTS] = { "ALAGARD FONT designed by Hewett Tsoi",
"PIXELPLAY FONT designed by Aleksander Shevchuk",
"MECHA FONT designed by Captain Falcon",
"SETBACK FONT designed by Brian Kent (AEnigma)",
@@ -44,17 +46,22 @@ int main()
"ALPHA_BETA FONT designed by Brian Kent (AEnigma)",
"JUPITER_CRASH FONT designed by Brian Kent (AEnigma)" };
- const int spacings[8] = { 2, 4, 8, 4, 3, 4, 4, 1 };
+ const int spacings[MAX_FONTS] = { 2, 4, 8, 4, 3, 4, 4, 1 };
- Vector2 positions[8];
+ Vector2 positions[MAX_FONTS];
- for (int i = 0; i < 8; i++)
+ for (int i = 0; i < MAX_FONTS; i++)
{
positions[i].x = screenWidth/2 - MeasureTextEx(fonts[i], messages[i], fonts[i].baseSize*2, spacings[i]).x/2;
- positions[i].y = 60 + fonts[i].baseSize + 50*i;
+ positions[i].y = 60 + fonts[i].baseSize + 45*i;
}
- Color colors[8] = { MAROON, ORANGE, DARKGREEN, DARKBLUE, DARKPURPLE, LIME, GOLD };
+ // Small Y position corrections
+ positions[3].y += 8;
+ positions[4].y += 2;
+ positions[7].y -= 8;
+
+ Color colors[MAX_FONTS] = { MAROON, ORANGE, DARKGREEN, DARKBLUE, DARKPURPLE, LIME, GOLD, RED };
//--------------------------------------------------------------------------------------
// Main game loop
@@ -74,7 +81,7 @@ int main()
DrawText("free fonts included with raylib", 250, 20, 20, DARKGRAY);
DrawLine(220, 50, 590, 50, DARKGRAY);
- for (int i = 0; i < 8; i++)
+ for (int i = 0; i < MAX_FONTS; i++)
{
DrawTextEx(fonts[i], messages[i], positions[i], fonts[i].baseSize*2, spacings[i], colors[i]);
}
@@ -87,7 +94,7 @@ int main()
//--------------------------------------------------------------------------------------
// SpriteFonts unloading
- for (int i = 0; i < 8; i++) UnloadSpriteFont(fonts[i]);
+ for (int i = 0; i < MAX_FONTS; i++) UnloadSpriteFont(fonts[i]);
CloseWindow(); // Close window and OpenGL context
//--------------------------------------------------------------------------------------
diff --git a/examples/text/text_raylib_fonts.png b/examples/text/text_raylib_fonts.png
new file mode 100644
index 00000000..8f428a67
--- /dev/null
+++ b/examples/text/text_raylib_fonts.png
Binary files differ
diff --git a/examples/text/text_rbmf_fonts.png b/examples/text/text_rbmf_fonts.png
deleted file mode 100644
index c047c503..00000000
--- a/examples/text/text_rbmf_fonts.png
+++ /dev/null
Binary files differ