From 7bf4cb85fa7b503cf0a38fd1620c43483effed88 Mon Sep 17 00:00:00 2001 From: Bob Date: Fri, 24 Sep 2010 17:14:34 +1200 Subject: [PATCH] fix perf in ShroudRenderer --- OpenRA.Game/Graphics/Sprite.cs | 7 ++++++- OpenRA.Game/ShroudRenderer.cs | 4 ++-- OpenRA.Game/Traits/World/ResourceLayer.cs | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/Graphics/Sprite.cs b/OpenRA.Game/Graphics/Sprite.cs index 7ffc2da9b9..758c577fd7 100644 --- a/OpenRA.Game/Graphics/Sprite.cs +++ b/OpenRA.Game/Graphics/Sprite.cs @@ -52,7 +52,12 @@ namespace OpenRA.Graphics public void DrawAt( float2 location, string palette ) { - Game.Renderer.SpriteRenderer.DrawSprite( this, location, palette ); + Game.Renderer.SpriteRenderer.DrawSprite( this, location, palette, this.size ); + } + + public void DrawAt( float2 location, int paletteIndex ) + { + Game.Renderer.SpriteRenderer.DrawSprite( this, location, paletteIndex, this.size ); } public void DrawAt(float2 location, string palette, float2 size) diff --git a/OpenRA.Game/ShroudRenderer.cs b/OpenRA.Game/ShroudRenderer.cs index 967ee2982b..f48253180d 100644 --- a/OpenRA.Game/ShroudRenderer.cs +++ b/OpenRA.Game/ShroudRenderer.cs @@ -151,7 +151,7 @@ namespace OpenRA var minx = clipRect.Left; var maxx = clipRect.Right; - var shroudPalette = "fog"; + var shroudPalette = Game.world.WorldRenderer.GetPaletteIndex("fog"); for (var j = miny; j < maxy; j++) { @@ -183,7 +183,7 @@ namespace OpenRA new float2(Game.CellSize * (maxx - starti), Game.CellSize)); } - shroudPalette = "shroud"; + shroudPalette = Game.world.WorldRenderer.GetPaletteIndex("shroud"); for (var j = miny; j < maxy; j++) { diff --git a/OpenRA.Game/Traits/World/ResourceLayer.cs b/OpenRA.Game/Traits/World/ResourceLayer.cs index 9d1546e92e..0e9429d81e 100644 --- a/OpenRA.Game/Traits/World/ResourceLayer.cs +++ b/OpenRA.Game/Traits/World/ResourceLayer.cs @@ -18,7 +18,7 @@ namespace OpenRA.Traits public class ResourceLayerInfo : TraitInfo { } public class ResourceLayer: IRenderOverlay, IWorldLoaded - { + { World world; public ResourceType[] resourceTypes;