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

Fix Z-sorting for UISpriteRenderable.

Browse Source
This commit is contained in:
Paul Chote
2015-12-13 18:26:36 +00:00
parent 3474da0ecc
commit 3ceacbb7c1
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Graphics/UISpriteRenderable.cs
View File

@@ -17,14 +17,16 @@ namespace OpenRA.Graphics
public struct UISpriteRenderable : IRenderable, IFinalizedRenderable public struct UISpriteRenderable : IRenderable, IFinalizedRenderable
{ {
readonly Sprite sprite; readonly Sprite sprite;
readonly WPos effectiveWorldPos;
readonly int2 screenPos; readonly int2 screenPos;
readonly int zOffset; readonly int zOffset;
readonly PaletteReference palette; readonly PaletteReference palette;
readonly float scale; readonly float scale;
public UISpriteRenderable(Sprite sprite, int2 screenPos, int zOffset, PaletteReference palette, float scale) public UISpriteRenderable(Sprite sprite, WPos effectiveWorldPos, int2 screenPos, int zOffset, PaletteReference palette, float scale)
{ {
this.sprite = sprite; this.sprite = sprite;
this.effectiveWorldPos = effectiveWorldPos;
this.screenPos = screenPos; this.screenPos = screenPos;
this.zOffset = zOffset; this.zOffset = zOffset;
this.palette = palette; this.palette = palette;
@@ -32,14 +34,14 @@ namespace OpenRA.Graphics
} }
// Does not exist in the world, so a world positions don't make sense // Does not exist in the world, so a world positions don't make sense
public WPos Pos { get { return WPos.Zero; } } public WPos Pos { get { return effectiveWorldPos; } }
public WVec Offset { get { return WVec.Zero; } } public WVec Offset { get { return WVec.Zero; } }
public bool IsDecoration { get { return true; } } public bool IsDecoration { get { return true; } }
public PaletteReference Palette { get { return palette; } } public PaletteReference Palette { get { return palette; } }
public int ZOffset { get { return zOffset; } } public int ZOffset { get { return zOffset; } }
public IRenderable WithPalette(PaletteReference newPalette) { return new UISpriteRenderable(sprite, screenPos, zOffset, newPalette, scale); } public IRenderable WithPalette(PaletteReference newPalette) { return new UISpriteRenderable(sprite, effectiveWorldPos, screenPos, zOffset, newPalette, scale); }
public IRenderable WithZOffset(int newOffset) { return this; } public IRenderable WithZOffset(int newOffset) { return this; }
public IRenderable OffsetBy(WVec vec) { return this; } public IRenderable OffsetBy(WVec vec) { return this; }
public IRenderable AsDecoration() { return this; } public IRenderable AsDecoration() { return this; }

6
OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs
View File

@@ -114,7 +114,7 @@ namespace OpenRA.Mods.Common.Traits
pipImages.Tick(); pipImages.Tick();
var pos = basePosition - (0.5f * pipImages.Image.Size).ToInt2() + new int2(9, 5); var pos = basePosition - (0.5f * pipImages.Image.Size).ToInt2() + new int2(9, 5);
yield return new UISpriteRenderable(pipImages.Image, pos, 0, pal, 1f); yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pos, 0, pal, 1f);
} }
IEnumerable<IRenderable> DrawPips(WorldRenderer wr, Actor self, int2 basePosition) IEnumerable<IRenderable> DrawPips(WorldRenderer wr, Actor self, int2 basePosition)
@@ -146,7 +146,7 @@ namespace OpenRA.Mods.Common.Traits
pipImages.PlayRepeating(PipStrings[(int)pip]); pipImages.PlayRepeating(PipStrings[(int)pip]);
pipxyOffset += new int2(pipSize.X, 0); pipxyOffset += new int2(pipSize.X, 0);
yield return new UISpriteRenderable(pipImages.Image, pipxyBase + pipxyOffset, 0, pal, 1f); yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pipxyBase + pipxyOffset, 0, pal, 1f);
} }
// Increment row // Increment row
@@ -169,7 +169,7 @@ namespace OpenRA.Mods.Common.Traits
tagImages.PlayRepeating(TagStrings[(int)tag]); tagImages.PlayRepeating(TagStrings[(int)tag]);
var pos = basePosition + tagxyOffset - (0.5f * tagImages.Image.Size).ToInt2(); var pos = basePosition + tagxyOffset - (0.5f * tagImages.Image.Size).ToInt2();
yield return new UISpriteRenderable(tagImages.Image, pos, 0, pal, 1f); yield return new UISpriteRenderable(tagImages.Image, self.CenterPosition, pos, 0, pal, 1f);
// Increment row // Increment row
tagxyOffset = tagxyOffset.WithY(tagxyOffset.Y + 8); tagxyOffset = tagxyOffset.WithY(tagxyOffset.Y + 8);