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

Remove obsolete SpriteRenderable ctor.

Browse Source
This commit is contained in:
Paul Chote
2013-06-20 22:29:36 +12:00
parent 90d7f230ed
commit c40fd80ae1
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,19 +52,14 @@ namespace OpenRA.Graphics
readonly int zOffset; readonly int zOffset;
readonly PaletteReference palette; readonly PaletteReference palette;
readonly float scale; readonly float scale;
readonly float2 pxCenter;
public SpriteRenderable(Sprite sprite, WPos pos, int zOffset, PaletteReference palette, float scale) public SpriteRenderable(Sprite sprite, WPos pos, int zOffset, PaletteReference palette, float scale)
: this(sprite, pos, zOffset, palette, scale, 0.5f*scale*sprite.size) {}
public SpriteRenderable(Sprite sprite, WPos pos, int zOffset, PaletteReference palette, float scale, float2 pxCenter)
{ {
this.sprite = sprite; this.sprite = sprite;
this.pos = pos; this.pos = pos;
this.zOffset = zOffset; this.zOffset = zOffset;
this.palette = palette; this.palette = palette;
this.scale = scale; this.scale = scale;
this.pxCenter = pxCenter;
} }
// Provided for legacy support only - Don't use for new things! // Provided for legacy support only - Don't use for new things!
@@ -84,12 +79,12 @@ namespace OpenRA.Graphics
public void BeforeRender(WorldRenderer wr) {} public void BeforeRender(WorldRenderer wr) {}
public void Render(WorldRenderer wr) public void Render(WorldRenderer wr)
{ {
sprite.DrawAt(wr.ScreenPxPosition(pos) - pxCenter, palette, scale); sprite.DrawAt(wr.ScreenPxPosition(pos) - 0.5f*scale*sprite.size, palette, scale);
} }
public void RenderDebugGeometry(WorldRenderer wr) public void RenderDebugGeometry(WorldRenderer wr)
{ {
var offset = wr.ScreenPxPosition(pos) - pxCenter + sprite.offset; var offset = wr.ScreenPxPosition(pos) - 0.5f*scale*sprite.size + sprite.offset;
Game.Renderer.WorldLineRenderer.DrawRect(offset, offset + sprite.size, Color.Red); Game.Renderer.WorldLineRenderer.DrawRect(offset, offset + sprite.size, Color.Red);
} }
} }