mirror/batteries
1
0
Fork 0
mirror of https://github.com/1bardesign/batteries.git synced 2024-11-22 14:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint: Fix mismatched arguments in circle_aabb

Browse Source 
Fix bug where circle_aabb_overlap wouldn't have the same results as
aabb_circle_overlap.

b_hs was unused, but the function we call expects a_hs as the first
argument. Looks like this circle_aabb_overlap is just flipping
the arguments to aabb_circle_overlap (and for circle_aabb_collide), so
it should match arguments.

Not sure what hs means. Box size?
This commit is contained in:
David Briscoe 2022-03-02 23:53:11 -08:00
parent d6af9f74c5
commit 5118cc42bb
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.luacheckrc
View File

@ -2,7 +2,6 @@ return {
std = "lua51+love",
ignore = {
"211", -- Unused local variable.
"212", -- Unused argument.
"212/self", -- Unused argument self.
"213", -- Unused loop variable.
"311", -- Value assigned to a local variable is unused.

4
intersect.lua
View File

@ -454,11 +454,11 @@ function intersect.point_aabb_collide(a, b_pos, b_hs, into)
end
function intersect.circle_aabb_overlap(a, a_rad, b_pos, b_hs)
return intersect.aabb_circle_overlap(b_pos, b_pos, a, a_rad)
return intersect.aabb_circle_overlap(b_pos, b_hs, a, a_rad)
end
function intersect.circle_aabb_collide(a, a_rad, b_pos, b_hs, into)
return intersect.reverse_msv(intersect.aabb_circle_collide(b_pos, b_pos, a, a_rad, into))
return intersect.reverse_msv(intersect.aabb_circle_collide(b_pos, b_hs, a, a_rad, into))
end
function intersect.circle_line_collide(a, a_rad, b_start, b_end, b_rad, into)