amacocian/MonoGame.Extended
1
0
Fork 0
mirror of https://github.com/AlexMacocian/MonoGame.Extended.git synced 2026-07-15 15:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed broken Rectangle.Clip() extensions method (#998)

Browse Source 
(rectangle.Right depends on rectangle.X, which has been changed before; unit test will fail with old implementation)
This commit is contained in:
Andreas Loew
2025-07-24 21:33:43 +02:00
committed by GitHub
parent 27f7983aaf
commit 4560ae70f8
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/MonoGame.Extended/Rectangle.Extensions.cs
+9 -7
View File
@@ -41,16 +41,18 @@ public static class RectangleExtensions
/// <returns>The clipped rectangle, or <see cref="Rectangle.Empty"/> if the rectangles do not intersect.</returns>
public static Rectangle Clip(this Rectangle rectangle, Rectangle clippingRectangle)
{
var clip = clippingRectangle;
rectangle.X = clip.X > rectangle.X ? clip.X : rectangle.X;
rectangle.Y = clip.Y > rectangle.Y ? clip.Y : rectangle.Y;
rectangle.Width = rectangle.Right > clip.Right ? clip.Right - rectangle.X : rectangle.Width;
rectangle.Height = rectangle.Bottom > clip.Bottom ? clip.Bottom - rectangle.Y : rectangle.Height;
int left = Math.Max(rectangle.Left, clippingRectangle.Left);
int top = Math.Max(rectangle.Top, clippingRectangle.Top);
int right = Math.Min(rectangle.Right, clippingRectangle.Right);
int bottom = Math.Min(rectangle.Bottom, clippingRectangle.Bottom);
if (rectangle.Width <= 0 || rectangle.Height <= 0)
int width = right - left;
int height = bottom - top;
if (width <= 0 || height <= 0)
return Rectangle.Empty;
return rectangle;
return new Rectangle(left, top, width, height);
}
/// <summary>