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

Add IResourceRenderer interface.

Browse Source
This commit is contained in:
Paul Chote
2021-03-07 17:25:06 +00:00
committed by reaperrr
parent 1dc26a9b8e
commit 7e9d291223
11 changed files with 172 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenRA.Mods.Common/Widgets/Logic/Editor/LayerSelectorLogic.cs
View File

@@ -43,35 +43,30 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
layerTemplateList.RemoveChildren();
var rules = worldRenderer.World.Map.Rules;
var resources = rules.Actors["world"].TraitInfos<ResourceTypeInfo>();
var tileSize = worldRenderer.World.Map.Grid.TileSize;
foreach (var resource in resources)
foreach (var resourceRenderer in worldRenderer.World.WorldActor.TraitsImplementing<IResourceRenderer>())
{
var newResourcePreviewTemplate = ScrollItemWidget.Setup(layerPreviewTemplate,
() => editorCursor.Type == EditorCursorType.Resource && editorCursor.Resource == resource,
() => editor.SetBrush(new EditorResourceBrush(editor, resource, worldRenderer)));
foreach (var resourceType in resourceRenderer.ResourceTypes)
{
var newResourcePreviewTemplate = ScrollItemWidget.Setup(layerPreviewTemplate,
() => editorCursor.Type == EditorCursorType.Resource && editorCursor.Resource == resourceType,
() => editor.SetBrush(new EditorResourceBrush(editor, resourceType, worldRenderer)));
newResourcePreviewTemplate.Bounds.X = 0;
newResourcePreviewTemplate.Bounds.Y = 0;
newResourcePreviewTemplate.Bounds.X = 0;
newResourcePreviewTemplate.Bounds.Y = 0;
var layerPreview = newResourcePreviewTemplate.Get<SpriteWidget>("LAYER_PREVIEW");
layerPreview.IsVisible = () => true;
layerPreview.GetPalette = () => resource.Palette;
var layerPreview = newResourcePreviewTemplate.Get<ResourcePreviewWidget>("LAYER_PREVIEW");
layerPreview.IsVisible = () => true;
layerPreview.ResourceType = resourceType;
layerPreview.Bounds.Width = tileSize.Width;
layerPreview.Bounds.Height = tileSize.Height;
newResourcePreviewTemplate.Bounds.Width = tileSize.Width + (layerPreview.Bounds.X * 2);
newResourcePreviewTemplate.Bounds.Height = tileSize.Height + (layerPreview.Bounds.Y * 2);
newResourcePreviewTemplate.IsVisible = () => true;
newResourcePreviewTemplate.GetTooltipText = () => resourceType.Info.Type;
var variant = resource.Sequences.FirstOrDefault();
var sequence = rules.Sequences.GetSequence("resources", variant);
var frame = sequence.Frames?.Last() ?? resource.MaxDensity - 1;
layerPreview.GetSprite = () => sequence.GetSprite(frame);
layerPreview.Bounds.Width = tileSize.Width;
layerPreview.Bounds.Height = tileSize.Height;
newResourcePreviewTemplate.Bounds.Width = tileSize.Width + (layerPreview.Bounds.X * 2);
newResourcePreviewTemplate.Bounds.Height = tileSize.Height + (layerPreview.Bounds.Y * 2);
newResourcePreviewTemplate.IsVisible = () => true;
newResourcePreviewTemplate.GetTooltipText = () => resource.Type;
layerTemplateList.AddChild(newResourcePreviewTemplate);
layerTemplateList.AddChild(newResourcePreviewTemplate);
}
}
}
}

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
labelText = "Unrevealed Terrain";
break;
case WorldTooltipType.Resource:
labelText = viewport.ResourceTooltip.Info.Name;
labelText = viewport.ResourceTooltip;
break;
case WorldTooltipType.Actor:
{

80
OpenRA.Mods.Common/Widgets/ResourcePreviewWidget.cs Normal file
View File

@@ -0,0 +1,80 @@
#region Copyright & License Information
/*
* Copyright 2007-2021 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System;
using System.IO;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Terrain;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets
{
public class ResourcePreviewWidget : Widget
{
public Func<float> GetScale = () => 1f;
readonly WorldRenderer worldRenderer;
readonly IResourceRenderer[] resourceRenderers;
readonly Size tileSize;
ResourceType resourceType;
IResourceRenderer resourceRenderer;
public ResourceType ResourceType
{
get => resourceType;
set
{
resourceType = value;
if (resourceType != null)
resourceRenderer = resourceRenderers.FirstOrDefault(r => r.ResourceTypes.Contains(resourceType));
else
resourceRenderer = null;
}
}
[ObjectCreator.UseCtor]
public ResourcePreviewWidget(WorldRenderer worldRenderer, World world)
{
this.worldRenderer = worldRenderer;
resourceRenderers = world.WorldActor.TraitsImplementing<IResourceRenderer>().ToArray();
tileSize = world.Map.Grid.TileSize;
}
protected ResourcePreviewWidget(ResourcePreviewWidget other)
: base(other)
{
GetScale = other.GetScale;
worldRenderer = other.worldRenderer;
resourceRenderers = other.resourceRenderers;
tileSize = other.tileSize;
resourceType = other.resourceType;
resourceRenderer = other.resourceRenderer;
}
public override Widget Clone() { return new ResourcePreviewWidget(this); }
public override void Draw()
{
if (resourceRenderer == null)
return;
var scale = GetScale();
var origin = RenderOrigin + new int2((RenderBounds.Size.Width - tileSize.Width) / 2, (RenderBounds.Size.Height - tileSize.Height) / 2);
foreach (var r in resourceRenderer.RenderUIPreview(worldRenderer, resourceType, origin, scale))
r.PrepareRender(worldRenderer).Render(worldRenderer);
}
}
}

12
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 IEnumerable<ResourceRenderer> resourceRenderers;
readonly IEnumerable<IResourceRenderer> resourceRenderers;
public readonly HotkeyReference ZoomInKey = new HotkeyReference();
public readonly HotkeyReference ZoomOutKey = new HotkeyReference();
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Widgets
public ITooltip ActorTooltip { get; private set; }
public IProvideTooltipInfo[] ActorTooltipExtra { get; private set; }
public FrozenActor FrozenActorTooltip { get; private set; }
public ResourceType ResourceTooltip { get; private set; }
public string ResourceTooltip { get; private set; }
static readonly Dictionary<ScrollDirection, string> ScrollCursors = new Dictionary<ScrollDirection, string>
{
@@ -145,7 +145,7 @@ namespace OpenRA.Mods.Common.Widgets
tooltipContainer = Exts.Lazy(() =>
Ui.Root.Get<TooltipContainerWidget>(TooltipContainer));
resourceRenderers = world.WorldActor.TraitsImplementing<ResourceRenderer>().ToArray();
resourceRenderers = world.WorldActor.TraitsImplementing<IResourceRenderer>().ToArray();
}
public override void Initialize(WidgetArgs args)
@@ -269,11 +269,11 @@ namespace OpenRA.Mods.Common.Widgets
foreach (var resourceRenderer in resourceRenderers)
{
var resource = resourceRenderer.GetRenderedResourceType(cell);
if (resource != null)
var resourceTooltip = resourceRenderer.GetRenderedResourceTooltip(cell);
if (resourceTooltip != null)
{
TooltipType = WorldTooltipType.Resource;
ResourceTooltip = resource;
ResourceTooltip = resourceTooltip;
break;
}
}