diff options
| author | Ray <raysan5@gmail.com> | 2016-07-15 19:44:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-15 19:44:18 +0200 |
| commit | a2794379a0e1e2ab1486888aaa710f65d492e0fc (patch) | |
| tree | acd8185cf8574ccba8fab46ccdbca30f9a3cd895 /src/shapes.c | |
| parent | 1c98e6b698b8002e0c6c769c6d9f23a6e15f3bdf (diff) | |
| parent | fc19e24eba4358b3afb052f80425af4947b172d6 (diff) | |
| download | raylib-a2794379a0e1e2ab1486888aaa710f65d492e0fc.tar.gz raylib-a2794379a0e1e2ab1486888aaa710f65d492e0fc.zip | |
Merge pull request #132 from raysan5/develop
Develop branch integration
Diffstat (limited to 'src/shapes.c')
| -rw-r--r-- | src/shapes.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/shapes.c b/src/shapes.c index 7129ac17..2a4e19c2 100644 --- a/src/shapes.c +++ b/src/shapes.c @@ -44,7 +44,7 @@ //---------------------------------------------------------------------------------- // Global Variables Definition //---------------------------------------------------------------------------------- -extern unsigned int whiteTexture; +// ... //---------------------------------------------------------------------------------- // Module specific Functions Declaration @@ -135,9 +135,9 @@ void DrawCircleV(Vector2 center, float radius, Color color) } rlEnd(); } - else if ((rlGetVersion() == OPENGL_33) || (rlGetVersion() == OPENGL_ES_20)) + else if ((rlGetVersion() == OPENGL_21) || (rlGetVersion() == OPENGL_33) || (rlGetVersion() == OPENGL_ES_20)) { - rlEnableTexture(whiteTexture); // Default white texture + rlEnableTexture(GetDefaultTexture().id); // Default white texture rlBegin(RL_QUADS); for (int i = 0; i < 360; i += 20) @@ -218,9 +218,9 @@ void DrawRectangleV(Vector2 position, Vector2 size, Color color) rlVertex2i(position.x + size.x, position.y); rlEnd(); } - else if ((rlGetVersion() == OPENGL_33) || (rlGetVersion() == OPENGL_ES_20)) + else if ((rlGetVersion() == OPENGL_21) || (rlGetVersion() == OPENGL_33) || (rlGetVersion() == OPENGL_ES_20)) { - rlEnableTexture(whiteTexture); // Default white texture + rlEnableTexture(GetDefaultTexture().id); // Default white texture rlBegin(RL_QUADS); rlColor4ub(color.r, color.g, color.b, color.a); @@ -264,7 +264,7 @@ void DrawRectangleLines(int posX, int posY, int width, int height, Color color) rlVertex2i(posX + 1, posY + 1); rlEnd(); } - else if ((rlGetVersion() == OPENGL_33) || (rlGetVersion() == OPENGL_ES_20)) + else if ((rlGetVersion() == OPENGL_21) || (rlGetVersion() == OPENGL_33) || (rlGetVersion() == OPENGL_ES_20)) { DrawRectangle(posX, posY, width, 1, color); DrawRectangle(posX + width - 1, posY + 1, 1, height - 2, color); |