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

Wrap palette references with a PaletteRef object.

Browse Source
This commit is contained in:
Paul Chote
2013-02-24 11:08:50 +13:00
parent a166815348
commit f0ba0ce2e8
30 changed files with 83 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Traits/Render/RenderSimple.cs
View File

@@ -27,8 +27,10 @@ namespace OpenRA.Traits
{
var anim = new Animation(RenderSimple.GetImage(building), () => 0);
anim.PlayRepeating("idle");
var pal = Palette ?? (owner != null ? PlayerPalette + owner.InternalName : null);
yield return new Renderable(anim.Image, 0.5f * anim.Image.size * (1 - Scale),
Palette ?? (owner != null ? PlayerPalette + owner.InternalName : null), 0, Scale);
PaletteReference.FromName(pal), 0, Scale);
}
}
@@ -77,7 +79,10 @@ namespace OpenRA.Traits
anim.PlayRepeating("idle");
}
public string Palette(Player p) { return Info.Palette ?? Info.PlayerPalette + p.InternalName; }
public PaletteReference Palette(Player p)
{
return PaletteReference.FromName(Info.Palette ?? Info.PlayerPalette + p.InternalName);
}
public virtual IEnumerable<Renderable> Render(Actor self)
{

10
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -154,12 +154,12 @@ namespace OpenRA.Traits
{
public readonly Sprite Sprite;
public readonly float2 Pos;
public readonly string Palette;
public readonly PaletteReference Palette;
public readonly int Z;
public readonly int ZOffset;
public float Scale;
public Renderable(Sprite sprite, float2 pos, string palette, int z, int zOffset, float scale)
public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z, int zOffset, float scale)
{
Sprite = sprite;
Pos = pos;
@@ -169,14 +169,14 @@ namespace OpenRA.Traits
Scale = scale; /* default */
}
public Renderable(Sprite sprite, float2 pos, string palette, int z)
public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z)
: this(sprite, pos, palette, z, 0, 1f) { }
public Renderable(Sprite sprite, float2 pos, string palette, int z, float scale)
public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z, float scale)
: this(sprite, pos, palette, z, 0, scale) { }
public Renderable WithScale(float newScale) { return new Renderable(Sprite, Pos, Palette, Z, ZOffset, newScale); }
public Renderable WithPalette(string newPalette) { return new Renderable(Sprite, Pos, newPalette, Z, ZOffset, Scale); }
public Renderable WithPalette(PaletteReference newPalette) { return new Renderable(Sprite, Pos, newPalette, Z, ZOffset, Scale); }
public Renderable WithZOffset(int newOffset) { return new Renderable(Sprite, Pos, Palette, Z, newOffset, Scale); }
public Renderable WithPos(float2 newPos) { return new Renderable(Sprite, newPos, Palette, Z, ZOffset, Scale); }
}