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

fixed intersection tests with zero radius shapes (treated as points generally)

Browse Source
This commit is contained in:
Max Cahill 2022-12-08 13:36:29 +11:00
parent 2c76b7dde0
commit ba7a7b5500
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intersect.lua
View File

@ -29,12 +29,12 @@ local COLLIDE_EPS = 1e-6
-- circles
function intersect.circle_point_overlap(pos, rad, v)
return pos:distance_squared(v) < rad * rad
return pos:distance_squared(v) <= rad * rad
end
function intersect.circle_circle_overlap(a_pos, a_rad, b_pos, b_rad)
local rad = a_rad + b_rad
return a_pos:distance_squared(b_pos) < rad * rad
return a_pos:distance_squared(b_pos) <= rad * rad
end
function intersect.circle_circle_collide(a_pos, a_rad, b_pos, b_rad, into)
@ -46,7 +46,7 @@ function intersect.circle_circle_collide(a_pos, a_rad, b_pos, b_rad, into)
local rad = a_rad + b_rad
local dist = delta:length_squared()
local res = false
if dist < rad * rad then
if dist <= rad * rad then
if dist == 0 then
--singular case; just resolve vertically
dist = 1
@ -278,7 +278,7 @@ function intersect.aabb_point_overlap(pos, hs, v)
:pooled_copy()
:vector_sub_inplace(v)
:abs_inplace()
local overlap = delta.x < hs.x and delta.y < hs.y
local overlap = delta.x <= hs.x and delta.y <= hs.y
delta:release()
return overlap
end
@ -320,7 +320,7 @@ function intersect.aabb_aabb_overlap(a_pos, a_hs, b_pos, b_hs)
local total_size = a_hs
:pooled_copy()
:vector_add_inplace(b_hs)
local overlap = delta.x < total_size.x and delta.y < total_size.y
local overlap = delta.x <= total_size.x and delta.y <= total_size.y
vec2.release(delta, total_size)
return overlap
end
@ -375,7 +375,7 @@ function intersect.aabb_circle_overlap(a_pos, a_hs, b_pos, b_rad)
local clamped = intersect.aabb_point_clamp(a_pos, a_hs, b_pos, vec2:pooled())
local edge_distance_squared = clamped:distance_squared(b_pos)
clamped:release()
return edge_distance_squared < (b_rad * b_rad)
return edge_distance_squared <= (b_rad * b_rad)
end
-- return msv on collision, false otherwise