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

remove ref to Game.world in Viewport.ShroudBounds

Browse Source
This commit is contained in:
Bob
2010-10-12 01:50:02 +13:00
parent 4cd3195f9f
commit 6bbf878314
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -139,12 +139,13 @@ namespace OpenRA.Graphics
scrollPosition = this.NormalizeScrollPosition((avgPos - .5f * new float2(Width, Height))); scrollPosition = this.NormalizeScrollPosition((avgPos - .5f * new float2(Width, Height)));
} }
public Rectangle? ShroudBounds() public Rectangle ShroudBounds( World world )
{ {
var localPlayer = Game.world.LocalPlayer; var localPlayer = world.LocalPlayer;
if (localPlayer == null) return null; if( localPlayer == null ) return world.Map.Bounds;
if (localPlayer.Shroud.Disabled) return null; if( localPlayer.Shroud.Disabled ) return world.Map.Bounds;
return localPlayer.Shroud.Bounds; if( !localPlayer.Shroud.Bounds.HasValue ) return world.Map.Bounds;
return Rectangle.Intersect( localPlayer.Shroud.Bounds.Value, world.Map.Bounds );
} }
public Rectangle ViewBounds() public Rectangle ViewBounds()

4
OpenRA.Game/Traits/World/BibLayer.cs
View File

@@ -73,9 +73,7 @@ namespace OpenRA.Traits
public void Render( WorldRenderer wr ) public void Render( WorldRenderer wr )
{ {
var cliprect = Game.viewport.ShroudBounds().HasValue var cliprect = Game.viewport.ShroudBounds( world );
? Rectangle.Intersect(Game.viewport.ShroudBounds().Value, world.Map.Bounds) : world.Map.Bounds;
cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect); cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect);
foreach (var kv in tiles) foreach (var kv in tiles)
{ {

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

@@ -26,9 +26,7 @@ namespace OpenRA.Traits
public void Render( WorldRenderer wr ) public void Render( WorldRenderer wr )
{ {
var cliprect = Game.viewport.ShroudBounds().HasValue var cliprect = Game.viewport.ShroudBounds( world );
? Rectangle.Intersect(Game.viewport.ShroudBounds().Value, world.Map.Bounds) : world.Map.Bounds;
cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect); cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect);
var minx = cliprect.Left; var minx = cliprect.Left;

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

@@ -75,8 +75,7 @@ namespace OpenRA.Mods.RA
public void Render( WorldRenderer wr ) public void Render( WorldRenderer wr )
{ {
var cliprect = Game.viewport.ShroudBounds().HasValue var cliprect = Game.viewport.ShroudBounds( world );
? Rectangle.Intersect(Game.viewport.ShroudBounds().Value, world.Map.Bounds) : world.Map.Bounds;
cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect); cliprect = Rectangle.Intersect(Game.viewport.ViewBounds(), cliprect);
foreach (var kv in tiles) foreach (var kv in tiles)
{ {