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

Update ICustomMovementLayer to not depend on actor for costs.

Browse Source 
No implementations require the actor.
This commit is contained in:
RoosterDragon
2021-09-25 14:28:00 +01:00
committed by Paul Chote
parent 6f3b4ecae9
commit 3a020e96fe
6 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Pathfinder/PathGraph.cs
View File

@@ -103,7 +103,7 @@ namespace OpenRA.Mods.Common.Pathfinder
// PERF: Avoid LINQ // PERF: Avoid LINQ
foreach (var cml in world.GetCustomMovementLayers().Values) foreach (var cml in world.GetCustomMovementLayers().Values)
if (cml.EnabledForActor(actor.Info, locomotorInfo)) if (cml.EnabledForLocomotor(locomotorInfo))
customLayerInfo[cml.Index] = (cml, pooledLayer.GetLayer()); customLayerInfo[cml.Index] = (cml, pooledLayer.GetLayer());
World = world; World = world;
@@ -159,7 +159,7 @@ namespace OpenRA.Mods.Common.Pathfinder
foreach (var cli in customLayerInfo.Values) foreach (var cli in customLayerInfo.Values)
{ {
var layerPosition = new CPos(position.X, position.Y, cli.Layer.Index); var layerPosition = new CPos(position.X, position.Y, cli.Layer.Index);
var entryCost = cli.Layer.EntryMovementCost(Actor.Info, locomotor.Info, layerPosition); var entryCost = cli.Layer.EntryMovementCost(locomotor.Info, layerPosition);
if (entryCost != CostForInvalidCell) if (entryCost != CostForInvalidCell)
validNeighbors.Add(new GraphConnection(layerPosition, entryCost)); validNeighbors.Add(new GraphConnection(layerPosition, entryCost));
} }
@@ -167,7 +167,7 @@ namespace OpenRA.Mods.Common.Pathfinder
else else
{ {
var layerPosition = new CPos(position.X, position.Y, 0); var layerPosition = new CPos(position.X, position.Y, 0);
var exitCost = customLayerInfo[posLayer].Layer.ExitMovementCost(Actor.Info, locomotor.Info, layerPosition); var exitCost = customLayerInfo[posLayer].Layer.ExitMovementCost(locomotor.Info, layerPosition);
if (exitCost != CostForInvalidCell) if (exitCost != CostForInvalidCell)
validNeighbors.Add(new GraphConnection(layerPosition, exitCost)); validNeighbors.Add(new GraphConnection(layerPosition, exitCost));
} }

11
OpenRA.Mods.Common/Traits/World/ElevatedBridgeLayer.cs
View File

@@ -11,6 +11,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Pathfinder;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -69,7 +70,7 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return enabled; } bool ICustomMovementLayer.EnabledForLocomotor(LocomotorInfo li) { return enabled; }
byte ICustomMovementLayer.Index => CustomMovementLayerType.ElevatedBridge; byte ICustomMovementLayer.Index => CustomMovementLayerType.ElevatedBridge;
bool ICustomMovementLayer.InteractsWithDefaultLayer => true; bool ICustomMovementLayer.InteractsWithDefaultLayer => true;
bool ICustomMovementLayer.ReturnToGroundLayerOnIdle => false; bool ICustomMovementLayer.ReturnToGroundLayerOnIdle => false;
@@ -79,14 +80,14 @@ namespace OpenRA.Mods.Common.Traits
return cellCenters[cell]; return cellCenters[cell];
} }
int ICustomMovementLayer.EntryMovementCost(ActorInfo a, LocomotorInfo li, CPos cell) int ICustomMovementLayer.EntryMovementCost(LocomotorInfo li, CPos cell)
{ {
return ends.Contains(cell) ? 0 : int.MaxValue; return ends.Contains(cell) ? 0 : PathGraph.CostForInvalidCell;
} }
int ICustomMovementLayer.ExitMovementCost(ActorInfo a, LocomotorInfo li, CPos cell) int ICustomMovementLayer.ExitMovementCost(LocomotorInfo li, CPos cell)
{ {
return ends.Contains(cell) ? 0 : int.MaxValue; return ends.Contains(cell) ? 0 : PathGraph.CostForInvalidCell;
} }
byte ICustomMovementLayer.GetTerrainIndex(CPos cell) byte ICustomMovementLayer.GetTerrainIndex(CPos cell)

11
OpenRA.Mods.Common/Traits/World/JumpjetActorLayer.cs
View File

@@ -10,6 +10,7 @@
#endregion #endregion
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Pathfinder;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -62,7 +63,7 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return li is JumpjetLocomotorInfo; } bool ICustomMovementLayer.EnabledForLocomotor(LocomotorInfo li) { return li is JumpjetLocomotorInfo; }
byte ICustomMovementLayer.Index => CustomMovementLayerType.Jumpjet; byte ICustomMovementLayer.Index => CustomMovementLayerType.Jumpjet;
bool ICustomMovementLayer.InteractsWithDefaultLayer => true; bool ICustomMovementLayer.InteractsWithDefaultLayer => true;
bool ICustomMovementLayer.ReturnToGroundLayerOnIdle => true; bool ICustomMovementLayer.ReturnToGroundLayerOnIdle => true;
@@ -86,16 +87,16 @@ namespace OpenRA.Mods.Common.Traits
return map.Ramp[cell] == 0; return map.Ramp[cell] == 0;
} }
int ICustomMovementLayer.EntryMovementCost(ActorInfo a, LocomotorInfo li, CPos cell) int ICustomMovementLayer.EntryMovementCost(LocomotorInfo li, CPos cell)
{ {
var jli = (JumpjetLocomotorInfo)li; var jli = (JumpjetLocomotorInfo)li;
return ValidTransitionCell(cell, jli) ? jli.JumpjetTransitionCost : int.MaxValue; return ValidTransitionCell(cell, jli) ? jli.JumpjetTransitionCost : PathGraph.CostForInvalidCell;
} }
int ICustomMovementLayer.ExitMovementCost(ActorInfo a, LocomotorInfo li, CPos cell) int ICustomMovementLayer.ExitMovementCost(LocomotorInfo li, CPos cell)
{ {
var jli = (JumpjetLocomotorInfo)li; var jli = (JumpjetLocomotorInfo)li;
return ValidTransitionCell(cell, jli) ? jli.JumpjetTransitionCost : int.MaxValue; return ValidTransitionCell(cell, jli) ? jli.JumpjetTransitionCost : PathGraph.CostForInvalidCell;
} }
byte ICustomMovementLayer.GetTerrainIndex(CPos cell) byte ICustomMovementLayer.GetTerrainIndex(CPos cell)

11
OpenRA.Mods.Common/Traits/World/SubterraneanActorLayer.cs
View File

@@ -10,6 +10,7 @@
#endregion #endregion
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Pathfinder;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -61,7 +62,7 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return li is SubterraneanLocomotorInfo; } bool ICustomMovementLayer.EnabledForLocomotor(LocomotorInfo li) { return li is SubterraneanLocomotorInfo; }
byte ICustomMovementLayer.Index => CustomMovementLayerType.Subterranean; byte ICustomMovementLayer.Index => CustomMovementLayerType.Subterranean;
bool ICustomMovementLayer.InteractsWithDefaultLayer => false; bool ICustomMovementLayer.InteractsWithDefaultLayer => false;
bool ICustomMovementLayer.ReturnToGroundLayerOnIdle => true; bool ICustomMovementLayer.ReturnToGroundLayerOnIdle => true;
@@ -84,16 +85,16 @@ namespace OpenRA.Mods.Common.Traits
return map.Ramp[cell] == 0; return map.Ramp[cell] == 0;
} }
int ICustomMovementLayer.EntryMovementCost(ActorInfo a, LocomotorInfo li, CPos cell) int ICustomMovementLayer.EntryMovementCost(LocomotorInfo li, CPos cell)
{ {
var sli = (SubterraneanLocomotorInfo)li; var sli = (SubterraneanLocomotorInfo)li;
return ValidTransitionCell(cell, sli) ? sli.SubterraneanTransitionCost : int.MaxValue; return ValidTransitionCell(cell, sli) ? sli.SubterraneanTransitionCost : PathGraph.CostForInvalidCell;
} }
int ICustomMovementLayer.ExitMovementCost(ActorInfo a, LocomotorInfo li, CPos cell) int ICustomMovementLayer.ExitMovementCost(LocomotorInfo li, CPos cell)
{ {
var sli = (SubterraneanLocomotorInfo)li; var sli = (SubterraneanLocomotorInfo)li;
return ValidTransitionCell(cell, sli) ? sli.SubterraneanTransitionCost : int.MaxValue; return ValidTransitionCell(cell, sli) ? sli.SubterraneanTransitionCost : PathGraph.CostForInvalidCell;
} }
byte ICustomMovementLayer.GetTerrainIndex(CPos cell) byte ICustomMovementLayer.GetTerrainIndex(CPos cell)

11
OpenRA.Mods.Common/Traits/World/TerrainTunnelLayer.cs
View File

@@ -11,6 +11,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Pathfinder;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -68,7 +69,7 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return enabled; } bool ICustomMovementLayer.EnabledForLocomotor(LocomotorInfo li) { return enabled; }
byte ICustomMovementLayer.Index => CustomMovementLayerType.Tunnel; byte ICustomMovementLayer.Index => CustomMovementLayerType.Tunnel;
bool ICustomMovementLayer.InteractsWithDefaultLayer => false; bool ICustomMovementLayer.InteractsWithDefaultLayer => false;
bool ICustomMovementLayer.ReturnToGroundLayerOnIdle => true; bool ICustomMovementLayer.ReturnToGroundLayerOnIdle => true;
@@ -78,14 +79,14 @@ namespace OpenRA.Mods.Common.Traits
return cellCenters[cell]; return cellCenters[cell];
} }
int ICustomMovementLayer.EntryMovementCost(ActorInfo a, LocomotorInfo li, CPos cell) int ICustomMovementLayer.EntryMovementCost(LocomotorInfo li, CPos cell)
{ {
return portals.Contains(cell) ? 0 : int.MaxValue; return portals.Contains(cell) ? 0 : PathGraph.CostForInvalidCell;
} }
int ICustomMovementLayer.ExitMovementCost(ActorInfo a, LocomotorInfo li, CPos cell) int ICustomMovementLayer.ExitMovementCost(LocomotorInfo li, CPos cell)
{ {
return portals.Contains(cell) ? 0 : int.MaxValue; return portals.Contains(cell) ? 0 : PathGraph.CostForInvalidCell;
} }
byte ICustomMovementLayer.GetTerrainIndex(CPos cell) byte ICustomMovementLayer.GetTerrainIndex(CPos cell)

6
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -403,9 +403,9 @@ namespace OpenRA.Mods.Common.Traits
bool InteractsWithDefaultLayer { get; } bool InteractsWithDefaultLayer { get; }
bool ReturnToGroundLayerOnIdle { get; } bool ReturnToGroundLayerOnIdle { get; }
bool EnabledForActor(ActorInfo a, LocomotorInfo li); bool EnabledForLocomotor(LocomotorInfo li);
int EntryMovementCost(ActorInfo a, LocomotorInfo li, CPos cell); int EntryMovementCost(LocomotorInfo li, CPos cell);
int ExitMovementCost(ActorInfo a, LocomotorInfo li, CPos cell); int ExitMovementCost(LocomotorInfo li, CPos cell);
byte GetTerrainIndex(CPos cell); byte GetTerrainIndex(CPos cell);
WPos CenterOfCell(CPos cell); WPos CenterOfCell(CPos cell);