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

Exposed PathSearch.owner and removed Player argument from PathFinder functions.

Browse Source
This commit is contained in:
Matthias Mailänder
2013-03-06 17:26:07 +01:00
parent 493eb10b96
commit 2abde381a7
4 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,13 +90,29 @@ namespace OpenRA.Mods.RA.Move
using (new PerfSample("Pathfinder"))
{
using (search)
{
List<CPos> path = null;
while (!search.queue.Empty)
{
var p = search.Expand(world);
if (search.heuristic(p) == 0)
return MakePath(search.cellInfo, p);
{
path = MakePath(search.cellInfo, p);
break;
}
}
var dbg = world.WorldActor.TraitOrDefault<DebugOverlay>();
if (dbg != null)
{
dbg.AddLayer(search.considered.Select(p => new Pair<CPos, int>(p, search.cellInfo[p.X, p.Y].MinCost)), search.maxCost, search.owner);
}
if (path != null)
return path;
}
// no path exists
return new List<CPos>(0);
}
@@ -120,8 +136,7 @@ namespace OpenRA.Mods.RA.Move
public List<CPos> FindBidiPath( /* searches from both ends toward each other */
PathSearch fromSrc,
PathSearch fromDest,
Player onBehalfOf)
PathSearch fromDest)
{
using (new PerfSample("Pathfinder"))
{
@@ -156,8 +171,8 @@ namespace OpenRA.Mods.RA.Move
var dbg = world.WorldActor.TraitOrDefault<DebugOverlay>();
if (dbg != null)
{
dbg.AddLayer(fromSrc.considered.Select(p => new Pair<CPos, int>(p, fromSrc.cellInfo[p.X, p.Y].MinCost)), fromSrc.maxCost, onBehalfOf);
dbg.AddLayer(fromDest.considered.Select(p => new Pair<CPos, int>(p, fromDest.cellInfo[p.X, p.Y].MinCost)), fromDest.maxCost, onBehalfOf);
dbg.AddLayer(fromSrc.considered.Select(p => new Pair<CPos, int>(p, fromSrc.cellInfo[p.X, p.Y].MinCost)), fromSrc.maxCost, fromSrc.owner);
dbg.AddLayer(fromDest.considered.Select(p => new Pair<CPos, int>(p, fromDest.cellInfo[p.X, p.Y].MinCost)), fromDest.maxCost, fromDest.owner);
}
if (path != null)