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

Move more viewport lookups to WorldRenderer.

Browse Source
This commit is contained in:
Paul Chote
2013-09-27 17:53:34 +12:00
parent f575c20d38
commit 0b560bfc6e
13 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,10 +48,9 @@ namespace OpenRA.Widgets
worldRenderer.DrawRollover(u);
}
public override bool HandleMouseInput(MouseInput mi)
{
var xy = Game.viewport.ViewToWorldPx(mi.Location);
var xy = worldRenderer.Viewport.ViewToWorldPx(mi.Location);
var UseClassicMouseStyle = Game.Settings.Game.UseClassicMouseStyle;
@@ -92,9 +91,9 @@ namespace OpenRA.Widgets
{
var unit = world.ScreenMap.ActorsAt(xy).FirstOrDefault();
var visibleWorld = Game.viewport.ViewBounds(world);
var topLeft = Game.viewport.ViewToWorldPx(new int2(visibleWorld.Left, visibleWorld.Top));
var bottomRight = Game.viewport.ViewToWorldPx(new int2(visibleWorld.Right, visibleWorld.Bottom));
var visibleWorld = worldRenderer.Viewport.ViewBounds(world);
var topLeft = worldRenderer.Viewport.ViewToWorldPx(new int2(visibleWorld.Left, visibleWorld.Top));
var bottomRight = worldRenderer.Viewport.ViewToWorldPx(new int2(visibleWorld.Right, visibleWorld.Bottom));
var newSelection2= SelectActorsInBox(world, topLeft, bottomRight,
a => unit != null && a.Info.Name == unit.Info.Name && a.Owner == unit.Owner);
@@ -155,7 +154,7 @@ namespace OpenRA.Widgets
if (SelectionBox != null)
return null;
var xy = Game.viewport.ViewToWorldPx(screenPos);
var xy = worldRenderer.Viewport.ViewToWorldPx(screenPos);
var pos = worldRenderer.Position(xy);
var cell = pos.ToCPos();