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

avoid additional layers of abstraction

Browse Source
This commit is contained in:
Matthias Mailänder
2013-11-02 18:12:46 +01:00
parent 05eae2c890
commit e0e3f1155a
6 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,16 +94,6 @@ namespace OpenRA.Graphics
Zoom = Game.Settings.Graphics.PixelDouble ? 2 : 1;
}
public WPos ViewToWorldPosition(int2 view)
{
return worldRenderer.Position(ViewToWorldPx(view));
}
public CPos ViewToWorldCellPosition(int2 view)
{
return worldRenderer.Position(ViewToWorldPx(view)).ToCPos();
}
public int2 ViewToWorldPx(int2 view) { return (1f / Zoom * view.ToFloat2()).ToInt2() + TopLeft; }
public int2 WorldToViewPx(int2 world) { return (Zoom * (world - TopLeft).ToFloat2()).ToInt2(); }

2
OpenRA.Game/Widgets/ViewportControllerWidget.cs
View File

@@ -95,7 +95,7 @@ namespace OpenRA.Widgets
public void UpdateMouseover()
{
TooltipType = WorldTooltipType.None;
var cell = worldRenderer.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos);
var cell = worldRenderer.Position(worldRenderer.Viewport.ViewToWorldPx(Viewport.LastMousePos)).ToCPos();
if (!world.Map.IsInMap(cell))
return;

2
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -147,7 +147,7 @@ namespace OpenRA.Widgets
if (o.TargetActor != null)
world.Add(new FlashTarget(o.TargetActor));
else if (o.TargetLocation != CPos.Zero)
world.Add(new MoveFlash(worldRenderer.Viewport.ViewToWorldPosition(mi.Location), world));
world.Add(new MoveFlash(worldRenderer.Position(worldRenderer.Viewport.ViewToWorldPx(mi.Location)), world));
}
}