Merge pull request #87214 from AThousandShips/aabb_fix_3_x
[3.x] [Core] Fix AABB.encloses failing on shared upper bound
This commit is contained in:
commit
59eb1b604e
1 changed files with 3 additions and 3 deletions
|
@ -168,11 +168,11 @@ inline bool AABB::encloses(const AABB &p_aabb) const {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
(src_min.x <= dst_min.x) &&
|
(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_min.y <= dst_min.y) &&
|
||||||
(src_max.y > dst_max.y) &&
|
(src_max.y >= dst_max.y) &&
|
||||||
(src_min.z <= dst_min.z) &&
|
(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 {
|
Vector3 AABB::get_support(const Vector3 &p_normal) const {
|
||||||
|
|
Loading…
Reference in a new issue