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

Don't require a WorldRenderer to draw non-world-rendering widgets.

Browse Source
This commit is contained in:
Paul Chote
2011-01-19 20:19:15 +13:00
committed by Paul Chote
parent e3c090a201
commit 481cc7807b
38 changed files with 115 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,14 +20,16 @@ namespace OpenRA.Widgets
{
public class WorldInteractionControllerWidget : Widget
{
readonly World world;
readonly World world;
readonly WorldRenderer worldRenderer;
[ObjectCreator.UseCtor]
public WorldInteractionControllerWidget( [ObjectCreator.Param] World world )
public WorldInteractionControllerWidget([ObjectCreator.Param] World world, [ObjectCreator.Param] WorldRenderer worldRenderer)
{
this.world = world;
this.world = world;
this.worldRenderer = worldRenderer;
}
public override void DrawInner( WorldRenderer wr )
public override void DrawInner()
{
var selbox = SelectionBox;
if (selbox == null) return;
@@ -40,9 +42,9 @@ namespace OpenRA.Widgets
Game.Renderer.LineRenderer.DrawLine(a + b, a + b + c, Color.White, Color.White);
Game.Renderer.LineRenderer.DrawLine(a + b + c, a + c, Color.White, Color.White);
Game.Renderer.LineRenderer.DrawLine(a, a + c, Color.White, Color.White);
foreach (var u in SelectActorsInBox(world, selbox.Value.First, selbox.Value.Second))
wr.DrawSelectionBox(u, Color.Yellow);
worldRenderer.DrawSelectionBox(u, Color.Yellow);
}
float2 dragStart, dragEnd;