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

Replace pixel perfect offset with reference point definitions.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-08-03 07:37:11 +02:00
parent 1a53bfd8a3
commit fac58bd461
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OpenRA.Mods.Common/Traits/Render/WithSpriteControlGroupDecoration.cs
View File

@@ -28,8 +28,9 @@ namespace OpenRA.Mods.Common.Traits.Render
[Desc("Sprite sequence used to render the control group 0-9 numbers.")] [Desc("Sprite sequence used to render the control group 0-9 numbers.")]
[SequenceReference("Image")] public readonly string GroupSequence = "groups"; [SequenceReference("Image")] public readonly string GroupSequence = "groups";
[Desc("Manual offset in screen pixel.")] [Desc("Point in the actor's selection box used as reference for offsetting the decoration image. " +
public readonly int2 ScreenOffset = new int2(9, 5); "Possible values are combinations of Center, Top, Bottom, Left, Right.")]
public readonly ReferencePoints ReferencePoint = ReferencePoints.Top | ReferencePoints.Left;
public object Create(ActorInitializer init) { return new WithSpriteControlGroupDecoration(init.Self, this); } public object Create(ActorInitializer init) { return new WithSpriteControlGroupDecoration(init.Self, this); }
} }
@@ -57,16 +58,12 @@ namespace OpenRA.Mods.Common.Traits.Render
if (self.Owner != wr.World.LocalPlayer) if (self.Owner != wr.World.LocalPlayer)
yield break; yield break;
var b = self.VisualBounds;
var pos = wr.ScreenPxPosition(self.CenterPosition);
var tl = wr.Viewport.WorldToViewPx(pos + new int2(b.Left, b.Top));
var pal = wr.Palette(Info.Palette); var pal = wr.Palette(Info.Palette);
foreach (var r in DrawControlGroup(wr, self, pal))
foreach (var r in DrawControlGroup(wr, self, tl, pal))
yield return r; yield return r;
} }
IEnumerable<IRenderable> DrawControlGroup(WorldRenderer wr, Actor self, int2 basePosition, PaletteReference palette) IEnumerable<IRenderable> DrawControlGroup(WorldRenderer wr, Actor self, PaletteReference palette)
{ {
var group = self.World.Selection.GetControlGroupForActor(self); var group = self.World.Selection.GetControlGroupForActor(self);
if (group == null) if (group == null)
@@ -74,8 +71,35 @@ namespace OpenRA.Mods.Common.Traits.Render
pipImages.PlayFetchIndex(Info.GroupSequence, () => (int)group); pipImages.PlayFetchIndex(Info.GroupSequence, () => (int)group);
var pos = basePosition - (0.5f * pipImages.Image.Size.XY).ToInt2() + Info.ScreenOffset; var bounds = self.VisualBounds;
yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pos, 0, palette, 1f); var halfSize = (0.5f * pipImages.Image.Size.XY).ToInt2();
var boundsOffset = new int2(bounds.Left + bounds.Right, bounds.Top + bounds.Bottom) / 2;
var sizeOffset = -halfSize;
if (Info.ReferencePoint.HasFlag(ReferencePoints.Top))
{
boundsOffset -= new int2(0, bounds.Height / 2);
sizeOffset += new int2(0, halfSize.Y);
}
else if (Info.ReferencePoint.HasFlag(ReferencePoints.Bottom))
{
boundsOffset += new int2(0, bounds.Height / 2);
sizeOffset -= new int2(0, halfSize.Y);
}
if (Info.ReferencePoint.HasFlag(ReferencePoints.Left))
{
boundsOffset -= new int2(bounds.Width / 2, 0);
sizeOffset += new int2(halfSize.X, 0);
}
else if (Info.ReferencePoint.HasFlag(ReferencePoints.Right))
{
boundsOffset += new int2(bounds.Width / 2, 0);
sizeOffset -= new int2(halfSize.X, 0);
}
var pxPos = wr.Viewport.WorldToViewPx(wr.ScreenPxPosition(self.CenterPosition) + boundsOffset) + sizeOffset;
yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pxPos, 0, palette, 1f);
} }
} }
} }