epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix IDE0251

Browse Source
This commit is contained in:
RoosterDragon
2023-08-10 18:50:20 +01:00
committed by abcdefg30
parent 3b2fad6ea8
commit a1dfb42812
10 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenRA.Game/Primitives/Rectangle.cs
View File

@@ -58,35 +58,35 @@ namespace OpenRA.Primitives
Height = size.Height;
}
public int Left => X;
public int Right => X + Width;
public int Top => Y;
public int Bottom => Y + Height;
public bool IsEmpty => X == 0 && Y == 0 && Width == 0 && Height == 0;
public int2 Location => new(X, Y);
public Size Size => new(Width, Height);
public readonly int Left => X;
public readonly int Right => X + Width;
public readonly int Top => Y;
public readonly int Bottom => Y + Height;
public readonly bool IsEmpty => X == 0 && Y == 0 && Width == 0 && Height == 0;
public readonly int2 Location => new(X, Y);
public readonly Size Size => new(Width, Height);
public int2 TopLeft => Location;
public int2 TopRight => new(X + Width, Y);
public int2 BottomLeft => new(X, Y + Height);
public int2 BottomRight => new(X + Width, Y + Height);
public readonly int2 TopLeft => Location;
public readonly int2 TopRight => new(X + Width, Y);
public readonly int2 BottomLeft => new(X, Y + Height);
public readonly int2 BottomRight => new(X + Width, Y + Height);
public bool Contains(int x, int y)
public readonly bool Contains(int x, int y)
{
return x >= Left && x < Right && y >= Top && y < Bottom;
}
public bool Contains(int2 pt)
public readonly bool Contains(int2 pt)
{
return Contains(pt.X, pt.Y);
}
public bool Equals(Rectangle other)
public readonly bool Equals(Rectangle other)
{
return this == other;
}
public override bool Equals(object obj)
public override readonly bool Equals(object obj)
{
if (obj is not Rectangle)
return false;
@@ -94,17 +94,17 @@ namespace OpenRA.Primitives
return this == (Rectangle)obj;
}
public override int GetHashCode()
public override readonly int GetHashCode()
{
return Height + Width ^ X + Y;
}
public bool IntersectsWith(Rectangle rect)
public readonly bool IntersectsWith(Rectangle rect)
{
return Left < rect.Right && Right > rect.Left && Top < rect.Bottom && Bottom > rect.Top;
}
bool IntersectsWithInclusive(Rectangle r)
readonly bool IntersectsWithInclusive(Rectangle r)
{
return Left <= r.Right && Right >= r.Left && Top <= r.Bottom && Bottom >= r.Top;
}
@@ -117,14 +117,14 @@ namespace OpenRA.Primitives
return FromLTRB(Math.Max(a.Left, b.Left), Math.Max(a.Top, b.Top), Math.Min(a.Right, b.Right), Math.Min(a.Bottom, b.Bottom));
}
public bool Contains(Rectangle rect)
public readonly bool Contains(Rectangle rect)
{
return rect == Intersect(this, rect);
}
public static Rectangle operator *(int a, Rectangle b) { return new Rectangle(a * b.X, a * b.Y, a * b.Width, a * b.Height); }
public override string ToString()
public override readonly string ToString()
{
return $"{X},{Y},{Width},{Height}";
}