mirror/batteries
1
0
Fork 0
mirror of https://github.com/1bardesign/batteries.git synced 2024-11-25 23:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Max Cahill 2021-10-22 12:40:29 +11:00
commit 0629e349a4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intersect.lua
View File

@ -449,18 +449,18 @@ function intersect.point_aabb_overlap(a, b_pos, b_hs)
end end
function intersect.point_aabb_collide(a, b_pos, b_hs, into) function intersect.point_aabb_collide(a, b_pos, b_hs, into)
return intersect.reverse_msv(intersect.aabb_point_collide(b_pos, b_rad, a, into)) return intersect.reverse_msv(intersect.aabb_point_collide(b_pos, b_hs, a, into))
end end
function intersect.circle_aabb_overlap(a, a_rad, b_pos, b_hs) function intersect.circle_aabb_overlap(a, a_rad, b_pos, b_hs)
return intersect.aabb_circle_overlap(b_pos, b_rad, a, a_rad) return intersect.aabb_circle_overlap(b_pos, b_pos, a, a_rad)
end end
function intersect.circle_aabb_collide(a, a_rad, b_pos, b_hs, into) function intersect.circle_aabb_collide(a, a_rad, b_pos, b_hs, into)
return intersect.reverse_msv(intersect.aabb_circle_collide(b_pos, b_rad, a, a_rad, into)) return intersect.reverse_msv(intersect.aabb_circle_collide(b_pos, b_pos, a, a_rad, into))
end end
function intersect.circle_line_collide(a, a_rad, b_start, b_end, b_rad) function intersect.circle_line_collide(a, a_rad, b_start, b_end, b_rad, into)
return intersect.reverse_msv(intersect.line_circle_collide(b_start, b_end, b_rad, a, a_rad, into)) return intersect.reverse_msv(intersect.line_circle_collide(b_start, b_end, b_rad, a, a_rad, into))
end end