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

Remove Enum.HasFlag from building preview generation.

Browse Source
This commit is contained in:
Paul Chote
2019-05-21 22:39:19 +01:00
committed by reaperrr
parent 697935f931
commit 6723306bb4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,12 @@ namespace OpenRA.Mods.Common.Traits
readonly Sprite buildOk; readonly Sprite buildOk;
readonly Sprite buildBlocked; readonly Sprite buildBlocked;
protected static bool HasFlag(PlaceBuildingCellType value, PlaceBuildingCellType flag)
{
// PERF: Enum.HasFlag is slower and requires allocations.
return (value & flag) == value;
}
public FootprintPlaceBuildingPreviewPreview(WorldRenderer wr, ActorInfo ai, FootprintPlaceBuildingPreviewInfo info, TypeDictionary init) public FootprintPlaceBuildingPreviewPreview(WorldRenderer wr, ActorInfo ai, FootprintPlaceBuildingPreviewInfo info, TypeDictionary init)
{ {
actorInfo = ai; actorInfo = ai;
@@ -83,8 +89,8 @@ namespace OpenRA.Mods.Common.Traits
if ((c.Value & filter) == 0) if ((c.Value & filter) == 0)
continue; continue;
var tile = !c.Value.HasFlag(PlaceBuildingCellType.Invalid) ? buildOk : buildBlocked; var tile = HasFlag(c.Value, PlaceBuildingCellType.Invalid) ? buildBlocked : buildOk;
var pal = c.Value.HasFlag(PlaceBuildingCellType.LineBuild) ? linePalette : cellPalette; var pal = HasFlag(c.Value, PlaceBuildingCellType.LineBuild) ? linePalette : cellPalette;
var pos = wr.World.Map.CenterOfCell(c.Key); var pos = wr.World.Map.CenterOfCell(c.Key);
var offset = new WVec(0, 0, topLeftPos.Z - pos.Z); var offset = new WVec(0, 0, topLeftPos.Z - pos.Z);
yield return new SpriteRenderable(tile, pos, offset, -511, pal, 1f, true); yield return new SpriteRenderable(tile, pos, offset, -511, pal, 1f, true);

4
OpenRA.Mods.D2k/Traits/Buildings/D2kActorPreviewPlaceBuildingPreview.cs
View File

@@ -74,11 +74,11 @@ namespace OpenRA.Mods.Common.Traits
if ((c.Value & filter) == 0) if ((c.Value & filter) == 0)
continue; continue;
var tile = c.Value.HasFlag(PlaceBuildingCellType.Invalid) ? buildBlocked : var tile = HasFlag(c.Value, PlaceBuildingCellType.Invalid) ? buildBlocked :
candidateSafeTiles.Contains(c.Key) && info.UnsafeTerrainTypes.Contains(wr.World.Map.GetTerrainInfo(c.Key).Type) candidateSafeTiles.Contains(c.Key) && info.UnsafeTerrainTypes.Contains(wr.World.Map.GetTerrainInfo(c.Key).Type)
? buildUnsafe : buildOk; ? buildUnsafe : buildOk;
var pal = c.Value.HasFlag(PlaceBuildingCellType.LineBuild) ? linePalette : cellPalette; var pal = HasFlag(c.Value, PlaceBuildingCellType.LineBuild) ? linePalette : cellPalette;
var pos = wr.World.Map.CenterOfCell(c.Key); var pos = wr.World.Map.CenterOfCell(c.Key);
var offset = new WVec(0, 0, topLeftPos.Z - pos.Z); var offset = new WVec(0, 0, topLeftPos.Z - pos.Z);
yield return new SpriteRenderable(tile, pos, offset, -511, pal, 1f, true); yield return new SpriteRenderable(tile, pos, offset, -511, pal, 1f, true);