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

27
OpenRA.Game/Traits/World/ScreenMap.cs
View File

@@ -21,11 +21,9 @@ namespace OpenRA.Traits
public struct ActorBoundsPair
{
public readonly Actor Actor;
public readonly Polygon Bounds;
// TODO: Replace this with an int2[] polygon
public readonly Rectangle Bounds;
public ActorBoundsPair(Actor actor, Rectangle bounds) { Actor = actor; Bounds = bounds; }
public ActorBoundsPair(Actor actor, Polygon bounds) { Actor = actor; Bounds = bounds; }
public override int GetHashCode() { return Actor.GetHashCode() ^ Bounds.GetHashCode(); }
@@ -192,7 +190,7 @@ namespace OpenRA.Traits
return partitionedMouseActors.InBox(r)
.Where(actorIsInWorld)
.Select(selectActorAndBounds)
.Where(x => r.IntersectsWith(x.Bounds));
.Where(x => x.Bounds.IntersectsWith(r));
}
public IEnumerable<Actor> RenderableActorsInBox(int2 a, int2 b)
@@ -218,12 +216,12 @@ namespace OpenRA.Traits
foreach (var a in addOrUpdateActors)
{
var mouseBounds = a.MouseBounds(worldRenderer);
if (!mouseBounds.Size.IsEmpty)
if (!mouseBounds.IsEmpty)
{
if (partitionedMouseActors.Contains(a))
partitionedMouseActors.Update(a, mouseBounds);
partitionedMouseActors.Update(a, mouseBounds.BoundingRect);
else
partitionedMouseActors.Add(a, mouseBounds);
partitionedMouseActors.Add(a, mouseBounds.BoundingRect);
partitionedMouseActorBounds[a] = new ActorBoundsPair(a, mouseBounds);
}
@@ -257,12 +255,12 @@ namespace OpenRA.Traits
foreach (var fa in kv.Value)
{
var mouseBounds = fa.MouseBounds;
if (!mouseBounds.Size.IsEmpty)
if (!mouseBounds.IsEmpty)
{
if (partitionedMouseFrozenActors[kv.Key].Contains(fa))
partitionedMouseFrozenActors[kv.Key].Update(fa, mouseBounds);
partitionedMouseFrozenActors[kv.Key].Update(fa, mouseBounds.BoundingRect);
else
partitionedMouseFrozenActors[kv.Key].Add(fa, mouseBounds);
partitionedMouseFrozenActors[kv.Key].Add(fa, mouseBounds.BoundingRect);
}
else
partitionedMouseFrozenActors[kv.Key].Remove(fa);
@@ -302,11 +300,10 @@ namespace OpenRA.Traits
return viewer != null ? bounds.Concat(partitionedRenderableFrozenActors[viewer].ItemBounds) : bounds;
}
public IEnumerable<Rectangle> MouseBounds(Player viewer)
public IEnumerable<Polygon> MouseBounds(Player viewer)
{
var bounds = partitionedMouseActors.ItemBounds;
return viewer != null ? bounds.Concat(partitionedMouseFrozenActors[viewer].ItemBounds) : bounds;
var bounds = partitionedMouseActorBounds.Values.Select(a => a.Bounds);
return viewer != null ? bounds.Concat(partitionedMouseFrozenActors[viewer].Items.Select(fa => fa.MouseBounds)) : bounds;
}
}
}