From 9d27bba23f08e7749fd98c8b56b5fe34786926fd Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 17 Oct 2014 21:11:58 +0200 Subject: [PATCH] Small Fixes Update (1.2.1) View CHANGELOG for description on small fixes and add-ons --- CHANGELOG | 10 +++++++++- release/win32-mingw/include/raylib.h | 14 ++++++++++++++ release/win32-mingw/lib/libraylib.a | Bin 247866 -> 248132 bytes src/core.c | 25 ++++++++++++++++++------- src/makefile | 2 +- src/models.c | 4 +++- src/raylib.h | 14 ++++++++++++++ src/rlgl.c | 2 +- src/rlgl.h | 5 ----- src/text.c | 6 +++++- 10 files changed, 65 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a8dfae047..333600953 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,9 +3,17 @@ changelog Current Release: raylib 1.2 (16 September 2014) -NOTE: Only versions marked as 'Release' are available on release folder, updates are only available as source. +NOTE: Only versions marked as 'Release' are available in installer, updates are only available as source. NOTE: Current Release includes all previous updates. +--------------------------------------------------------------- +Update: raylib 1.2.1 (17 October 2014) (Small Fixes Update) +--------------------------------------------------------------- +[core] Added function SetupFlags() to preconfigure raylib Window +[core] Corrected bug on fullscreen mode +[rlgl] rlglDrawmodel() - Added rotation on Y axis +[text] MeasureTextEx() - Corrected bug on measures for default font + ----------------------------------------------- Release: raylib 1.2 (16 September 2014) ----------------------------------------------- diff --git a/release/win32-mingw/include/raylib.h b/release/win32-mingw/include/raylib.h index 4de67ba29..5257de58f 100644 --- a/release/win32-mingw/include/raylib.h +++ b/release/win32-mingw/include/raylib.h @@ -64,6 +64,11 @@ //#define PLATFORM_ANDROID // Android device //#define PLATFORM_RPI // Raspberry Pi +// Security check in case no PLATFORM_* defined +#if !defined(PLATFORM_DESKTOP) && !defined(PLATFORM_ANDROID) && !defined(PLATFORM_RPI) + #define PLATFORM_DESKTOP +#endif + #if defined(PLATFORM_ANDROID) #include // Defines android_app struct #endif @@ -78,6 +83,13 @@ #define DEG2RAD (PI / 180.0f) #define RAD2DEG (180.0f / PI) +// raylib Config Flags +#define FLAG_FULLSCREEN_MODE 1 +#define FLAG_SHOW_LOGO 2 +#define FLAG_SHOW_MOUSE_CURSOR 4 +#define FLAG_CENTERED_MODE 8 +#define FLAG_MSAA_4X_HINT 16 + // Keyboard Function Keys #define KEY_SPACE 32 #define KEY_ESCAPE 256 @@ -300,6 +312,8 @@ int GetHexValue(Color color); // Returns hexadecim int GetRandomValue(int min, int max); // Returns a random value between min and max (both included) Color Fade(Color color, float alpha); // Color fade-in or fade-out, alpha goes from 0.0f to 1.0f +void SetupFlags(char flags); // Enable some window configurations + void ShowLogo(void); // Activates raylib logo at startup //------------------------------------------------------------------------------------ diff --git a/release/win32-mingw/lib/libraylib.a b/release/win32-mingw/lib/libraylib.a index 6cca6a27406c9d61315b2c5f1c164d44e3763555..7c561f935e2b3f9591d6e38a5afcb4d54631c51e 100644 GIT binary patch delta 9920 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 YYqg;9YSymc$=I&o$+TU;lUb@B0O7}GOaK4? delta 9603 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 60 FPS) + //glfwSwapInterval(0); // Disables GPU v-sync (if set), so frames are not limited to screen refresh rate (60Hz -> 60 FPS) // If not set, swap interval uses GPU v-sync configuration // Framerate can be setup using SetTargetFPS() @@ -1144,11 +1155,11 @@ static void CursorEnterCallback(GLFWwindow *window, int enter) static void WindowSizeCallback(GLFWwindow *window, int width, int height) { // If window is resized, graphics device is re-initialized (but only ortho mode) - rlglInitGraphics(0, 0, width, height); + rlglInitGraphics(renderOffsetX, renderOffsetY, renderWidth, renderHeight); // Window size must be updated to be used on 3D mode to get new aspect ratio (Begin3dMode()) - screenWidth = width; - screenHeight = height; + //screenWidth = width; + //screenHeight = height; // TODO: Update render size? diff --git a/src/makefile b/src/makefile index 6f0179ab4..69e7862b0 100644 --- a/src/makefile +++ b/src/makefile @@ -33,7 +33,7 @@ ifeq ($(PLATFORM),PLATFORM_RPI) GRAPHICS = GRAPHICS_API_OPENGL_ES2 else # define raylib graphics api to use (on Windows desktop, OpenGL 1.1 by default) - GRAPHICS = GRAPHICS_API_OPENGL_11 + GRAPHICS ?= GRAPHICS_API_OPENGL_11 #GRAPHICS = GRAPHICS_API_OPENGL_33 # Uncomment to use OpenGL 3.3 endif diff --git a/src/models.c b/src/models.c index ab6abb554..d69322a80 100644 --- a/src/models.c +++ b/src/models.c @@ -448,7 +448,7 @@ void DrawCylinderWires(Vector3 position, float radiusTop, float radiusBottom, fl // Draw a plane void DrawPlane(Vector3 centerPos, Vector2 size, Vector3 rotation, Color color) { - // NOTE: QUADS usage require defining a texture + // NOTE: QUADS usage require defining a texture on OpenGL 3.3+ rlEnableTexture(1); // Default white texture // NOTE: Plane is always created on XZ ground and then rotated @@ -1145,6 +1145,7 @@ void DrawModelWires(Model model, Vector3 position, float scale, Color color) } // Draw a billboard +// TODO: Math review... void DrawBillboard(Camera camera, Texture2D texture, Vector3 center, float size, Color tint) { // NOTE: Billboard size will maintain texture aspect ratio, size will be billboard width @@ -1188,6 +1189,7 @@ void DrawBillboard(Camera camera, Texture2D texture, Vector3 center, float size, } // Draw a billboard (part of a texture defined by a rectangle) +// TODO: Math review... void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle sourceRec, Vector3 center, float size, Color tint) { // NOTE: Billboard size will maintain sourceRec aspect ratio, size will represent billboard width diff --git a/src/raylib.h b/src/raylib.h index 4de67ba29..5257de58f 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -64,6 +64,11 @@ //#define PLATFORM_ANDROID // Android device //#define PLATFORM_RPI // Raspberry Pi +// Security check in case no PLATFORM_* defined +#if !defined(PLATFORM_DESKTOP) && !defined(PLATFORM_ANDROID) && !defined(PLATFORM_RPI) + #define PLATFORM_DESKTOP +#endif + #if defined(PLATFORM_ANDROID) #include // Defines android_app struct #endif @@ -78,6 +83,13 @@ #define DEG2RAD (PI / 180.0f) #define RAD2DEG (180.0f / PI) +// raylib Config Flags +#define FLAG_FULLSCREEN_MODE 1 +#define FLAG_SHOW_LOGO 2 +#define FLAG_SHOW_MOUSE_CURSOR 4 +#define FLAG_CENTERED_MODE 8 +#define FLAG_MSAA_4X_HINT 16 + // Keyboard Function Keys #define KEY_SPACE 32 #define KEY_ESCAPE 256 @@ -300,6 +312,8 @@ int GetHexValue(Color color); // Returns hexadecim int GetRandomValue(int min, int max); // Returns a random value between min and max (both included) Color Fade(Color color, float alpha); // Color fade-in or fade-out, alpha goes from 0.0f to 1.0f +void SetupFlags(char flags); // Enable some window configurations + void ShowLogo(void); // Activates raylib logo at startup //------------------------------------------------------------------------------------ diff --git a/src/rlgl.c b/src/rlgl.c index 8f8d67e75..8f1a66a89 100644 --- a/src/rlgl.c +++ b/src/rlgl.c @@ -1092,7 +1092,7 @@ void rlglDrawModel(Model model, Vector3 position, Vector3 rotation, Vector3 scal rlPushMatrix(); rlTranslatef(position.x, position.y, position.z); rlScalef(scale.x, scale.y, scale.z); - //rlRotatef(rotation, 0, 1, 0); + rlRotatef(rotation.y, 0, 1, 0); // TODO: If rotate in multiple axis, get rotation matrix and use rlMultMatrix() diff --git a/src/rlgl.h b/src/rlgl.h index 7c8eb74b1..3e9cba0ef 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -52,11 +52,6 @@ #define GRAPHICS_API_OPENGL_11 #endif -// Security check in case no GRAPHICS_API_OPENGL_* defined -#if !defined(GRAPHICS_API_OPENGL_11) && !defined(GRAPHICS_API_OPENGL_33) && !defined(GRAPHICS_API_OPENGL_ES2) - #define GRAPHICS_API_OPENGL_11 -#endif - // Security check in case multiple GRAPHICS_API_OPENGL_* defined #if defined(GRAPHICS_API_OPENGL_11) #if defined(GRAPHICS_API_OPENGL_33) diff --git a/src/text.c b/src/text.c index b42d7d11e..3ca237b92 100644 --- a/src/text.c +++ b/src/text.c @@ -340,7 +340,11 @@ int MeasureText(const char *text, int fontSize) { Vector2 vec; - vec = MeasureTextEx(defaultFont, text, fontSize, 1); + int defaultFontSize = 10; // Default Font chars height in pixel + if (fontSize < defaultFontSize) fontSize = defaultFontSize; + int spacing = fontSize / defaultFontSize; + + vec = MeasureTextEx(defaultFont, text, fontSize, spacing); return (int)vec.x; }