Convert DrawLineToTarget to world coords.

This commit is contained in:
Paul Chote
2013-07-06 19:18:20 +12:00
parent f9ec5fd9b7
commit 2a0eff2ed0

View File

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