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

Move Render*Circle traits to their base traits.

Browse Source
This commit is contained in:
Matthias Mailänder
2020-04-21 16:17:04 +02:00
committed by reaperrr
parent 7ebca36a9c
commit 86a7a0bd6c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
OpenRA.Mods.Cnc/Traits/Render/RenderJammerCircle.cs
View File

@@ -1,65 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits
{
// TODO: remove all the Render*Circle duplication
class RenderJammerCircleInfo : TraitInfo<RenderJammerCircle>, IPlaceBuildingDecorationInfo
{
public IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{
var jamsMissiles = ai.TraitInfoOrDefault<JamsMissilesInfo>();
if (jamsMissiles != null)
{
yield return new RangeCircleAnnotationRenderable(
centerPosition,
jamsMissiles.Range,
0,
Color.FromArgb(128, Color.Red),
Color.FromArgb(96, Color.Black));
}
foreach (var a in w.ActorsWithTrait<RenderJammerCircle>())
if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer))
foreach (var r in a.Trait.RenderAnnotations(a.Actor, wr))
yield return r;
}
}
class RenderJammerCircle : IRenderAnnotationsWhenSelected
{
public IEnumerable<IRenderable> RenderAnnotations(Actor self, WorldRenderer wr)
{
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
var jamsMissiles = self.Info.TraitInfoOrDefault<JamsMissilesInfo>();
if (jamsMissiles != null)
{
yield return new RangeCircleAnnotationRenderable(
self.CenterPosition,
jamsMissiles.Range,
0,
Color.FromArgb(128, Color.Red),
Color.FromArgb(96, Color.Black));
}
}
bool IRenderAnnotationsWhenSelected.SpatiallyPartitionable { get { return false; } }
}
}

92
OpenRA.Mods.Cnc/Traits/Render/RenderShroudCircle.cs
View File

@@ -1,92 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits
{
class RenderShroudCircleInfo : ITraitInfo, IPlaceBuildingDecorationInfo
{
[Desc("Color of the circle.")]
public readonly Color Color = Color.FromArgb(128, Color.Cyan);
[Desc("Contrast color of the circle.")]
public readonly Color ContrastColor = Color.FromArgb(96, Color.Black);
public IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{
var localRange = ai.TraitInfos<CreatesShroudInfo>()
.Where(csi => csi.EnabledByDefault)
.Select(csi => csi.Range)
.DefaultIfEmpty(WDist.Zero)
.Max();
var localRangeRenderable = new RangeCircleAnnotationRenderable(
centerPosition,
localRange,
0,
Color,
ContrastColor);
var otherRangeRenderables = w.ActorsWithTrait<RenderShroudCircle>()
.SelectMany(a => a.Trait.RangeCircleRenderables(a.Actor, wr));
return otherRangeRenderables.Append(localRangeRenderable);
}
public object Create(ActorInitializer init) { return new RenderShroudCircle(init.Self, this); }
}
class RenderShroudCircle : INotifyCreated, IRenderAnnotationsWhenSelected
{
readonly RenderShroudCircleInfo info;
WDist range;
public RenderShroudCircle(Actor self, RenderShroudCircleInfo info)
{
this.info = info;
}
void INotifyCreated.Created(Actor self)
{
range = self.TraitsImplementing<CreatesShroud>()
.Select(cs => cs.Info.Range)
.DefaultIfEmpty(WDist.Zero)
.Max();
}
public IEnumerable<IRenderable> RangeCircleRenderables(Actor self, WorldRenderer wr)
{
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
yield return new RangeCircleAnnotationRenderable(
self.CenterPosition,
range,
0,
info.Color,
info.ContrastColor);
}
IEnumerable<IRenderable> IRenderAnnotationsWhenSelected.RenderAnnotations(Actor self, WorldRenderer wr)
{
return RangeCircleRenderables(self, wr);
}
bool IRenderAnnotationsWhenSelected.SpatiallyPartitionable { get { return false; } }
}
}