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

add new long WRange.RangeSquared to avoid integer overflows

Browse Source
This commit is contained in:
Matthias Mailänder
2015-05-31 23:51:30 +02:00
parent 79edf648a7
commit ea5003cd2d
15 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,8 +146,7 @@ namespace OpenRA.Traits
return false;
// Target ranges are calculated in 2D, so ignore height differences
var rangeSquared = range.Range * range.Range;
return Positions.Any(t => (t - origin).HorizontalLengthSquared <= rangeSquared);
return Positions.Any(t => (t - origin).HorizontalLengthSquared <= range.RangeSquared);
}
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, WRange.Zero);
currentActors = am.ActorsInBox(Position - delta, Position + delta)
.Where(a => (a.CenterPosition - Position).HorizontalLengthSquared < Range.Range * Range.Range)
.Where(a => (a.CenterPosition - Position).HorizontalLengthSquared < Range.RangeSquared)
.ToList();
var entered = currentActors.Except(oldActors);

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

@@ -109,7 +109,7 @@ namespace OpenRA.Traits
{
var map = world.Map;
var r = (radius.Range + 1023) / 1024;
var limit = radius.Range * radius.Range;
var limit = radius.RangeSquared;
var pos = map.CenterOfCell(position);
foreach (var cell in map.FindTilesInCircle(position, r))

1
OpenRA.Game/WRange.cs
View File

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

3
OpenRA.Game/WorldUtils.cs
View File

@@ -36,9 +36,8 @@ namespace OpenRA
{
// Target ranges are calculated in 2D, so ignore height differences
var vec = new WVec(r, r, WRange.Zero);
var rSq = r.Range * r.Range;
return world.ActorMap.ActorsInBox(origin - vec, origin + vec).Where(
a => (a.CenterPosition - origin).HorizontalLengthSquared <= rSq);
a => (a.CenterPosition - origin).HorizontalLengthSquared <= r.RangeSquared);
}
}

3
OpenRA.Mods.Common/Activities/Enter.cs
View File

@@ -54,11 +54,10 @@ namespace OpenRA.Mods.Common.Activities
protected bool TryGetAlternateTargetInCircle(
Actor self, WRange radius, Action<Target> update, Func<Actor, bool> primaryFilter, Func<Actor, bool>[] preferenceFilters = null)
{
var radiusSquared = radius.Range * radius.Range;
var diff = new WVec(radius, radius, WRange.Zero);
var candidates = self.World.ActorMap.ActorsInBox(self.CenterPosition - diff, self.CenterPosition + diff)
.Where(primaryFilter).Select(a => new { Actor = a, Ls = (self.CenterPosition - a.CenterPosition).HorizontalLengthSquared })
.Where(p => p.Ls <= radiusSquared).OrderBy(p => p.Ls).Select(p => p.Actor);
.Where(p => p.Ls <= radius.RangeSquared).OrderBy(p => p.Ls).Select(p => p.Actor);
if (preferenceFilters != null)
foreach (var filter in preferenceFilters)
{

4
OpenRA.Mods.Common/Activities/Move/MoveWithinRange.cs
View File

@@ -48,8 +48,8 @@ namespace OpenRA.Mods.Common.Activities
var maxCells = (maxRange.Range + 1023) / 1024;
var minCells = minRange.Range / 1024;
var outerSq = maxRange.Range * maxRange.Range;
var innerSq = minRange.Range * minRange.Range;
var outerSq = maxRange.RangeSquared;
var innerSq = minRange.RangeSquared;
var center = Target.CenterPosition;
return map.FindTilesInAnnulus(targetPosition, minCells + 1, maxCells).Where(c =>

2
OpenRA.Mods.Common/Effects/Missile.cs
View File

@@ -181,7 +181,7 @@ namespace OpenRA.Mods.Common.Effects
var cell = world.Map.CellContaining(pos);
var shouldExplode = (pos.Z < 0) // Hit the ground
|| (dist.LengthSquared < info.CloseEnough.Range * info.CloseEnough.Range) // Within range
|| (dist.LengthSquared < info.CloseEnough.RangeSquared) // Within range
|| (info.RangeLimit != 0 && ticks > info.RangeLimit) // Ran out of fuel
|| (info.Blockable && world.ActorMap.GetUnitsAt(cell).Any(a => a.HasTrait<IBlocksProjectiles>())) // Hit a wall or other blocking obstacle
|| !world.Map.Contains(cell) // This also avoids an IndexOutOfRangeException in GetTerrainInfo below.

2
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -110,7 +110,7 @@ namespace OpenRA.Mods.Common.Traits
var d = self.CenterPosition - other.CenterPosition;
var distSq = d.HorizontalLengthSquared;
if (distSq > info.IdealSeparation.Range * info.IdealSeparation.Range)
if (distSq > info.IdealSeparation.RangeSquared)
return WVec.Zero;
if (distSq < 1)

3
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -262,9 +262,8 @@ namespace OpenRA.Mods.Common.Traits
if (modifiers.HasModifier(TargetModifiers.ForceAttack))
{
var maxRange = ab.GetMaximumRange().Range;
var targetRange = (self.World.Map.CenterOfCell(location) - self.CenterPosition).HorizontalLengthSquared;
if (targetRange > maxRange * maxRange)
if (targetRange > ab.GetMaximumRange().RangeSquared)
cursor = ab.Info.OutsideRangeCursor;
return true;

2
OpenRA.Mods.Common/Traits/Repairable.cs
View File

@@ -141,7 +141,7 @@ namespace OpenRA.Mods.Common.Traits
return;
var targetCell = self.World.Map.CellContaining(target.CenterPosition);
if ((self.CenterPosition - target.CenterPosition).LengthSquared < transport.MinimumDistance.Range * transport.MinimumDistance.Range)
if ((self.CenterPosition - target.CenterPosition).LengthSquared < transport.MinimumDistance.RangeSquared)
return;
transport.RequestTransport(targetCell, nextActivity);

2
OpenRA.Mods.Common/Traits/Upgrades/UpgradeActorsNear.cs
View File

@@ -106,7 +106,7 @@ namespace OpenRA.Mods.Common.Traits
public void UnitProducedByOther(Actor self, Actor producer, Actor produced)
{
// Work around for actors produced within the region not triggering until the second tick
if ((produced.CenterPosition - self.CenterPosition).HorizontalLengthSquared <= info.Range.Range * info.Range.Range)
if ((produced.CenterPosition - self.CenterPosition).HorizontalLengthSquared <= info.Range.RangeSquared)
{
var stance = self.Owner.Stances[produced.Owner];
if (!info.ValidStances.HasFlag(stance))

3
OpenRA.Mods.Common/Traits/World/PathFinder.cs
View File

@@ -85,7 +85,6 @@ namespace OpenRA.Mods.Common.Traits
{
var mi = self.Info.Traits.Get<MobileInfo>();
var targetCell = world.Map.CellContaining(target);
var rangeSquared = range.Range * range.Range;
// Correct for SubCell offset
target -= world.Map.OffsetOfSubCell(srcSub);
@@ -93,7 +92,7 @@ namespace OpenRA.Mods.Common.Traits
// Select only the tiles that are within range from the requested SubCell
// This assumes that the SubCell does not change during the path traversal
var tilesInRange = world.Map.FindTilesInCircle(targetCell, range.Range / 1024 + 1)
.Where(t => (world.Map.CenterOfCell(t) - target).LengthSquared <= rangeSquared
.Where(t => (world.Map.CenterOfCell(t) - target).LengthSquared <= range.RangeSquared
&& mi.CanEnterCell(self.World as World, self as Actor, t));
// See if there is any cell within range that does not involve a cross-domain request

2
OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA.Mods.Common.Warheads
continue;
// If the impact position is within any actor's health radius, we have a direct hit
if ((unit.CenterPosition - pos).LengthSquared <= healthInfo.Radius.Range * healthInfo.Radius.Range)
if ((unit.CenterPosition - pos).LengthSquared <= healthInfo.Radius.RangeSquared)
return true;
}

6
OpenRA.Mods.D2k/Traits/Carryable.cs
View File

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.D2k.Traits
public void RequestTransport(CPos destination, Activity afterLandActivity)
{
var destPos = self.World.Map.CenterOfCell(destination);
if (destination == CPos.Zero || (self.CenterPosition - destPos).LengthSquared < info.MinDistance.Range * info.MinDistance.Range)
if (destination == CPos.Zero || (self.CenterPosition - destPos).LengthSquared < info.MinDistance.RangeSquared)
{
WantsTransport = false; // Be sure to cancel any pending transports
return;
@@ -120,7 +120,7 @@ namespace OpenRA.Mods.D2k.Traits
return false;
var destPos = self.World.Map.CenterOfCell(Destination);
if ((self.CenterPosition - destPos).LengthSquared < info.MinDistance.Range * info.MinDistance.Range)
if ((self.CenterPosition - destPos).LengthSquared < info.MinDistance.RangeSquared)
{
MovementCancelled(self);
return false;
@@ -148,7 +148,7 @@ namespace OpenRA.Mods.D2k.Traits
// Last change to change our mind...
var destPos = self.World.Map.CenterOfCell(Destination);
if ((self.CenterPosition - destPos).LengthSquared < info.MinDistance.Range * info.MinDistance.Range)
if ((self.CenterPosition - destPos).LengthSquared < info.MinDistance.RangeSquared)
{
MovementCancelled(self);
return false;