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

Implement height-aware map.DistanceToEdge().

Browse Source
This commit is contained in:
Paul Chote
2015-07-26 19:35:00 +01:00
parent 318d6aaa73
commit 05f41a0182
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Map/Map.cs
View File

@@ -1043,12 +1043,9 @@ namespace OpenRA
public WDist DistanceToEdge(WPos pos, WVec dir) public WDist DistanceToEdge(WPos pos, WVec dir)
{ {
// TODO: Account for terrain height var projectedPos = pos - new WVec(0, pos.Z, pos.Z);
// Project into the screen plane and then compare against ProjectedWorldBounds. var x = dir.X == 0 ? int.MaxValue : ((dir.X < 0 ? ProjectedTopLeft.X : ProjectedBottomRight.X) - projectedPos.X) / dir.X;
var tl = CenterOfCell(((MPos)ProjectedCellBounds.TopLeft).ToCPos(this)) - new WVec(512, 512, 0); var y = dir.Y == 0 ? int.MaxValue : ((dir.Y < 0 ? ProjectedTopLeft.Y : ProjectedBottomRight.Y) - projectedPos.Y) / dir.Y;
var br = CenterOfCell(((MPos)ProjectedCellBounds.BottomRight).ToCPos(this)) + new WVec(511, 511, 0);
var x = dir.X == 0 ? int.MaxValue : ((dir.X < 0 ? tl.X : br.X) - pos.X) / dir.X;
var y = dir.Y == 0 ? int.MaxValue : ((dir.Y < 0 ? tl.Y : br.Y) - pos.Y) / dir.Y;
return new WDist(Math.Min(x, y) * dir.Length); return new WDist(Math.Min(x, y) * dir.Length);
} }