UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #622 from Joefish/rectcollision-optim

Browse source 
Shapes: Simplifies CheckCollisionRecs
This commit is contained in:
Ray 2018-08-14 09:55:53 +02:00 • committed by GitHub
commit 20ff9dc663
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/shapes.c
View file

@ -646,14 +646,11 @@ bool CheckCollisionPointTriangle(Vector2 point, Vector2 p1, Vector2 p2, Vector2
// Check collision between two rectangles // Check collision between two rectangles
bool CheckCollisionRecs(Rectangle rec1, Rectangle rec2) 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))
float dx = (float)fabs((rec1.x + rec1.width/2) - (rec2.x + rec2.width/2)); return true;
float dy = (float)fabs((rec1.y + rec1.height/2) - (rec2.y + rec2.height/2)); else
return false;
if ((dx <= (rec1.width/2 + rec2.width/2)) && ((dy <= (rec1.height/2 + rec2.height/2)))) collision = true;
return collision;
} }
// Check collision between two circles // Check collision between two circles