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

Fixes #3334.

Browse Source
This commit is contained in:
Paul Chote
2013-06-01 12:53:19 +12:00
parent bf3d337913
commit 8123a383b6
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Graphics/Renderable.cs
View File

@@ -41,7 +41,6 @@ namespace OpenRA.Graphics
IRenderable WithZOffset(int newOffset); IRenderable WithZOffset(int newOffset);
IRenderable WithPos(WPos pos); IRenderable WithPos(WPos pos);
void Render(WorldRenderer wr); void Render(WorldRenderer wr);
WVec Size(WorldRenderer wr);
} }
public struct SpriteRenderable : IRenderable public struct SpriteRenderable : IRenderable
@@ -84,11 +83,5 @@ namespace OpenRA.Graphics
{ {
sprite.DrawAt(wr.ScreenPxPosition(pos) - pxCenter, palette.Index, scale); sprite.DrawAt(wr.ScreenPxPosition(pos) - pxCenter, palette.Index, scale);
} }
public WVec Size(WorldRenderer wr)
{
var size = (scale*sprite.size).ToInt2();
return new WVec(size.X, size.Y, size.Y);
}
} }
} }

17
OpenRA.Mods.RA/BelowUnits.cs
View File

@@ -11,17 +11,30 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
class BelowUnitsInfo : TraitInfo<BelowUnits> { } class BelowUnitsInfo : ITraitInfo
{
public object Create(ActorInitializer init) { return new BelowUnits(init.self); }
}
class BelowUnits : IRenderModifier class BelowUnits : IRenderModifier
{ {
int offset;
public BelowUnits(Actor self)
{
// Offset effective position to the top of the northernmost occupied cell
var bi = self.Info.Traits.GetOrDefault<BuildingInfo>();
offset = (bi != null) ? -FootprintUtils.CenterOffset(bi).Y : -512;
}
public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r) public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
{ {
return r.Select(a => a.WithZOffset(-a.Size(wr).Z)); return r.Select(a => a.WithZOffset(offset));
} }
} }
} }