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

Change indexes into tile arrays to be stored as bytes to save memory.

Browse Source 
The index value needs only be big enough to handle all defined terrain types. This is a low number so we can save memory by defining it as a byte. This particularly saves memory for the CustomTerrain field in the Map class, which defines a cell layer for the map using tile indexes, so we can reduce the size of that layer 4x as a result.
This commit is contained in:
RoosterDragon
2014-10-03 20:55:00 +01:00
parent 268c63f7df
commit 59b3cd154d
9 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/AI/HackyAI.cs
View File

@@ -158,7 +158,7 @@ namespace OpenRA.Mods.RA.AI
bool enabled;
int ticks;
HashSet<int> resourceTypeIndices;
HashSet<byte> resourceTypeIndices;
RushFuzzy rushFuzzy = new RushFuzzy();
@@ -208,7 +208,7 @@ namespace OpenRA.Mods.RA.AI
random = new MersenneTwister((int)p.PlayerActor.ActorID);
resourceTypeIndices = new HashSet<int>(
resourceTypeIndices = new HashSet<byte>(
Map.Rules.Actors["world"].Traits
.WithInterface<ResourceTypeInfo>()
.Select(t => world.TileSet.GetTerrainIndex(t.TerrainType)));

2
OpenRA.Mods.RA/Bridge.cs
View File

@@ -98,7 +98,7 @@ namespace OpenRA.Mods.RA
self.World.Map.CustomTerrain[c] = GetTerrainType(c);
}
int GetTerrainType(CPos cell)
byte GetTerrainType(CPos cell)
{
var dx = cell - self.Location;
var index = dx.X + self.World.TileSet.Templates[template].Size.X * dx.Y;

4
OpenRA.Mods.RA/Buildings/LaysTerrain.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.RA.Buildings
continue;
// Don't place under other buildings or custom terrain
if (bi.GetBuildingAt(c) != self || map.CustomTerrain[c] != -1)
if (bi.GetBuildingAt(c) != self || map.CustomTerrain[c] != byte.MaxValue)
continue;
var index = Game.CosmeticRandom.Next(template.TilesCount);
@@ -77,7 +77,7 @@ namespace OpenRA.Mods.RA.Buildings
continue;
// Don't place under other buildings or custom terrain
if (bi.GetBuildingAt(c) != self || map.CustomTerrain[c] != -1)
if (bi.GetBuildingAt(c) != self || map.CustomTerrain[c] != byte.MaxValue)
continue;
layer.AddTile(c, new TerrainTile(template.Id, (byte)i));

6
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -82,7 +82,7 @@ namespace OpenRA.Mods.RA.Move
foreach (var kvp in TerrainSpeeds)
{
int index;
byte index;
if (tileSet.TryGetTerrainIndex(kvp.Key, out index))
info[index] = kvp.Value;
}
@@ -125,7 +125,7 @@ namespace OpenRA.Mods.RA.Move
return int.MaxValue;
var index = world.Map.GetTerrainIndex(cell);
if (index == -1)
if (index == byte.MaxValue)
return int.MaxValue;
return TilesetTerrainInfo[world.TileSet][index].Cost;
@@ -526,7 +526,7 @@ namespace OpenRA.Mods.RA.Move
public int MovementSpeedForCell(Actor self, CPos cell)
{
var index = self.World.Map.GetTerrainIndex(cell);
if (index == -1)
if (index == byte.MaxValue)
return 0;
// TODO: Convert to integers

4
OpenRA.Mods.RA/World/ResourceLayer.cs
View File

@@ -203,7 +203,7 @@ namespace OpenRA.Mods.RA
if (--c.Density < 0)
{
content[cell] = EmptyCell;
world.Map.CustomTerrain[cell] = -1;
world.Map.CustomTerrain[cell] = byte.MaxValue;
}
else
content[cell] = c;
@@ -222,7 +222,7 @@ namespace OpenRA.Mods.RA
// Clear cell
content[cell] = EmptyCell;
world.Map.CustomTerrain[cell] = -1;
world.Map.CustomTerrain[cell] = byte.MaxValue;
if (!dirty.Contains(cell))
dirty.Add(cell);