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

Reuse set when rendering actors in the world to avoid allocations.

Browse Source
This commit is contained in:
RoosterDragon
2018-03-22 20:45:41 +00:00
committed by Paul Chote
parent 3069bbfa7d
commit f6471d411e
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -31,6 +31,7 @@ namespace OpenRA.Graphics
public event Action PaletteInvalidated = null; public event Action PaletteInvalidated = null;
readonly HashSet<Actor> onScreenActors = new HashSet<Actor>();
readonly HardwarePalette palette = new HardwarePalette(); readonly HardwarePalette palette = new HardwarePalette();
readonly Dictionary<string, PaletteReference> palettes = new Dictionary<string, PaletteReference>(); readonly Dictionary<string, PaletteReference> palettes = new Dictionary<string, PaletteReference>();
readonly TerrainRenderer terrainRenderer; readonly TerrainRenderer terrainRenderer;
@@ -100,9 +101,9 @@ namespace OpenRA.Graphics
palettes[name].Palette = pal; palettes[name].Palette = pal;
} }
List<IFinalizedRenderable> GenerateRenderables(HashSet<Actor> actorsInBox) List<IFinalizedRenderable> GenerateRenderables()
{ {
var actors = actorsInBox.Append(World.WorldActor); var actors = onScreenActors.Append(World.WorldActor);
if (World.RenderPlayer != null) if (World.RenderPlayer != null)
actors = actors.Append(World.RenderPlayer.PlayerActor); actors = actors.Append(World.RenderPlayer.PlayerActor);
@@ -126,15 +127,15 @@ namespace OpenRA.Graphics
return renderables; return renderables;
} }
List<IFinalizedRenderable> GenerateOverlayRenderables(HashSet<Actor> actorsInBox) List<IFinalizedRenderable> GenerateOverlayRenderables()
{ {
var aboveShroud = World.ActorsWithTrait<IRenderAboveShroud>() var aboveShroud = World.ActorsWithTrait<IRenderAboveShroud>()
.Where(a => a.Actor.IsInWorld && !a.Actor.Disposed && (!a.Trait.SpatiallyPartitionable || actorsInBox.Contains(a.Actor))) .Where(a => a.Actor.IsInWorld && !a.Actor.Disposed && (!a.Trait.SpatiallyPartitionable || onScreenActors.Contains(a.Actor)))
.SelectMany(a => a.Trait.RenderAboveShroud(a.Actor, this)); .SelectMany(a => a.Trait.RenderAboveShroud(a.Actor, this));
var aboveShroudSelected = World.Selection.Actors.Where(a => a.IsInWorld && !a.Disposed) var aboveShroudSelected = World.Selection.Actors.Where(a => a.IsInWorld && !a.Disposed)
.SelectMany(a => a.TraitsImplementing<IRenderAboveShroudWhenSelected>() .SelectMany(a => a.TraitsImplementing<IRenderAboveShroudWhenSelected>()
.Where(t => !t.SpatiallyPartitionable || actorsInBox.Contains(a)) .Where(t => !t.SpatiallyPartitionable || onScreenActors.Contains(a))
.SelectMany(t => t.RenderAboveShroud(a, this))); .SelectMany(t => t.RenderAboveShroud(a, this)));
var aboveShroudEffects = World.Effects.Select(e => e as IEffectAboveShroud) var aboveShroudEffects = World.Effects.Select(e => e as IEffectAboveShroud)
@@ -171,8 +172,8 @@ namespace OpenRA.Graphics
RefreshPalette(); RefreshPalette();
var onScreenActors = World.ScreenMap.RenderableActorsInBox(Viewport.TopLeft, Viewport.BottomRight).ToHashSet(); onScreenActors.UnionWith(World.ScreenMap.RenderableActorsInBox(Viewport.TopLeft, Viewport.BottomRight));
var renderables = GenerateRenderables(onScreenActors); var renderables = GenerateRenderables();
var bounds = Viewport.GetScissorBounds(World.Type != WorldType.Editor); var bounds = Viewport.GetScissorBounds(World.Type != WorldType.Editor);
Game.Renderer.EnableScissor(bounds); Game.Renderer.EnableScissor(bounds);
@@ -205,7 +206,7 @@ namespace OpenRA.Graphics
Game.Renderer.DisableScissor(); Game.Renderer.DisableScissor();
var finalOverlayRenderables = GenerateOverlayRenderables(onScreenActors); var finalOverlayRenderables = GenerateOverlayRenderables();
// HACK: Keep old grouping behaviour // HACK: Keep old grouping behaviour
var groupedOverlayRenderables = finalOverlayRenderables.GroupBy(prs => prs.GetType()); var groupedOverlayRenderables = finalOverlayRenderables.GroupBy(prs => prs.GetType());
@@ -239,6 +240,9 @@ namespace OpenRA.Graphics
} }
Game.Renderer.Flush(); Game.Renderer.Flush();
// PERF: Reuse collection to avoid allocations.
onScreenActors.Clear();
} }
public void RefreshPalette() public void RefreshPalette()