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

cache world.LocalPlayer instead of fetching it repeatedly within loops

Browse Source
This commit is contained in:
Bob
2010-10-31 17:40:54 +13:00
committed by Chris Forbes
parent d7d0d371c6
commit e3ddb8f757
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Graphics/Minimap.cs
View File

@@ -135,10 +135,12 @@ namespace OpenRA.Graphics
unsafe unsafe
{ {
int* c = (int*)bitmapData.Scan0; int* c = (int*)bitmapData.Scan0;
var player = world.LocalPlayer;
foreach (var t in world.Queries.WithTraitMultiple<IRadarSignature>()) foreach (var t in world.Queries.WithTraitMultiple<IRadarSignature>())
{ {
if (!t.Actor.IsVisible(world.LocalPlayer)) if (!t.Actor.IsVisible(player))
continue; continue;
var color = t.Trait.RadarSignatureColor(t.Actor); var color = t.Trait.RadarSignatureColor(t.Actor);
@@ -162,7 +164,9 @@ namespace OpenRA.Graphics
var shroud = Color.Black.ToArgb(); var shroud = Color.Black.ToArgb();
var fog = Color.FromArgb(128, Color.Black).ToArgb(); var fog = Color.FromArgb(128, Color.Black).ToArgb();
var playerShroud = world.LocalPlayer.Shroud;
unsafe unsafe
{ {
int* c = (int*)bitmapData.Scan0; int* c = (int*)bitmapData.Scan0;
@@ -172,9 +176,9 @@ namespace OpenRA.Graphics
{ {
var mapX = x + map.TopLeft.X; var mapX = x + map.TopLeft.X;
var mapY = y + map.TopLeft.Y; var mapY = y + map.TopLeft.Y;
if (!world.LocalPlayer.Shroud.IsExplored(mapX, mapY)) if (!playerShroud.IsExplored(mapX, mapY))
*(c + (y * bitmapData.Stride >> 2) + x) = shroud; *(c + (y * bitmapData.Stride >> 2) + x) = shroud;
else if (!world.LocalPlayer.Shroud.IsVisible(mapX,mapY)) else if (!playerShroud.IsVisible(mapX,mapY))
*(c + (y * bitmapData.Stride >> 2) + x) = fog; *(c + (y * bitmapData.Stride >> 2) + x) = fog;
} }
} }

7
OpenRA.Game/Traits/World/ResourceLayer.cs
View File

@@ -38,11 +38,14 @@ namespace OpenRA.Traits
foreach( var rt in world.WorldActor.TraitsImplementing<ResourceType>() ) foreach( var rt in world.WorldActor.TraitsImplementing<ResourceType>() )
rt.info.PaletteIndex = wr.GetPaletteIndex(rt.info.Palette); rt.info.PaletteIndex = wr.GetPaletteIndex(rt.info.Palette);
ShroudRenderer shroud = null;
if( world.LocalPlayer != null )
shroud = world.LocalPlayer.Shroud;
for (int x = minx; x < maxx; x++) for (int x = minx; x < maxx; x++)
for (int y = miny; y < maxy; y++) for (int y = miny; y < maxy; y++)
{ {
if (world.LocalPlayer != null && if (shroud != null && !shroud.IsExplored(new int2(x, y)))
!world.LocalPlayer.Shroud.IsExplored(new int2(x, y)))
continue; continue;
var c = content[x, y]; var c = content[x, y];

12
OpenRA.Mods.RA/Effects/Contrail.cs
View File

@@ -73,17 +73,15 @@ namespace OpenRA.Mods.RA
Color trailEnd = Color.FromArgb(trailStart.A - 255 / TrailLength, trailStart.R, Color trailEnd = Color.FromArgb(trailStart.A - 255 / TrailLength, trailStart.R,
trailStart.G, trailStart.B); trailStart.G, trailStart.B);
// LocalPlayer is null on shellmap
ShroudRenderer shroud = null;
if (self.World.LocalPlayer != null)
shroud = self.World.LocalPlayer.Shroud;
for (int i = positions.Count - 1; i >= 1; --i) for (int i = positions.Count - 1; i >= 1; --i)
{ {
var conPos = positions[i]; var conPos = positions[i];
var nextPos = positions[i - 1]; var nextPos = positions[i - 1];
ShroudRenderer shroud = null;
// LocalPlayer is null on shellmap
if (self.World.LocalPlayer != null)
{
shroud = self.World.LocalPlayer.Shroud;
}
if (shroud == null || if (shroud == null ||
shroud.IsVisible(OpenRA.Traits.Util.CellContaining(conPos)) || shroud.IsVisible(OpenRA.Traits.Util.CellContaining(conPos)) ||

2
OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs
View File

@@ -50,9 +50,7 @@ namespace OpenRA.Mods.RA.Widgets
if (types.Count() == 0) if (types.Count() == 0)
return; return;
Widget.RootWidget.GetWidget<BuildPaletteWidget>("INGAME_BUILD_PALETTE") Widget.RootWidget.GetWidget<BuildPaletteWidget>("INGAME_BUILD_PALETTE")
.SetCurrentTab(world.LocalPlayer.PlayerActor.TraitsImplementing<ProductionQueue>().FirstOrDefault(t => types.Contains(t.Info.Type))); .SetCurrentTab(world.LocalPlayer.PlayerActor.TraitsImplementing<ProductionQueue>().FirstOrDefault(t => types.Contains(t.Info.Type)));
} }
} }

3
OpenRA.Mods.RA/World/SmudgeLayer.cs
View File

@@ -77,11 +77,12 @@ namespace OpenRA.Mods.RA
{ {
var cliprect = Game.viewport.ShroudBounds( world ); var cliprect = Game.viewport.ShroudBounds( world );
cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect); cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect);
var localPlayer = world.LocalPlayer;
foreach (var kv in tiles) foreach (var kv in tiles)
{ {
if (!cliprect.Contains(kv.Key.X,kv.Key.Y)) if (!cliprect.Contains(kv.Key.X,kv.Key.Y))
continue; continue;
if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.IsExplored(kv.Key)) if (localPlayer != null && !localPlayer.Shroud.IsExplored(kv.Key))
continue; continue;
smudgeSprites[kv.Value.type- 1][kv.Value.image].DrawAt( wr, smudgeSprites[kv.Value.type- 1][kv.Value.image].DrawAt( wr,