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

Move DrawRollover to WICW.

Browse Source
This commit is contained in:
Paul Chote
2015-12-10 17:16:25 +00:00
parent 0f1fcdaca4
commit 43226d7c55
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -204,12 +204,6 @@ namespace OpenRA.Graphics
Game.Renderer.Flush(); Game.Renderer.Flush();
} }
public void DrawRollover(Actor unit)
{
if (unit.Info.HasTraitInfo<SelectableInfo>())
new SelectionBarsRenderable(unit, true, true).Render(this);
}
public void RefreshPalette() public void RefreshPalette()
{ {
palette.ApplyModifiers(World.WorldActor.TraitsImplementing<IPaletteModifier>()); palette.ApplyModifiers(World.WorldActor.TraitsImplementing<IPaletteModifier>());

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

@@ -33,13 +33,20 @@ namespace OpenRA.Widgets
this.worldRenderer = worldRenderer; this.worldRenderer = worldRenderer;
} }
void DrawRollover(Actor unit)
{
// TODO: Integrate this with SelectionDecorations to unhardcode the *Renderable
if (unit.Info.HasTraitInfo<SelectableInfo>())
new SelectionBarsRenderable(unit, true, true).Render(worldRenderer);
}
public override void Draw() public override void Draw()
{ {
if (!IsDragging) if (!IsDragging)
{ {
// Render actors under the mouse pointer // Render actors under the mouse pointer
foreach (var u in SelectActorsInBoxWithDeadzone(World, lastMousePosition, lastMousePosition)) foreach (var u in SelectActorsInBoxWithDeadzone(World, lastMousePosition, lastMousePosition))
worldRenderer.DrawRollover(u); DrawRollover(u);
return; return;
} }
@@ -48,7 +55,7 @@ namespace OpenRA.Widgets
var selbox = SelectionBox; var selbox = SelectionBox;
Game.Renderer.WorldLineRenderer.DrawRect(selbox.Value.First.ToFloat2(), selbox.Value.Second.ToFloat2(), Color.White); Game.Renderer.WorldLineRenderer.DrawRect(selbox.Value.First.ToFloat2(), selbox.Value.Second.ToFloat2(), Color.White);
foreach (var u in SelectActorsInBoxWithDeadzone(World, selbox.Value.First, selbox.Value.Second)) foreach (var u in SelectActorsInBoxWithDeadzone(World, selbox.Value.First, selbox.Value.Second))
worldRenderer.DrawRollover(u); DrawRollover(u);
} }
public override bool HandleMouseInput(MouseInput mi) public override bool HandleMouseInput(MouseInput mi)