Make brush rendering self-contained
This commit is contained in:
Gustas
@@ -12,57 +12,24 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using OpenRA.Graphics;
|
||||
using OpenRA.Mods.Common.Terrain;
|
||||
using OpenRA.Mods.Common.Widgets;
|
||||
using OpenRA.Traits;
|
||||
|
||||
namespace OpenRA.Mods.Common.Traits
|
||||
{
|
||||
public enum EditorCursorType { None, Actor, TerrainTemplate, Resource }
|
||||
|
||||
[TraitLocation(SystemActors.EditorWorld)]
|
||||
[Desc("Required for the map editor to work. Attach this to the world actor.")]
|
||||
public class EditorCursorLayerInfo : TraitInfo, Requires<EditorActorLayerInfo>, Requires<ITiledTerrainRendererInfo>
|
||||
public class EditorCursorLayerInfo : TraitInfo<EditorCursorLayer>, Requires<EditorActorLayerInfo>, Requires<ITiledTerrainRendererInfo> { }
|
||||
|
||||
public class EditorCursorLayer : ITickRender, IRenderAboveShroud, IRenderAnnotations
|
||||
{
|
||||
public readonly WAngle PreviewFacing = new(384);
|
||||
IEditorBrush brush;
|
||||
|
||||
public override object Create(ActorInitializer init) { return new EditorCursorLayer(init.Self, this); }
|
||||
}
|
||||
static readonly IEnumerable<IRenderable> NoRenderables = Enumerable.Empty<IRenderable>();
|
||||
|
||||
public class EditorCursorLayer : IWorldLoaded, ITickRender, IRenderAboveShroud, IRenderAnnotations
|
||||
{
|
||||
readonly EditorCursorLayerInfo info;
|
||||
readonly EditorActorLayer editorLayer;
|
||||
readonly ITiledTerrainRenderer terrainRenderer;
|
||||
readonly World world;
|
||||
IResourceRenderer[] resourceRenderers;
|
||||
|
||||
public int CurrentToken { get; private set; }
|
||||
public EditorCursorType Type { get; private set; }
|
||||
public EditorActorPreview Actor { get; private set; }
|
||||
CPos actorLocation;
|
||||
SubCell actorSubCell;
|
||||
WVec actorCenterOffset;
|
||||
bool actorSharesCell;
|
||||
|
||||
public TerrainTemplateInfo TerrainTemplate { get; private set; }
|
||||
public string ResourceType { get; private set; }
|
||||
CPos terrainOrResourceCell;
|
||||
bool terrainOrResourceDirty;
|
||||
readonly List<IRenderable> terrainOrResourcePreview = new();
|
||||
|
||||
public EditorCursorLayer(Actor self, EditorCursorLayerInfo info)
|
||||
public void SetBrush(IEditorBrush brush)
|
||||
{
|
||||
this.info = info;
|
||||
world = self.World;
|
||||
editorLayer = self.Trait<EditorActorLayer>();
|
||||
terrainRenderer = self.Trait<ITiledTerrainRenderer>();
|
||||
|
||||
Type = EditorCursorType.None;
|
||||
}
|
||||
|
||||
void IWorldLoaded.WorldLoaded(World w, WorldRenderer wr)
|
||||
{
|
||||
resourceRenderers = w.WorldActor.TraitsImplementing<IResourceRenderer>().ToArray();
|
||||
this.brush = brush;
|
||||
}
|
||||
|
||||
void ITickRender.TickRender(WorldRenderer wr, Actor self)
|
||||
@@ -70,69 +37,15 @@ namespace OpenRA.Mods.Common.Traits
|
||||
if (wr.World.Type != WorldType.Editor)
|
||||
return;
|
||||
|
||||
if (Type == EditorCursorType.TerrainTemplate || Type == EditorCursorType.Resource)
|
||||
{
|
||||
var cell = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
|
||||
if (terrainOrResourceCell != cell || terrainOrResourceDirty)
|
||||
{
|
||||
terrainOrResourceCell = cell;
|
||||
terrainOrResourceDirty = false;
|
||||
terrainOrResourcePreview.Clear();
|
||||
|
||||
var pos = world.Map.CenterOfCell(cell);
|
||||
if (Type == EditorCursorType.TerrainTemplate)
|
||||
terrainOrResourcePreview.AddRange(terrainRenderer.RenderPreview(wr, TerrainTemplate, pos));
|
||||
else
|
||||
terrainOrResourcePreview.AddRange(resourceRenderers.SelectMany(r => r.RenderPreview(wr, ResourceType, pos)));
|
||||
}
|
||||
}
|
||||
else if (Type == EditorCursorType.Actor)
|
||||
{
|
||||
// Offset mouse position by the center offset (in world pixels)
|
||||
var worldPx = wr.Viewport.ViewToWorldPx(Viewport.LastMousePos) - wr.ScreenPxOffset(actorCenterOffset);
|
||||
var cell = wr.Viewport.ViewToWorld(wr.Viewport.WorldToViewPx(worldPx));
|
||||
var subCell = actorSharesCell ? editorLayer.FreeSubCellAt(cell) : SubCell.Invalid;
|
||||
var updated = false;
|
||||
if (actorLocation != cell)
|
||||
{
|
||||
actorLocation = cell;
|
||||
Actor.ReplaceInit(new LocationInit(cell));
|
||||
updated = true;
|
||||
}
|
||||
|
||||
if (actorSubCell != subCell)
|
||||
{
|
||||
actorSubCell = subCell;
|
||||
|
||||
if (Actor.RemoveInits<SubCellInit>() > 0)
|
||||
updated = true;
|
||||
|
||||
var subcell = world.Map.Tiles.Contains(cell) ? editorLayer.FreeSubCellAt(cell) : SubCell.Invalid;
|
||||
if (subcell != SubCell.Invalid)
|
||||
{
|
||||
Actor.AddInit(new SubCellInit(subcell));
|
||||
updated = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (updated)
|
||||
Actor = new EditorActorPreview(wr, null, Actor.Export(), Actor.Owner);
|
||||
}
|
||||
brush?.TickRender(wr, self);
|
||||
}
|
||||
|
||||
static readonly IEnumerable<IRenderable> NoRenderables = Enumerable.Empty<IRenderable>();
|
||||
IEnumerable<IRenderable> IRenderAboveShroud.RenderAboveShroud(Actor self, WorldRenderer wr)
|
||||
{
|
||||
if (wr.World.Type != WorldType.Editor)
|
||||
return NoRenderables;
|
||||
|
||||
if (Type == EditorCursorType.TerrainTemplate || Type == EditorCursorType.Resource)
|
||||
return terrainOrResourcePreview;
|
||||
|
||||
if (Type == EditorCursorType.Actor)
|
||||
return Actor.Render().OrderBy(WorldRenderer.RenderableZPositionComparisonKey);
|
||||
|
||||
return NoRenderables;
|
||||
return brush?.RenderAboveShroud(self, wr) ?? NoRenderables;
|
||||
}
|
||||
|
||||
bool IRenderAboveShroud.SpatiallyPartitionable => false;
|
||||
@@ -142,88 +55,9 @@ namespace OpenRA.Mods.Common.Traits
|
||||
if (wr.World.Type != WorldType.Editor)
|
||||
return NoRenderables;
|
||||
|
||||
return Type == EditorCursorType.Actor ? Actor.RenderAnnotations() : NoRenderables;
|
||||
return brush?.RenderAnnotations(self, wr) ?? NoRenderables;
|
||||
}
|
||||
|
||||
bool IRenderAnnotations.SpatiallyPartitionable => false;
|
||||
|
||||
public int SetActor(WorldRenderer wr, ActorInfo actor, PlayerReference owner)
|
||||
{
|
||||
var ios = actor.TraitInfoOrDefault<IOccupySpaceInfo>();
|
||||
var buildingInfo = ios as BuildingInfo;
|
||||
actorCenterOffset = buildingInfo?.CenterOffset(world) ?? WVec.Zero;
|
||||
actorSharesCell = ios != null && ios.SharesCell;
|
||||
actorSubCell = SubCell.Invalid;
|
||||
|
||||
// Enforce first entry of ValidOwnerNames as owner if the actor has RequiresSpecificOwners
|
||||
var ownerName = owner.Name;
|
||||
var specificOwnerInfo = actor.TraitInfoOrDefault<RequiresSpecificOwnersInfo>();
|
||||
if (specificOwnerInfo != null && !specificOwnerInfo.ValidOwnerNames.Contains(ownerName))
|
||||
ownerName = specificOwnerInfo.ValidOwnerNames.First();
|
||||
|
||||
var reference = new ActorReference(actor.Name)
|
||||
{
|
||||
new OwnerInit(ownerName),
|
||||
new FactionInit(owner.Faction)
|
||||
};
|
||||
|
||||
var worldPx = wr.Viewport.ViewToWorldPx(Viewport.LastMousePos) - wr.ScreenPxOffset(actorCenterOffset);
|
||||
var cell = wr.Viewport.ViewToWorld(wr.Viewport.WorldToViewPx(worldPx));
|
||||
|
||||
reference.Add(new LocationInit(cell));
|
||||
if (ios != null && ios.SharesCell)
|
||||
{
|
||||
actorSubCell = editorLayer.FreeSubCellAt(cell);
|
||||
if (actorSubCell != SubCell.Invalid)
|
||||
reference.Add(new SubCellInit(actorSubCell));
|
||||
}
|
||||
|
||||
if (actor.HasTraitInfo<IFacingInfo>())
|
||||
reference.Add(new FacingInit(info.PreviewFacing));
|
||||
|
||||
Type = EditorCursorType.Actor;
|
||||
Actor = new EditorActorPreview(wr, null, reference, owner);
|
||||
TerrainTemplate = null;
|
||||
ResourceType = null;
|
||||
|
||||
return ++CurrentToken;
|
||||
}
|
||||
|
||||
public int SetTerrainTemplate(WorldRenderer wr, TerrainTemplateInfo template)
|
||||
{
|
||||
terrainOrResourceCell = wr.Viewport.ViewToWorld(wr.Viewport.WorldToViewPx(Viewport.LastMousePos));
|
||||
|
||||
Type = EditorCursorType.TerrainTemplate;
|
||||
TerrainTemplate = template;
|
||||
Actor = null;
|
||||
ResourceType = null;
|
||||
terrainOrResourceDirty = true;
|
||||
|
||||
return ++CurrentToken;
|
||||
}
|
||||
|
||||
public int SetResource(WorldRenderer wr, string resourceType)
|
||||
{
|
||||
terrainOrResourceCell = wr.Viewport.ViewToWorld(wr.Viewport.WorldToViewPx(Viewport.LastMousePos));
|
||||
|
||||
Type = EditorCursorType.Resource;
|
||||
ResourceType = resourceType;
|
||||
Actor = null;
|
||||
TerrainTemplate = null;
|
||||
terrainOrResourceDirty = true;
|
||||
|
||||
return ++CurrentToken;
|
||||
}
|
||||
|
||||
public void Clear(int token)
|
||||
{
|
||||
if (token != CurrentToken)
|
||||
return;
|
||||
|
||||
Type = EditorCursorType.None;
|
||||
Actor = null;
|
||||
TerrainTemplate = null;
|
||||
ResourceType = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user