From e0e3f1155a259602ff47f0c224b478526be507d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 2 Nov 2013 18:12:46 +0100 Subject: [PATCH] avoid additional layers of abstraction --- OpenRA.Game/Graphics/Viewport.cs | 10 ---------- OpenRA.Game/Widgets/ViewportControllerWidget.cs | 2 +- .../Widgets/WorldInteractionControllerWidget.cs | 2 +- OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs | 2 +- OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs | 6 +++--- OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs | 4 ++-- 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs index 8cfbecab7c..d2625dfbd6 100755 --- a/OpenRA.Game/Graphics/Viewport.cs +++ b/OpenRA.Game/Graphics/Viewport.cs @@ -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(); } diff --git a/OpenRA.Game/Widgets/ViewportControllerWidget.cs b/OpenRA.Game/Widgets/ViewportControllerWidget.cs index fe7224ee4e..65d4fafaf1 100644 --- a/OpenRA.Game/Widgets/ViewportControllerWidget.cs +++ b/OpenRA.Game/Widgets/ViewportControllerWidget.cs @@ -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; diff --git a/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs b/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs index a04a8e4671..883cccfb89 100644 --- a/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs +++ b/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs @@ -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)); } } diff --git a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs index 9722f597c1..3c5d95ddb1 100644 --- a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs +++ b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs @@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA.Orders public IEnumerable Render(WorldRenderer wr, World world) { yield break; } public void RenderAfterWorld(WorldRenderer wr, World world) { - var position = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos); + var position = wr.Position(wr.Viewport.ViewToWorldPx(Viewport.LastMousePos)).ToCPos(); var topLeft = position - FootprintUtils.AdjustForBuildingSize(BuildingInfo); var actorInfo = Rules.Info[Building]; diff --git a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs index 8aa2f8f952..9b3811c586 100644 --- a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs @@ -138,7 +138,7 @@ namespace OpenRA.Mods.RA public void RenderAfterWorld(WorldRenderer wr, World world) { - var xy = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos); + var xy = wr.Position(wr.Viewport.ViewToWorldPx(Viewport.LastMousePos)).ToCPos(); var targetUnits = power.UnitsInRange(xy); foreach (var unit in targetUnits) if (manager.self.Owner.Shroud.IsTargetable(unit) || manager.self.Owner.HasFogVisibility()) @@ -147,7 +147,7 @@ namespace OpenRA.Mods.RA public IEnumerable Render(WorldRenderer wr, World world) { - var xy = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos); + var xy = wr.Position(wr.Viewport.ViewToWorldPx(Viewport.LastMousePos)).ToCPos(); var tiles = world.FindTilesInCircle(xy, range); var pal = wr.Palette("terrain"); foreach (var t in tiles) @@ -226,7 +226,7 @@ namespace OpenRA.Mods.RA public IEnumerable Render(WorldRenderer wr, World world) { - var xy = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos); + var xy = wr.Position(wr.Viewport.ViewToWorldPx(Viewport.LastMousePos)).ToCPos(); var pal = wr.Palette("terrain"); // Source tiles diff --git a/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs b/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs index 74930b698c..a483fe30c9 100644 --- a/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs @@ -90,14 +90,14 @@ namespace OpenRA.Mods.RA public void RenderAfterWorld(WorldRenderer wr, World world) { - var xy = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos); + var xy = wr.Position(wr.Viewport.ViewToWorldPx(Viewport.LastMousePos)).ToCPos(); foreach (var unit in power.UnitsInRange(xy)) wr.DrawSelectionBox(unit, Color.Red); } public IEnumerable Render(WorldRenderer wr, World world) { - var xy = wr.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos); + var xy = wr.Position(wr.Viewport.ViewToWorldPx(Viewport.LastMousePos)).ToCPos(); var pal = wr.Palette("terrain"); foreach (var t in world.FindTilesInCircle(xy, range)) yield return new SpriteRenderable(tile, t.CenterPosition, WVec.Zero, -511, pal, 1f, true);