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

Cache the palette lookup.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-07-03 14:41:15 +02:00
parent 4325e1b400
commit 889bbcf428
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,28 +99,28 @@ namespace OpenRA.Mods.Common.Traits.Render
var pos = wr.ScreenPxPosition(self.CenterPosition); var pos = wr.ScreenPxPosition(self.CenterPosition);
var tl = wr.Viewport.WorldToViewPx(pos + new int2(b.Left, b.Top)); var tl = wr.Viewport.WorldToViewPx(pos + new int2(b.Left, b.Top));
var bl = wr.Viewport.WorldToViewPx(pos + new int2(b.Left, b.Bottom)); var bl = wr.Viewport.WorldToViewPx(pos + new int2(b.Left, b.Bottom));
var pal = wr.Palette(Info.Palette);
foreach (var r in DrawControlGroup(wr, self, tl)) foreach (var r in DrawControlGroup(wr, self, tl, pal))
yield return r; yield return r;
foreach (var r in DrawPips(wr, self, bl)) foreach (var r in DrawPips(wr, self, bl, pal))
yield return r; yield return r;
} }
IEnumerable<IRenderable> DrawControlGroup(WorldRenderer wr, Actor self, int2 basePosition) IEnumerable<IRenderable> DrawControlGroup(WorldRenderer wr, Actor self, int2 basePosition, PaletteReference palette)
{ {
var group = self.World.Selection.GetControlGroupForActor(self); var group = self.World.Selection.GetControlGroupForActor(self);
if (group == null) if (group == null)
yield break; yield break;
var pal = wr.Palette(Info.Palette);
pipImages.PlayFetchIndex(Info.GroupSequence, () => (int)group); pipImages.PlayFetchIndex(Info.GroupSequence, () => (int)group);
var pos = basePosition - (0.5f * pipImages.Image.Size.XY).ToInt2() + new int2(9, 5); var pos = basePosition - (0.5f * pipImages.Image.Size.XY).ToInt2() + new int2(9, 5);
yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pos, 0, pal, 1f); yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pos, 0, palette, 1f);
} }
IEnumerable<IRenderable> DrawPips(WorldRenderer wr, Actor self, int2 basePosition) IEnumerable<IRenderable> DrawPips(WorldRenderer wr, Actor self, int2 basePosition, PaletteReference palette)
{ {
var pipSources = self.TraitsImplementing<IPips>(); var pipSources = self.TraitsImplementing<IPips>();
if (!pipSources.Any()) if (!pipSources.Any())
@@ -131,7 +131,6 @@ namespace OpenRA.Mods.Common.Traits.Render
var pipSize = pipImages.Image.Size.XY.ToInt2(); var pipSize = pipImages.Image.Size.XY.ToInt2();
var pipxyBase = basePosition + new int2(1 - pipSize.X / 2, -(3 + pipSize.Y / 2)); var pipxyBase = basePosition + new int2(1 - pipSize.X / 2, -(3 + pipSize.Y / 2));
var pipxyOffset = new int2(0, 0); var pipxyOffset = new int2(0, 0);
var pal = wr.Palette(Info.Palette);
var width = self.VisualBounds.Width; var width = self.VisualBounds.Width;
foreach (var pips in pipSources) foreach (var pips in pipSources)
@@ -148,7 +147,7 @@ namespace OpenRA.Mods.Common.Traits.Render
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, self.CenterPosition, pipxyBase + pipxyOffset, 0, pal, 1f); yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pipxyBase + pipxyOffset, 0, palette, 1f);
} }
// Increment row // Increment row