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

Specify interaction bounds relative to the mod tile size.

Browse Source
This commit is contained in:
Paul Chote
2021-03-27 14:51:28 +00:00
committed by teinarss
parent 852241d98e
commit 7c0e4b25ae
36 changed files with 291 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,13 +21,13 @@ namespace OpenRA.Mods.Common.Traits
{
[Desc("Defines a custom rectangle for mouse interaction with the actor.",
"If null, the engine will guess an appropriate size based on the With*Body trait.",
"The first two numbers define the width and height of the rectangle.",
"The first two numbers define the width and height of the rectangle as a world distance.",
"The (optional) second two numbers define an x and y offset from the actor center.")]
public readonly int[] Bounds = null;
public readonly WDist[] Bounds = null;
[Desc("Defines a custom rectangle for Decorations (e.g. the selection box).",
"If null, Bounds will be used instead")]
public readonly int[] DecorationBounds = null;
public readonly WDist[] DecorationBounds = null;
public override object Create(ActorInitializer init) { return new Interactable(this); }
}
@@ -52,16 +52,17 @@ namespace OpenRA.Mods.Common.Traits
return autoBounds.Select(s => s.AutoMouseoverBounds(self, wr)).FirstOrDefault(r => !r.IsEmpty);
}
Polygon Bounds(Actor self, WorldRenderer wr, int[] bounds)
Polygon Bounds(Actor self, WorldRenderer wr, WDist[] bounds)
{
if (bounds == null)
return new Polygon(AutoBounds(self, wr));
var size = new int2(bounds[0], bounds[1]);
// Convert from WDist to pixels
var size = new int2(bounds[0].Length * wr.TileSize.Width / wr.TileScale, bounds[1].Length * wr.TileSize.Height / wr.TileScale);
var offset = -size / 2;
if (bounds.Length > 2)
offset += new int2(bounds[2], bounds[3]);
offset += new int2(bounds[2].Length * wr.TileSize.Width / wr.TileScale, bounds[3].Length * wr.TileSize.Height / wr.TileScale);
var xy = wr.ScreenPxPosition(self.CenterPosition) + offset;
return new Polygon(new Rectangle(xy.X, xy.Y, size.X, size.Y));

11
OpenRA.Mods.Common/Traits/IsometricSelectable.cs
View File

@@ -87,12 +87,13 @@ namespace OpenRA.Mods.Common.Traits
int2 left, right, top, bottom;
if (bounds != null)
{
var offset = bounds.Length >= 4 ? new int2(bounds[2], bounds[3]) : int2.Zero;
// Convert from WDist to pixels
var offset = bounds.Length >= 4 ? new int2(bounds[2] * wr.TileSize.Width / wr.TileScale, bounds[3] * wr.TileSize.Height / wr.TileScale) : int2.Zero;
var center = wr.ScreenPxPosition(self.CenterPosition) + offset;
left = center - new int2(bounds[0] / 2, 0);
right = left + new int2(bounds[0], 0);
top = center - new int2(0, bounds[1] / 2);
bottom = top + new int2(0, bounds[1]);
left = center - new int2(bounds[0] * wr.TileSize.Width / (2 * wr.TileScale), 0);
right = left + new int2(bounds[0] * wr.TileSize.Width / wr.TileScale, 0);
top = center - new int2(0, bounds[1] * wr.TileSize.Height / (2 * wr.TileScale));
bottom = top + new int2(0, bounds[1] * wr.TileSize.Height / wr.TileScale);
}
else
{