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

Account for sub-cell offsets in FindUnitPathToRange. Fixes #2417.

Browse Source
This commit is contained in:
Paul Chote
2013-07-10 21:17:25 +12:00
parent b10a5d27a0
commit a263fd879d
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/Move/Move.cs
View File

@@ -75,9 +75,8 @@ namespace OpenRA.Mods.RA.Move
if (!target.IsValid) if (!target.IsValid)
return NoPath; return NoPath;
// TODO: Adjust range to account for target center position
return self.World.WorldActor.Trait<PathFinder>().FindUnitPathToRange( return self.World.WorldActor.Trait<PathFinder>().FindUnitPathToRange(
mobile.toCell, target.CenterPosition.ToCPos(), range.Range / 1024, self); mobile.toCell, mobile.toSubCell, target.CenterPosition, range, self);
}; };
this.destination = null; this.destination = null;

18
OpenRA.Mods.RA/Move/PathFinder.cs
View File

@@ -68,17 +68,27 @@ namespace OpenRA.Mods.RA.Move
} }
} }
public List<CPos> FindUnitPathToRange(CPos src, CPos target, int range, Actor self) public List<CPos> FindUnitPathToRange(CPos src, SubCell srcSub, WPos target, WRange range, Actor self)
{ {
using (new PerfSample("Pathfinder")) using (new PerfSample("Pathfinder"))
{ {
var mi = self.Info.Traits.Get<MobileInfo>(); var mi = self.Info.Traits.Get<MobileInfo>();
var tilesInRange = world.FindTilesInCircle(target, range) var targetCell = target.ToCPos();
.Where(t => mi.CanEnterCell(self.World, self, t, null, true, true)); var rangeSquared = range.Range*range.Range;
// Correct for SubCell offset
var so = MobileInfo.SubCellOffsets[srcSub];
target -= new WVec(so.X * 1024 / Game.CellSize, so.Y * 1024 / Game.CellSize, 0);
// 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.FindTilesInCircle(targetCell, range.Range / 1024 + 1)
.Where(t => (t.CenterPosition - target).LengthSquared <= rangeSquared
&& mi.CanEnterCell(self.World, self, t, null, true, true));
var path = FindBidiPath( var path = FindBidiPath(
PathSearch.FromPoints(world, mi, self, tilesInRange, src, true), PathSearch.FromPoints(world, mi, self, tilesInRange, src, true),
PathSearch.FromPoint(world, mi, self, src, target, true).InReverse() PathSearch.FromPoint(world, mi, self, src, targetCell, true).InReverse()
); );
return path; return path;