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

Merge pull request #5751 from RoosterDragon/map-cache-tileset

Browse Source 
Cache tileset lookup in Map
This commit is contained in:
Chris Forbes
2014-06-28 09:27:27 +12:00
parent 000768dd4f bcbd1c2577
commit 5c82fff0ef
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Map/Map.cs
View File

@@ -115,6 +115,7 @@ namespace OpenRA
[FieldLoader.Ignore] public Lazy<CellLayer<ResourceTile>> MapResources; [FieldLoader.Ignore] public Lazy<CellLayer<ResourceTile>> MapResources;
[FieldLoader.Ignore] public CellLayer<int> CustomTerrain; [FieldLoader.Ignore] public CellLayer<int> CustomTerrain;
[FieldLoader.Ignore] Lazy<TileSet> cachedTileSet;
[FieldLoader.Ignore] Lazy<Ruleset> rules; [FieldLoader.Ignore] Lazy<Ruleset> rules;
public Ruleset Rules { get { return rules != null ? rules.Value : null; } } public Ruleset Rules { get { return rules != null ? rules.Value : null; } }
public SequenceProvider SequenceProvider { get { return Rules.Sequences[Tileset]; } } public SequenceProvider SequenceProvider { get { return Rules.Sequences[Tileset]; } }
@@ -259,6 +260,7 @@ namespace OpenRA
void PostInit() void PostInit()
{ {
rules = Exts.Lazy(() => Game.modData.RulesetCache.LoadMapRules(this)); rules = Exts.Lazy(() => Game.modData.RulesetCache.LoadMapRules(this));
cachedTileSet = Exts.Lazy(() => Rules.TileSets[Tileset]);
var tl = new CPos(Bounds.Left, Bounds.Top); var tl = new CPos(Bounds.Left, Bounds.Top);
var br = new CPos(Bounds.Right - 1, Bounds.Bottom - 1); var br = new CPos(Bounds.Right - 1, Bounds.Bottom - 1);
@@ -569,14 +571,12 @@ namespace OpenRA
public int GetTerrainIndex(CPos cell) public int GetTerrainIndex(CPos cell)
{ {
var custom = CustomTerrain[cell]; var custom = CustomTerrain[cell];
var tileSet = Rules.TileSets[Tileset]; return custom != -1 ? custom : cachedTileSet.Value.GetTerrainIndex(MapTiles.Value[cell]);
return custom != -1 ? custom : tileSet.GetTerrainIndex(MapTiles.Value[cell]);
} }
public TerrainTypeInfo GetTerrainInfo(CPos cell) public TerrainTypeInfo GetTerrainInfo(CPos cell)
{ {
var tileSet = Rules.TileSets[Tileset]; return cachedTileSet.Value[GetTerrainIndex(cell)];
return tileSet[GetTerrainIndex(cell)];
} }
public CPos Clamp(CPos xy) public CPos Clamp(CPos xy)