MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update GetCollisionRec

Browse Source 
Replace macros with ternary operators
This commit is contained in:
manuel5975p 2023-05-10 13:03:34 +02:00 committed by GitHub
parent cb2239f2f3
commit 81185bf85a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/rshapes.c
View File

@ -1757,31 +1757,30 @@ bool CheckCollisionPointLine(Vector2 point, Vector2 p1, Vector2 p2, int threshol
} }
// Get collision rectangle for two rectangles collision // Get collision rectangle for two rectangles collision
#define MIN_MACRO(X,Y) ((X) < (Y) ? (X) : (Y)) //Define ugly macros to get both gcc and clang
#define MAX_MACRO(X,Y) ((X) > (Y) ? (X) : (Y)) //to reduce min and max to single instructions
Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2){ Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2){
Rectangle overlap; Rectangle overlap;
float left = ((rec1.x) > (rec2.x) ? (rec1.x) : (rec2.x));
float left = MAX_MACRO(rec1.x, rec2.x); float right1 = rec1.x + rec1.width;
float right = MIN_MACRO(rec1.x + rec1.width, rec2.x + rec2.width); float right2 = rec2.x + rec2.width;
float top = MAX_MACRO(rec1.y, rec2.y); float right = ((right1) < (right2) ? (right1) : (right2));
float bottom = MIN_MACRO(rec1.y + rec1.height, rec2.y + rec2.height); float top = ((rec1.y) > (rec2.y) ? (rec1.y) : (rec2.y));
float bottom1 = rec1.y + rec1.height;
float bottom2 = rec2.y + rec2.height;
float bottom = ((bottom1) < (bottom2) ? (bottom1) : (bottom2));
if (left < right && top < bottom){ if (left < right && top < bottom){
overlap.x = left; overlap.x = (left);
overlap.y = top; overlap.y = (top);
overlap.width = right - left; overlap.width = (right - left );
overlap.height = bottom - top; overlap.height = (bottom - top);
} else { }
else{
overlap.x = 0; overlap.x = 0;
overlap.y = 0; overlap.y = 0;
overlap.width = 0; overlap.width = 0;
overlap.height = 0; overlap.height = 0;
} }
return overlap; return overlap;
} }
#undef MIN_MACRO //Undefine macros again
#undef MAX_MACRO
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Module specific Functions Definition // Module specific Functions Definition