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

Add UnionRectangles extension method.

Browse Source
This commit is contained in:
RoosterDragon
2019-06-14 21:05:50 +01:00
committed by abcdefg30
parent 0e6c37d765
commit 31918e8712
7 changed files with 29 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs
View File

@@ -324,12 +324,7 @@ namespace OpenRA.Mods.Common.Graphics
if (ShadowStart > 0)
boundSprites = boundSprites.Concat(SpriteBounds(sprites, Frames, ShadowStart, Facings, Length, Stride, transpose));
if (boundSprites.Any())
{
Bounds = boundSprites.First();
foreach (var b in boundSprites.Skip(1))
Bounds = Rectangle.Union(Bounds, b);
}
Bounds = boundSprites.Union();
}
catch (FormatException f)
{

7
OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
View File

@@ -92,12 +92,7 @@ namespace OpenRA.Mods.Common.Traits
// If this is a problem, then we may need to fetch the area from somewhere else
var r = previews.SelectMany(p => p.ScreenBounds(worldRenderer, CenterPosition));
if (r.Any())
{
Bounds = r.First();
foreach (var rr in r.Skip(1))
Bounds = Rectangle.Union(Bounds, rr);
}
Bounds = r.Union();
SelectionBox = new SelectionBoxRenderable(new WPos(CenterPosition.X, CenterPosition.Y, 8192),
new Rectangle(Bounds.X, Bounds.Y, Bounds.Width, Bounds.Height), Color.White);

16
OpenRA.Mods.Common/Widgets/ActorPreviewWidget.cs
View File

@@ -53,20 +53,10 @@ namespace OpenRA.Mods.Common.Widgets
.ToArray();
// Calculate the preview bounds
PreviewOffset = int2.Zero;
IdealPreviewSize = int2.Zero;
var r = preview.SelectMany(p => p.ScreenBounds(worldRenderer, WPos.Zero));
if (r.Any())
{
var b = r.First();
foreach (var rr in r.Skip(1))
b = Rectangle.Union(b, rr);
IdealPreviewSize = new int2(b.Width, b.Height);
PreviewOffset = -new int2(b.Left, b.Top) - IdealPreviewSize / 2;
}
var b = r.Union();
IdealPreviewSize = new int2(b.Width, b.Height);
PreviewOffset = -new int2(b.Left, b.Top) - IdealPreviewSize / 2;
}
IFinalizedRenderable[] renderables;

2
OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
View File

@@ -425,7 +425,7 @@ namespace OpenRA.Mods.Common.Widgets
DisplayedIconCount++;
}
eventBounds = icons.Any() ? icons.Keys.Aggregate(Rectangle.Union) : Rectangle.Empty;
eventBounds = icons.Keys.Union();
if (oldIconCount != DisplayedIconCount)
OnIconCountChanged(oldIconCount, DisplayedIconCount);

2
OpenRA.Mods.Common/Widgets/SupportPowersWidget.cs
View File

@@ -154,7 +154,7 @@ namespace OpenRA.Mods.Common.Widgets
IconCount++;
}
eventBounds = icons.Any() ? icons.Keys.Aggregate(Rectangle.Union) : Rectangle.Empty;
eventBounds = icons.Keys.Union();
if (oldIconCount != IconCount)
OnIconCountChanged(oldIconCount, IconCount);