diff --git a/release/win32-mingw/lib/libraylib.a b/release/win32-mingw/lib/libraylib.a index 3f56d8a6..e24e8308 100644 Binary files a/release/win32-mingw/lib/libraylib.a and b/release/win32-mingw/lib/libraylib.a differ diff --git a/src/audio.c b/src/audio.c index 2066b370..2866de49 100644 --- a/src/audio.c +++ b/src/audio.c @@ -371,7 +371,7 @@ void PlaySound(Sound sound) { alSourcePlay(sound.source); // Play the sound - TraceLog(INFO, "Playing sound"); + //TraceLog(INFO, "Playing sound"); // Find the current position of the sound being played // NOTE: Only work when the entire file is in a single buffer diff --git a/src/core.c b/src/core.c index 4e323db9..1fdf5441 100644 --- a/src/core.c +++ b/src/core.c @@ -882,7 +882,7 @@ static void LogoAnimation() DrawRectangle(windowWidth/2 - 112, windowHeight/2 - 112, 224, 224, Fade(RAYWHITE, alpha)); - DrawText(raylib, 356, 273, 50, Fade(BLACK, alpha)); + DrawText(raylib, windowWidth/2 - 44, windowHeight/2 + 48, 50, Fade(BLACK, alpha)); } EndDrawing(); diff --git a/src/rlgl.h b/src/rlgl.h index 6ec54331..ee5f742c 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -40,7 +40,7 @@ // Select desired OpenGL version //#define USE_OPENGL_11 -#define USE_OPENGL_33 +//#define USE_OPENGL_33 //#define USE_OPENGL_ES2 //---------------------------------------------------------------------------------- diff --git a/src/shapes.c b/src/shapes.c index ad02de17..7d4c0d04 100644 --- a/src/shapes.c +++ b/src/shapes.c @@ -31,6 +31,11 @@ #include "rlgl.h" // raylib OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 +// Security check in case no USE_OPENGL_* defined +#if !defined(USE_OPENGL_11) && !defined(USE_OPENGL_33) && !defined(USE_OPENGL_ES2) + #define USE_OPENGL_11 +#endif + //---------------------------------------------------------------------------------- // Defines and Macros //---------------------------------------------------------------------------------- @@ -180,7 +185,7 @@ void DrawRectangleGradient(int posX, int posY, int width, int height, Color colo // Draw a color-filled rectangle (Vector version) void DrawRectangleV(Vector2 position, Vector2 size, Color color) { -/* +#ifdef USE_OPENGL_11 rlBegin(RL_TRIANGLES); rlColor4ub(color.r, color.g, color.b, color.a); @@ -192,10 +197,10 @@ void DrawRectangleV(Vector2 position, Vector2 size, Color color) rlVertex2i(position.x + size.x, position.y + size.y); rlVertex2i(position.x + size.x, position.y); rlEnd(); -*/ +#endif +#if defined(USE_OPENGL_33) || defined(USE_OPENGL_ES2) // NOTE: This shape uses QUADS to avoid drawing order issues (view rlglDraw) - rlEnableTexture(1); // Default white texture rlBegin(RL_QUADS); @@ -216,6 +221,7 @@ void DrawRectangleV(Vector2 position, Vector2 size, Color color) rlEnd(); rlDisableTexture(); +#endif } // Draw rectangle outline @@ -223,17 +229,17 @@ void DrawRectangleLines(int posX, int posY, int width, int height, Color color) { rlBegin(RL_LINES); rlColor4ub(color.r, color.g, color.b, color.a); - rlVertex2i(posX, posY); - rlVertex2i(posX + width - 1, posY); + rlVertex2i(posX + 1, posY + 1); + rlVertex2i(posX + width, posY + 1); - rlVertex2i(posX + width - 1, posY); - rlVertex2i(posX + width - 1, posY + height - 1); + rlVertex2i(posX + width, posY + 1); + rlVertex2i(posX + width, posY + height); - rlVertex2i(posX + width - 1, posY + height - 1); - rlVertex2i(posX, posY + height - 1); + rlVertex2i(posX + width, posY + height); + rlVertex2i(posX + 1, posY + height); - rlVertex2i(posX, posY + height - 1); - rlVertex2i(posX, posY); + rlVertex2i(posX + 1, posY + height); + rlVertex2i(posX + 1, posY + 1); rlEnd(); } diff --git a/src/textures.c b/src/textures.c index 4bd6378d..2bbf8e61 100644 --- a/src/textures.c +++ b/src/textures.c @@ -35,6 +35,11 @@ #include "rlgl.h" // raylib OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 +// Security check in case no USE_OPENGL_* defined +#if !defined(USE_OPENGL_11) && !defined(USE_OPENGL_33) && !defined(USE_OPENGL_ES2) + #define USE_OPENGL_11 +#endif + //---------------------------------------------------------------------------------- // Defines and Macros //---------------------------------------------------------------------------------- @@ -297,7 +302,7 @@ Texture2D LoadTexture(const char *fileName) } else { -#ifdef USE_OPENGL_33 +#if defined(USE_OPENGL_33) || defined(USE_OPENGL_ES2) texture.id = rlglLoadCompressedTexture(image.data, image.width, image.height, image.mipmaps, image.compFormat); #endif }