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

Convert DrawLineToTarget to world coords.

Browse Source
This commit is contained in:
Paul Chote
2013-07-06 19:18:20 +12:00
parent f9ec5fd9b7
commit 2a0eff2ed0
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,8 +52,6 @@ namespace OpenRA.Traits
public void RenderAfterWorld(WorldRenderer wr) public void RenderAfterWorld(WorldRenderer wr)
{ {
//if (self.IsIdle) return;
var force = Game.GetModifierKeys().HasModifier(Modifiers.Alt); var force = Game.GetModifierKeys().HasModifier(Modifiers.Alt);
if ((lifetime <= 0 || --lifetime <= 0) && !force) if ((lifetime <= 0 || --lifetime <= 0) && !force)
return; return;
@@ -61,9 +59,7 @@ namespace OpenRA.Traits
if (targets == null || targets.Count == 0) if (targets == null || targets.Count == 0)
return; return;
var move = self.TraitOrDefault<IMove>(); var from = wr.ScreenPxPosition(self.CenterPosition);
var origin = (move != null ? self.CenterLocation - new PVecInt(0, move.Altitude) : self.CenterLocation).ToFloat2();
var wlr = Game.Renderer.WorldLineRenderer; var wlr = Game.Renderer.WorldLineRenderer;
foreach (var target in targets) foreach (var target in targets)
@@ -71,9 +67,10 @@ namespace OpenRA.Traits
if (!target.IsValid) if (!target.IsValid)
continue; continue;
wlr.DrawLine(origin, target.CenterLocation.ToFloat2(), c, c); var to = wr.ScreenPxPosition(target.CenterPosition);
DrawTargetMarker(wlr, target.CenterLocation.ToFloat2()); wlr.DrawLine(from, to, c, c);
DrawTargetMarker(wlr, origin); DrawTargetMarker(wlr, from);
DrawTargetMarker(wlr, to);
} }
} }