asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #87265 from AThousandShips/aabb_fix_cs_3_x

Browse source 
[3.x] [C#] Fix `Encloses` failing on shared upper bound for `AABB` and `Rect2`
This commit is contained in:
Rémi Verschelde 2024-01-17 13:46:47 +01:00
commit 1eac1a2794
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/mono/glue/GodotSharp/GodotSharp/Core/AABB.cs
View file

@ -91,11 +91,11 @@ namespace Godot
Vector3 dstMax = with._position + with._size; Vector3 dstMax = with._position + with._size;
return srcMin.x <= dstMin.x && return srcMin.x <= dstMin.x &&
srcMax.x > dstMax.x && srcMax.x >= dstMax.x &&
srcMin.y <= dstMin.y && srcMin.y <= dstMin.y &&
srcMax.y > dstMax.y && srcMax.y >= dstMax.y &&
srcMin.z <= dstMin.z && srcMin.z <= dstMin.z &&
srcMax.z > dstMax.z; srcMax.z >= dstMax.z;
} }
/// <summary> /// <summary>

4
modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs
View file

@ -112,8 +112,8 @@ namespace Godot
public bool Encloses(Rect2 b) public bool Encloses(Rect2 b)
{ {
return b._position.x >= _position.x && b._position.y >= _position.y && return b._position.x >= _position.x && b._position.y >= _position.y &&
b._position.x + b._size.x < _position.x + _size.x && b._position.x + b._size.x <= _position.x + _size.x &&
b._position.y + b._size.y < _position.y + _size.y; b._position.y + b._size.y <= _position.y + _size.y;
} }
/// <summary> /// <summary>