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

Change IPostRenderSelection and IPlaceBuildingDecoration to return renderables.

Browse Source
This commit is contained in:
Paul Chote
2014-07-22 17:41:35 +12:00
parent 8ac9477cd9
commit da6ecbf92e
13 changed files with 146 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Traits/DrawLineToTarget.cs
View File

@@ -58,25 +58,21 @@ namespace OpenRA.Traits
lifetime = Info.Ticks;
}
public void RenderAfterWorld(WorldRenderer wr)
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{
var force = Game.GetModifierKeys().HasModifier(Modifiers.Alt);
if ((lifetime <= 0 || --lifetime <= 0) && !force)
return;
yield break;
if (targets == null || targets.Count == 0)
return;
yield break;
var from = wr.ScreenPxPosition(self.CenterPosition);
foreach (var target in targets)
{
if (target.Type == TargetType.Invalid)
continue;
var to = wr.ScreenPxPosition(target.CenterPosition);
Game.Renderer.WorldLineRenderer.DrawLine(from, to, c, c);
wr.DrawTargetMarker(c, from);
wr.DrawTargetMarker(c, to);
yield return new TargetLineRenderable(new [] { self.CenterPosition, target.CenterPosition }, c);
}
}

10
OpenRA.Game/Traits/Selectable.cs
View File

@@ -52,16 +52,16 @@ namespace OpenRA.Traits
}
}
public void RenderAfterWorld(WorldRenderer wr)
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{
if (!Info.Selectable)
return;
yield break;
new SelectionBoxRenderable(self, Color.White).Render(wr);
new SelectionBarsRenderable(self).Render(wr);
yield return new SelectionBoxRenderable(self, Color.White);
yield return new SelectionBarsRenderable(self);
if (self.World.LocalPlayer != null && self.World.LocalPlayer.PlayerActor.Trait<DeveloperMode>().PathDebug)
new TargetLineRenderable(ActivityTargetPath(), Color.Green).Render(wr);
yield return new TargetLineRenderable(ActivityTargetPath(), Color.Green);
}
}
}

51
OpenRA.Game/Traits/SelectionDecorations.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
@@ -35,51 +36,56 @@ namespace OpenRA.Traits
Info = info;
}
public void RenderAfterWorld(WorldRenderer wr)
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{
if (self.World.FogObscures(self))
return;
yield break;
var b = self.Bounds.Value;
var pos = wr.ScreenPxPosition(self.CenterPosition);
var bounds = self.Bounds.Value;
bounds.Offset(pos.X, pos.Y);
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 tm = wr.Viewport.WorldToViewPx(pos + new int2((b.Left + b.Right) / 2, b.Top));
var xy = new int2(bounds.Left, bounds.Top);
var xY = new int2(bounds.Left, bounds.Bottom);
foreach (var r in DrawControlGroup(wr, self, tl))
yield return r;
DrawControlGroup(wr, self, xy);
DrawPips(wr, self, xY);
DrawTags(wr, self, new int2((bounds.Left + bounds.Right) / 2, bounds.Top));
foreach (var r in DrawPips(wr, self, bl))
yield return r;
foreach (var r in DrawTags(wr, self, tm))
yield return r;
}
void DrawControlGroup(WorldRenderer wr, Actor self, int2 basePosition)
IEnumerable<IRenderable> DrawControlGroup(WorldRenderer wr, Actor self, int2 basePosition)
{
var group = self.World.Selection.GetControlGroupForActor(self);
if (group == null) return;
if (group == null)
yield break;
var pipImages = new Animation(self.World, "pips");
var pal = wr.Palette(Info.Palette);
pipImages.PlayFetchIndex("groups", () => (int)group);
pipImages.Tick();
var pos = wr.Viewport.WorldToViewPx(basePosition) - (0.5f * pipImages.Image.size).ToInt2() + new int2(9, 5);
Game.Renderer.SpriteRenderer.DrawSprite(pipImages.Image, pos, pal);
var pos = basePosition - (0.5f * pipImages.Image.size).ToInt2() + new int2(9, 5);
yield return new UISpriteRenderable(pipImages.Image, pos, 0, pal, 1f);
}
void DrawPips(WorldRenderer wr, Actor self, int2 basePosition)
IEnumerable<IRenderable> DrawPips(WorldRenderer wr, Actor self, int2 basePosition)
{
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
return;
yield break;
var pipSources = self.TraitsImplementing<IPips>();
if (!pipSources.Any())
return;
yield break;
var pipImages = new Animation(self.World, "pips");
pipImages.PlayRepeating(pipStrings[0]);
var pipSize = pipImages.Image.size.ToInt2();
var pipxyBase = wr.Viewport.WorldToViewPx(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 pal = wr.Palette(Info.Palette);
var width = self.Bounds.Value.Width;
@@ -101,7 +107,7 @@ namespace OpenRA.Traits
pipImages.PlayRepeating(pipStrings[(int)pip]);
pipxyOffset += new int2(pipSize.X, 0);
Game.Renderer.SpriteRenderer.DrawSprite(pipImages.Image, pipxyBase + pipxyOffset, pal);
yield return new UISpriteRenderable(pipImages.Image, pipxyBase + pipxyOffset, 0, pal, 1f);
}
// Increment row
@@ -110,15 +116,14 @@ namespace OpenRA.Traits
}
}
void DrawTags(WorldRenderer wr, Actor self, int2 basePosition)
IEnumerable<IRenderable> DrawTags(WorldRenderer wr, Actor self, int2 basePosition)
{
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
return;
yield break;
var tagImages = new Animation(self.World, "pips");
var pal = wr.Palette(Info.Palette);
var tagxyOffset = new int2(0, 6);
var tagBase = wr.Viewport.WorldToViewPx(basePosition);
foreach (var tags in self.TraitsImplementing<ITags>())
{
@@ -128,8 +133,8 @@ namespace OpenRA.Traits
continue;
tagImages.PlayRepeating(tagStrings[(int)tag]);
var pos = tagBase + tagxyOffset - (0.5f * tagImages.Image.size).ToInt2();
Game.Renderer.SpriteRenderer.DrawSprite(tagImages.Image, pos, pal);
var pos = basePosition + tagxyOffset - (0.5f * tagImages.Image.size).ToInt2();
yield return new UISpriteRenderable(tagImages.Image, pos, 0, pal, 1f);
// Increment row
tagxyOffset.Y += 8;

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

@@ -225,7 +225,7 @@ namespace OpenRA.Traits
public interface IPostRender { void RenderAfterWorld(WorldRenderer wr, Actor self); }
public interface IRenderShroud { void RenderShroud(WorldRenderer wr, Shroud shroud); }
public interface IPostRenderSelection { void RenderAfterWorld(WorldRenderer wr); }
public interface IPostRenderSelection { IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr); }
public interface IBodyOrientation
{
WAngle CameraPitch { get; }