Merge pull request #1360 from AThousandShips/aabb_fix
Fix `AABB.encloses` failing on shared upper boundpull/1367/head
commit
480a0f8c06
|
@ -201,11 +201,11 @@ inline bool AABB::encloses(const AABB &p_aabb) const {
|
|||
|
||||
return (
|
||||
(src_min.x <= dst_min.x) &&
|
||||
(src_max.x > dst_max.x) &&
|
||||
(src_max.x >= dst_max.x) &&
|
||||
(src_min.y <= dst_min.y) &&
|
||||
(src_max.y > dst_max.y) &&
|
||||
(src_max.y >= dst_max.y) &&
|
||||
(src_min.z <= dst_min.z) &&
|
||||
(src_max.z > dst_max.z));
|
||||
(src_max.z >= dst_max.z));
|
||||
}
|
||||
|
||||
Vector3 AABB::get_support(const Vector3 &p_normal) const {
|
||||
|
|
Loading…
Reference in New Issue