zoriya/Quadtree
1
0
Fork 0
mirror of https://github.com/zoriya/Quadtree.git synced 2026-05-27 00:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inverting the y axis

Browse Source
This commit is contained in:
AnonymusRaccoon
2019-12-16 16:26:38 +01:00
parent 883328186b
commit 3fc8b81563
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qt_getcollide.c
+10 -10
View File
@@ -11,22 +11,22 @@
//X1 is on the line or X2 is on the line or both X are on each side of the map
bool collision_overlapx(qt_intrect r1, qt_intrect r2)
{
if (r1.x > r2.x && r1.x < r2.x + r2.w)
if (r1.x >= r2.x && r1.x <= r2.x + r2.w)
return (true);
if (r1.x + r1.w > r2.x && r1.x + r1.w < r2.x + r2.w)
if (r1.x + r1.w > r2.x && r1.x + r1.w <= r2.x + r2.w)
return (true);
if (r1.x < r2.x && r1.x + r1.w > r2.x + r2.w)
if (r1.x <= r2.x && r1.x + r1.w >= r2.x + r2.w)
return (true);
return (false);
}
bool collision_overlapy(qt_intrect r1, qt_intrect r2)
{
if (r1.y > r2.y && r1.y < r2.y + r2.h)
if (r1.y >= r2.y && r2.y < r1.y - r1.h)
return (true);
if (r1.y + r1.h > r2.y && r1.y + r1.h < r2.y + r2.h)
if (r1.y - r1.h >= r2.y && r1.y - r1.h <= r2.y - r2.h)
return (true);
if (r1.y < r2.y && r1.y + r1.h > r2.y + r2.h)
if (r1.y <= r2.y && r1.y - r1.h >= r2.y - r2.h)
return (true);
return (false);
}
@@ -40,10 +40,10 @@ qt_collision collision_complete(qt_collision col, qt_intrect r1, qt_intrect r2)
col.distance_left = MIN(col.distance_left, r1.x - (r2.x + r2.w));
}
if (collision_overlapx(r1, r2)) {
if (r1.y < r2.y)
col.distance_top = MIN(col.distance_top, r1.y - (r2.y + r2.h));
if (r2.y < r1.y)
col.distance_down = MIN(col.distance_down, r1.y - (r2.y + r2.h));
if (r1.y > r2.y)
col.distance_down = MIN(col.distance_top, r1.y - (r2.y + r2.h));
if (r2.y > r1.y)
col.distance_top = MIN(col.distance_down, r2.y - (r1.y + r1.h));
}
col.distance_down = MAX(0, col.distance_down);
col.distance_top = MAX(0, col.distance_top);