diff options
| author | Ray <raysan5@gmail.com> | 2016-07-18 17:09:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 17:09:23 +0200 |
| commit | eaec086177e2386b4894be6a4fd3b7467471616b (patch) | |
| tree | 13ffbb1691b3de67421a93d266c9ceea124a9e20 /src/shapes.c | |
| parent | a2794379a0e1e2ab1486888aaa710f65d492e0fc (diff) | |
| parent | bec58075ff42e71a7ed197a5c67e1aa4641b8a9a (diff) | |
| download | raylib-eaec086177e2386b4894be6a4fd3b7467471616b.tar.gz raylib-eaec086177e2386b4894be6a4fd3b7467471616b.zip | |
Merge pull request #135 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'src/shapes.c')
| -rw-r--r-- | src/shapes.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/src/shapes.c b/src/shapes.c index 2a4e19c2..d9b172f1 100644 --- a/src/shapes.c +++ b/src/shapes.c @@ -276,12 +276,29 @@ void DrawRectangleLines(int posX, int posY, int width, int height, Color color) // Draw a triangle void DrawTriangle(Vector2 v1, Vector2 v2, Vector2 v3, Color color) { - rlBegin(RL_TRIANGLES); - rlColor4ub(color.r, color.g, color.b, color.a); - rlVertex2f(v1.x, v1.y); - rlVertex2f(v2.x, v2.y); - rlVertex2f(v3.x, v3.y); - rlEnd(); + if (rlGetVersion() == OPENGL_11) + { + rlBegin(RL_TRIANGLES); + rlColor4ub(color.r, color.g, color.b, color.a); + rlVertex2f(v1.x, v1.y); + rlVertex2f(v2.x, v2.y); + rlVertex2f(v3.x, v3.y); + rlEnd(); + } + else if ((rlGetVersion() == OPENGL_21) || (rlGetVersion() == OPENGL_33) || (rlGetVersion() == OPENGL_ES_20)) + { + rlEnableTexture(GetDefaultTexture().id); // Default white texture + + rlBegin(RL_QUADS); + rlColor4ub(color.r, color.g, color.b, color.a); + rlVertex2f(v1.x, v1.y); + rlVertex2f(v2.x, v2.y); + rlVertex2f(v2.x, v2.y); + rlVertex2f(v3.x, v3.y); + rlEnd(); + + rlDisableTexture(); + } } void DrawTriangleLines(Vector2 v1, Vector2 v2, Vector2 v3, Color color) |
