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

fix #166 (shroud artifacting at bounds)

Browse Source
This commit is contained in:
Bob
2010-10-25 08:54:53 +13:00
committed by Chris Forbes
parent 1cde37f32b
commit 10f5e68f7f
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -166,7 +166,7 @@ namespace OpenRA
BeforeGameStart(); BeforeGameStart();
var map = modData.PrepareMap(mapUID); var map = modData.PrepareMap(mapUID);
viewport = new Viewport(new float2(Renderer.Resolution), map.TopLeft, map.BottomRight, Renderer); viewport = new Viewport(new int2(Renderer.Resolution), map.TopLeft, map.BottomRight, Renderer);
orderManager.world = new World(modData.Manifest, map, orderManager); orderManager.world = new World(modData.Manifest, map, orderManager);
worldRenderer = new WorldRenderer(orderManager.world); worldRenderer = new WorldRenderer(orderManager.world);

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

@@ -18,16 +18,16 @@ namespace OpenRA.Graphics
{ {
public class Viewport public class Viewport
{ {
readonly float2 screenSize; readonly int2 screenSize;
float2 scrollPosition; int2 scrollPosition;
readonly Renderer renderer; readonly Renderer renderer;
readonly int2 mapStart; readonly int2 mapStart;
readonly int2 mapEnd; readonly int2 mapEnd;
public float2 Location { get { return scrollPosition; } } public float2 Location { get { return scrollPosition; } }
public int Width { get { return (int)screenSize.X; } } public int Width { get { return screenSize.X; } }
public int Height { get { return (int)screenSize.Y; } } public int Height { get { return screenSize.Y; } }
float cursorFrame = 0f; float cursorFrame = 0f;
@@ -41,7 +41,8 @@ namespace OpenRA.Graphics
public void Scroll(float2 delta, bool ignoreBorders) public void Scroll(float2 delta, bool ignoreBorders)
{ {
float2 newScrollPosition = scrollPosition + delta; var d = delta.ToInt2();
var newScrollPosition = scrollPosition + d;
if(!ignoreBorders) if(!ignoreBorders)
newScrollPosition = this.NormalizeScrollPosition(newScrollPosition); newScrollPosition = this.NormalizeScrollPosition(newScrollPosition);
@@ -49,10 +50,10 @@ namespace OpenRA.Graphics
scrollPosition = newScrollPosition; scrollPosition = newScrollPosition;
} }
private float2 NormalizeScrollPosition(float2 newScrollPosition) private int2 NormalizeScrollPosition(int2 newScrollPosition)
{ {
float2 topLeftBorder = (Game.CellSize* mapStart).ToFloat2(); var topLeftBorder = Game.CellSize* mapStart;
float2 bottomRightBorder = (Game.CellSize* mapEnd).ToFloat2(); var bottomRightBorder = Game.CellSize* mapEnd;
if(newScrollPosition.Y < topLeftBorder.Y - screenSize.Y/2) if(newScrollPosition.Y < topLeftBorder.Y - screenSize.Y/2)
newScrollPosition.Y = topLeftBorder.Y - screenSize.Y/2; newScrollPosition.Y = topLeftBorder.Y - screenSize.Y/2;
@@ -85,7 +86,7 @@ namespace OpenRA.Graphics
return blockedDirections; return blockedDirections;
} }
public Viewport(float2 screenSize, int2 mapStart, int2 mapEnd, Renderer renderer) public Viewport(int2 screenSize, int2 mapStart, int2 mapEnd, Renderer renderer)
{ {
this.screenSize = screenSize; this.screenSize = screenSize;
this.renderer = renderer; this.renderer = renderer;
@@ -125,7 +126,7 @@ namespace OpenRA.Graphics
public void Center(float2 loc) public void Center(float2 loc)
{ {
scrollPosition = this.NormalizeScrollPosition(Game.CellSize*loc - .5f * new float2(Width, Height)); scrollPosition = this.NormalizeScrollPosition(Game.CellSize*loc - screenSize / 2);
} }
public void Center(IEnumerable<Actor> actors) public void Center(IEnumerable<Actor> actors)
@@ -136,7 +137,7 @@ namespace OpenRA.Graphics
.Select(a => a.CenterLocation) .Select(a => a.CenterLocation)
.Aggregate((a, b) => a + b); .Aggregate((a, b) => a + b);
scrollPosition = this.NormalizeScrollPosition((avgPos - .5f * new float2(Width, Height))); scrollPosition = this.NormalizeScrollPosition((avgPos.ToInt2() - screenSize / 2));
} }
public Rectangle ShroudBounds( World world ) public Rectangle ShroudBounds( World world )