From 13244d17f10e7af87afbfbfb00bed96ad86512db Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 1 Aug 2010 11:32:09 +1200 Subject: [PATCH] format and clean up DrawLineToTarget --- OpenRA.Game/Traits/DrawLineToTarget.cs | 116 ++++++++++++------------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/OpenRA.Game/Traits/DrawLineToTarget.cs b/OpenRA.Game/Traits/DrawLineToTarget.cs index cae3c36bbe..daba9d5a04 100644 --- a/OpenRA.Game/Traits/DrawLineToTarget.cs +++ b/OpenRA.Game/Traits/DrawLineToTarget.cs @@ -9,64 +9,62 @@ #endregion using System.Drawing; -using OpenRA.Traits.Activities; - -namespace OpenRA.Traits -{ - public class DrawLineToTargetInfo : ITraitInfo - { - public readonly int Ticks = 60; - - public virtual object Create(ActorInitializer init) { return new DrawLineToTarget(this); } - } - - public class DrawLineToTarget :IPostRenderSelection - { - DrawLineToTargetInfo Info; - public DrawLineToTarget(DrawLineToTargetInfo info) - { - this.Info = info; - } - - Target target; - int lifetime; - Color c; - - public void SetTarget(Actor self, Target target, Color c) - { - this.target = target; - lifetime = Info.Ticks; - this.c = c; - } - - public void SetTargetSilently(Actor self, Target target, Color c) - { - this.target = target; - this.c = c; - } - - public void RenderAfterWorld (Actor self) - { - var activity = self.GetCurrentActivity(); - if (activity == null || activity is Idle) - return; - - var force = Game.GetModifierKeys().HasModifier(Modifiers.Alt); - if ((lifetime <= 0 || --lifetime <= 0) && !force) - return; - - var p = target.CenterLocation; - - Game.Renderer.LineRenderer.DrawLine(self.CenterLocation, p, c, c); - for (bool b = false; !b; p = self.CenterLocation, b = true) - { - Game.Renderer.LineRenderer.DrawLine(p + new float2(-1, -1), p + new float2(-1, 1), c, c); - Game.Renderer.LineRenderer.DrawLine(p + new float2(-1, 1), p + new float2(1, 1), c, c); - Game.Renderer.LineRenderer.DrawLine(p + new float2(1, 1), p + new float2(1, -1), c, c); - Game.Renderer.LineRenderer.DrawLine(p + new float2(1, -1), p + new float2(-1, -1), c, c); - } - Game.Renderer.LineRenderer.Flush(); - } - } +using OpenRA.Traits.Activities; + +namespace OpenRA.Traits +{ + public class DrawLineToTargetInfo : ITraitInfo + { + public readonly int Ticks = 60; + + public virtual object Create(ActorInitializer init) { return new DrawLineToTarget(this); } + } + + public class DrawLineToTarget : IPostRenderSelection + { + DrawLineToTargetInfo Info; + public DrawLineToTarget(DrawLineToTargetInfo info) + { + this.Info = info; + } + + Target target; + int lifetime; + Color c; + + public void SetTarget(Actor self, Target target, Color c) + { + this.target = target; + lifetime = Info.Ticks; + this.c = c; + } + + public void SetTargetSilently(Actor self, Target target, Color c) + { + this.target = target; + this.c = c; + } + + public void RenderAfterWorld(Actor self) + { + if (self.IsIdle) return; + + var force = Game.GetModifierKeys().HasModifier(Modifiers.Alt); + if ((lifetime <= 0 || --lifetime <= 0) && !force) + return; + + var p = target.CenterLocation; + + Game.Renderer.LineRenderer.DrawLine(self.CenterLocation, p, c, c); + for (bool b = false; !b; p = self.CenterLocation, b = true) + { + Game.Renderer.LineRenderer.DrawLine(p + new float2(-1, -1), p + new float2(-1, 1), c, c); + Game.Renderer.LineRenderer.DrawLine(p + new float2(-1, 1), p + new float2(1, 1), c, c); + Game.Renderer.LineRenderer.DrawLine(p + new float2(1, 1), p + new float2(1, -1), c, c); + Game.Renderer.LineRenderer.DrawLine(p + new float2(1, -1), p + new float2(-1, -1), c, c); + } + Game.Renderer.LineRenderer.Flush(); + } + } }