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

Cache cell ramps to avoid repeated tileset lookups.

Browse Source
This commit is contained in:
Paul Chote
2020-05-04 00:20:48 +01:00
committed by atlimit8
parent 1354ffc32e
commit 4614f6febe
9 changed files with 37 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Buildings/BuildingUtils.cs
View File

@@ -39,14 +39,8 @@ namespace OpenRA.Mods.Common.Traits
else if (!bi.AllowInvalidPlacement && world.ActorMap.GetActorsAt(cell).Any(a => a != toIgnore))
return false;
var tile = world.Map.Tiles[cell];
var tileInfo = world.Map.Rules.TileSet.GetTileInfo(tile);
// TODO: This is bandaiding over bogus tilesets.
if (tileInfo != null && tileInfo.RampType > 0)
return false;
return bi.TerrainTypes.Contains(world.Map.GetTerrainInfo(cell).Type);
// Buildings can never be placed on ramps
return world.Map.Ramp[cell] == 0 && bi.TerrainTypes.Contains(world.Map.GetTerrainInfo(cell).Type);
}
public static bool CanPlaceBuilding(this World world, CPos cell, ActorInfo ai, BuildingInfo bi, Actor toIgnore)

12
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeploy.cs
View File

@@ -241,16 +241,8 @@ namespace OpenRA.Mods.Common.Traits
if (Info.CanDeployOnRamps)
return true;
var ramp = 0;
if (self.World.Map.Contains(location))
{
var tile = self.World.Map.Tiles[location];
var ti = self.World.Map.Rules.TileSet.GetTileInfo(tile);
if (ti != null)
ramp = ti.RampType;
}
return ramp == 0;
var map = self.World.Map;
return !map.Ramp.Contains(location) || map.Ramp[location] == 0;
}
void INotifyDeployComplete.FinishedDeploy(Actor self)

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

@@ -83,9 +83,7 @@ namespace OpenRA.Mods.Common.Traits
if (jli.JumpjetTransitionOnRamps)
return true;
var tile = map.Tiles[cell];
var ti = map.Rules.TileSet.GetTileInfo(tile);
return ti == null || ti.RampType == 0;
return map.Ramp[cell] == 0;
}
int ICustomMovementLayer.EntryMovementCost(ActorInfo a, LocomotorInfo li, CPos cell)

8
OpenRA.Mods.Common/Traits/World/LegacyBridgeLayer.cs
View File

@@ -65,8 +65,9 @@ namespace OpenRA.Mods.Common.Traits
return;
// Correlate the tile "image" aka subtile with its position to find the template origin
var tile = w.Map.Tiles[cell].Type;
var index = w.Map.Tiles[cell].Index;
var ti = w.Map.Tiles[cell];
var tile = ti.Type;
var index = ti.Index;
var template = w.Map.Rules.TileSet.Templates[tile];
var ni = cell.X - index % template.Size.X;
var nj = cell.Y - index / template.Size.X;
@@ -89,7 +90,8 @@ namespace OpenRA.Mods.Common.Traits
var subtile = new CPos(ni + ind % template.Size.X, nj + ind / template.Size.X);
// This isn't the bridge you're looking for
if (!mapTiles.Contains(subtile) || mapTiles[subtile].Type != tile || mapTiles[subtile].Index != ind)
var subti = mapTiles[subtile];
if (!mapTiles.Contains(subtile) || subti.Type != tile || subti.Index != ind)
continue;
subTiles.Add(subtile, ind);

10
OpenRA.Mods.Common/Traits/World/ResourceLayer.cs
View File

@@ -109,15 +109,7 @@ namespace OpenRA.Mods.Common.Traits
if (!rt.Info.AllowUnderBuildings && buildingInfluence.GetBuildingAt(cell) != null)
return false;
if (!rt.Info.AllowOnRamps)
{
var tile = world.Map.Tiles[cell];
var tileInfo = world.Map.Rules.TileSet.GetTileInfo(tile);
if (tileInfo != null && tileInfo.RampType > 0)
return false;
}
return true;
return rt.Info.AllowOnRamps || world.Map.Ramp[cell] == 0;
}
public bool CanSpawnResourceAt(ResourceType newResourceType, CPos cell)

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

@@ -82,9 +82,7 @@ namespace OpenRA.Mods.Common.Traits
if (sli.SubterraneanTransitionOnRamps)
return true;
var tile = map.Tiles[cell];
var ti = map.Rules.TileSet.GetTileInfo(tile);
return ti == null || ti.RampType == 0;
return map.Ramp[cell] == 0;
}
int ICustomMovementLayer.EntryMovementCost(ActorInfo a, LocomotorInfo li, CPos cell)

6
OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs
View File

@@ -63,11 +63,7 @@ namespace OpenRA.Mods.Common.Traits
continue;
var height = (int)map.Height[uv];
var tile = map.Tiles[uv];
var ti = tileSet.GetTileInfo(tile);
var ramp = ti != null ? ti.RampType : 0;
var corners = map.Grid.CellCorners[ramp];
var corners = map.Grid.CellCorners[map.Ramp[uv]];
var pos = map.CenterOfCell(uv.ToCPos(map));
var width = uv == mouseCell ? 3 : 1;