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

rename RangeSquard to LengthSquared

Browse Source
This commit is contained in:
Matthias Mailänder
2015-07-09 21:13:54 +02:00
parent cae889fb67
commit 56e9bcd96e
15 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/Target.cs
View File

@@ -146,7 +146,7 @@ namespace OpenRA.Traits
return false;
// Target ranges are calculated in 2D, so ignore height differences
return Positions.Any(t => (t - origin).HorizontalLengthSquared <= range.RangeSquared);
return Positions.Any(t => (t - origin).HorizontalLengthSquared <= range.LengthSquared);
}
public override string ToString()

2
OpenRA.Game/Traits/World/ActorMap.cs
View File

@@ -132,7 +132,7 @@ namespace OpenRA.Traits
var oldActors = currentActors;
var delta = new WVec(Range, Range, WDist.Zero);
currentActors = am.ActorsInBox(Position - delta, Position + delta)
.Where(a => (a.CenterPosition - Position).HorizontalLengthSquared < Range.RangeSquared)
.Where(a => (a.CenterPosition - Position).HorizontalLengthSquared < Range.LengthSquared)
.ToList();
var entered = currentActors.Except(oldActors);

2
OpenRA.Game/Traits/World/Shroud.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Traits
public static IEnumerable<CPos> CellsInRange(Map map, WPos pos, WDist range)
{
var r = (range.Length + 1023) / 1024;
var limit = range.RangeSquared;
var limit = range.LengthSquared;
var cell = map.CellContaining(pos);
foreach (var c in map.FindTilesInCircle(cell, r, true))

2
OpenRA.Game/WDist.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA
public struct WDist : IComparable, IComparable<WDist>, IEquatable<WDist>, IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding
{
public readonly int Length;
public long RangeSquared { get { return (long)Length * (long)Length; } }
public long LengthSquared { get { return (long)Length * (long)Length; } }
public WDist(int r) { Length = r; }
public static readonly WDist Zero = new WDist(0);

2
OpenRA.Game/WorldUtils.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA
// Target ranges are calculated in 2D, so ignore height differences
var vec = new WVec(r, r, WDist.Zero);
return world.ActorMap.ActorsInBox(origin - vec, origin + vec).Where(
a => (a.CenterPosition - origin).HorizontalLengthSquared <= r.RangeSquared);
a => (a.CenterPosition - origin).HorizontalLengthSquared <= r.LengthSquared);
}
}