diff options
| author | Ray <raysan5@gmail.com> | 2018-08-14 09:57:31 +0200 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2018-08-14 09:57:31 +0200 |
| commit | b88bfa7267a621dc15446e69b18faa062aa91d8e (patch) | |
| tree | a47c625a7aab8c4e8e5a549563a6fdc9a9838c7b /src | |
| parent | 20ff9dc66331ad490795371a49000b3000b248be (diff) | |
| download | raylib-b88bfa7267a621dc15446e69b18faa062aa91d8e.tar.gz raylib-b88bfa7267a621dc15446e69b18faa062aa91d8e.zip | |
Review PR formatting
Diffstat (limited to 'src')
| -rw-r--r-- | src/shapes.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/shapes.c b/src/shapes.c index acc0dc06..90f95826 100644 --- a/src/shapes.c +++ b/src/shapes.c @@ -646,11 +646,12 @@ bool CheckCollisionPointTriangle(Vector2 point, Vector2 p1, Vector2 p2, Vector2 // Check collision between two rectangles bool CheckCollisionRecs(Rectangle rec1, Rectangle rec2) { + bool collision = false; + if ((rec1.x <= (rec2.x + rec2.width) && (rec1.x + rec1.width) >= rec2.x) && - (rec1.y <= (rec2.y + rec2.height) && (rec1.y + rec1.height) >= rec2.y)) - return true; - else - return false; + (rec1.y <= (rec2.y + rec2.height) && (rec1.y + rec1.height) >= rec2.y)) collision = true; + + return collision; } // Check collision between two circles |
