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

Scale is now set via a field on Render* and interacts properly with chronoshift and building previews.

Browse Source
This commit is contained in:
Paul Chote
2010-11-27 13:30:08 +13:00
parent 840ade5b78
commit 00a0aac7a3
10 changed files with 25 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ namespace OpenRA.Traits
public readonly string[] OverrideTileset = null;
public readonly string[] OverrideImage = null;
public readonly string Palette = null;
public readonly float Scale = 1f;
public abstract object Create(ActorInitializer init);
}
@@ -48,17 +49,24 @@ namespace OpenRA.Traits
return cachedImage = GetImage(self.Info, self.World.Map.Tileset);
}
RenderSimpleInfo Info;
public RenderSimple(Actor self, Func<int> baseFacing)
{
anims.Add( "", new Animation( GetImage(self), baseFacing ) );
Info = self.Info.Traits.Get<RenderSimpleInfo>();
}
public virtual IEnumerable<Renderable> Render( Actor self )
{
var palette = self.Info.Traits.Get<RenderSimpleInfo>().Palette;
foreach( var a in anims.Values )
if( a.DisableFunc == null || !a.DisableFunc() )
yield return ( palette == null ) ? a.Image( self ) : a.Image( self ).WithPalette(palette);
{
Renderable ret = a.Image( self );
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);
}
}
public virtual void Tick(Actor self)