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

Add support for polygon selection shapes.

Browse Source
This commit is contained in:
Paul Chote
2020-02-29 11:03:20 +00:00
committed by atlimit8
parent 4ba50a4379
commit 88cdad4189
11 changed files with 162 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Interactable.cs
View File

@@ -52,10 +52,10 @@ namespace OpenRA.Mods.Common.Traits
return autoBounds.Select(s => s.AutoMouseoverBounds(self, wr)).FirstOrDefault(r => !r.IsEmpty);
}
Rectangle Bounds(Actor self, WorldRenderer wr, int[] bounds)
Polygon Bounds(Actor self, WorldRenderer wr, int[] bounds)
{
if (bounds == null)
return AutoBounds(self, wr);
return new Polygon(AutoBounds(self, wr));
var size = new int2(bounds[0], bounds[1]);
@@ -64,17 +64,17 @@ namespace OpenRA.Mods.Common.Traits
offset += new int2(bounds[2], bounds[3]);
var xy = wr.ScreenPxPosition(self.CenterPosition) + offset;
return new Rectangle(xy.X, xy.Y, size.X, size.Y);
return new Polygon(new Rectangle(xy.X, xy.Y, size.X, size.Y));
}
Rectangle IMouseBounds.MouseoverBounds(Actor self, WorldRenderer wr)
Polygon IMouseBounds.MouseoverBounds(Actor self, WorldRenderer wr)
{
return Bounds(self, wr, info.Bounds);
}
public Rectangle DecorationBounds(Actor self, WorldRenderer wr)
{
return Bounds(self, wr, info.DecorationBounds ?? info.Bounds);
return Bounds(self, wr, info.DecorationBounds ?? info.Bounds).BoundingRect;
}
}
}

2
OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs
View File

@@ -145,7 +145,7 @@ namespace OpenRA.Mods.Common.Traits
{
IRenderable[] renderables = null;
Rectangle[] bounds = null;
Rectangle mouseBounds = Rectangle.Empty;
var mouseBounds = Polygon.Empty;
for (var playerIndex = 0; playerIndex < frozenStates.Count; playerIndex++)
{
var frozen = frozenStates[playerIndex].FrozenActor;