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

Support arbitrary per-player palettes. Will crash if I missed any cases that don't explicitly set the Renderable palette.

Browse Source
This commit is contained in:
Paul Chote
2011-05-03 22:21:31 +12:00
parent b937489f2d
commit 8f962853f9
12 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Player.cs
View File

@@ -27,7 +27,6 @@ namespace OpenRA
public int Deaths;
public WinState WinState = WinState.Undefined;
public readonly string Palette;
public readonly ColorRamp ColorRamp;
public readonly string PlayerName;
@@ -46,7 +45,6 @@ namespace OpenRA
{
World = world;
Index = index;
Palette = "player" + index;
InternalName = pr.Name;
PlayerRef = pr;

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

@@ -20,14 +20,15 @@ namespace OpenRA.Traits
public readonly string[] OverrideTileset = null;
public readonly string[] OverrideImage = null;
public readonly string Palette = null;
public readonly string PlayerPalette = "player";
public readonly float Scale = 1f;
public abstract object Create(ActorInitializer init);
public virtual IEnumerable<Renderable> RenderPreview(ActorInfo building, string Tileset)
public virtual IEnumerable<Renderable> RenderPreview(ActorInfo building, string Tileset, Player owner)
{
var anim = new Animation(RenderSimple.GetImage(building, Tileset), () => 0);
anim.PlayRepeating("idle");
yield return new Renderable(anim.Image, 0.5f * anim.Image.size * (1 - Scale), Palette, 0, Scale);
yield return new Renderable(anim.Image, 0.5f * anim.Image.size * (1 - Scale), Palette ?? PlayerPalette+owner.Index, 0, Scale);
}
}
@@ -62,17 +63,17 @@ namespace OpenRA.Traits
anims.Add( "", new Animation( GetImage(self), baseFacing ) );
Info = self.Info.Traits.Get<RenderSimpleInfo>();
}
public string Palette(Player p) { return Info.Palette ?? Info.PlayerPalette+p.Index; }
public virtual IEnumerable<Renderable> Render( Actor self )
{
foreach( var a in anims.Values )
if( a.DisableFunc == null || !a.DisableFunc() )
{
Renderable ret = a.Image( self );
Renderable ret = a.Image( self ).WithPalette(Palette(self.Owner));
if (Info.Scale != 1f)
ret = ret.WithScale(Info.Scale).WithPos(ret.Pos + 0.5f*ret.Sprite.size*(1 - Info.Scale));
yield return ( Info.Palette == null ) ? ret : ret.WithPalette(Info.Palette);
yield return ret;
}
}

2
OpenRA.Game/Traits/Util.cs
View File

@@ -98,7 +98,7 @@ namespace OpenRA.Traits
public static Renderable Centered(Actor self, Sprite s, float2 location)
{
var pal = self.Owner == null ? "player0" : self.Owner.Palette;
var pal = "player{0}".F(self.Owner == null ? 0 : self.Owner.Index);
var loc = location - 0.5f * s.size;
return new Renderable(s, loc.Round(), pal, (int)self.CenterLocation.Y);