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

Separated resource rendering into another trait

Browse Source
This commit is contained in:
teinarss
2019-06-18 22:09:45 +02:00
committed by abcdefg30
parent 0e93d85273
commit f0b69f8b8d
16 changed files with 377 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Widgets
public class ViewportControllerWidget : Widget
{
readonly ModData modData;
readonly ResourceLayer resourceLayer;
readonly ResourceRenderer resourceRenderer;
public readonly HotkeyReference ZoomInKey = new HotkeyReference();
public readonly HotkeyReference ZoomOutKey = new HotkeyReference();
@@ -144,7 +144,7 @@ namespace OpenRA.Mods.Common.Widgets
tooltipContainer = Exts.Lazy(() =>
Ui.Root.Get<TooltipContainerWidget>(TooltipContainer));
resourceLayer = world.WorldActor.TraitOrDefault<ResourceLayer>();
resourceRenderer = world.WorldActor.TraitOrDefault<ResourceRenderer>();
}
public override void Initialize(WidgetArgs args)
@@ -266,9 +266,9 @@ namespace OpenRA.Mods.Common.Widgets
return;
}
if (resourceLayer != null)
if (resourceRenderer != null)
{
var resource = resourceLayer.GetRenderedResource(cell);
var resource = resourceRenderer.GetRenderedResourceType(cell);
if (resource != null)
{
TooltipType = WorldTooltipType.Resource;