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

Add IRenderModifier.ModifyScreenBounds to support WithShadow.

Browse Source
This commit is contained in:
Paul Chote
2017-12-09 19:04:34 +00:00
committed by reaperrr
parent 86bfe28ade
commit fa65fef4d1
7 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -254,7 +254,15 @@ namespace OpenRA.Traits
IEnumerable<Actor> ActorsInBox(WPos a, WPos b);
}
public interface IRenderModifier { IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r); }
public interface IRenderModifier
{
IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r);
// HACK: This is here to support the WithShadow trait.
// That trait should be rewritten using standard techniques, and then this interface method removed
IEnumerable<Rectangle> ModifyScreenBounds(Actor self, WorldRenderer wr, IEnumerable<Rectangle> r);
}
public interface ILoadsPalettes { void LoadPalettes(WorldRenderer wr); }
public interface ILoadsPlayerPalettes { void LoadPlayerPalettes(WorldRenderer wr, string playerName, HSLColor playerColor, bool replaceExisting); }
public interface IPaletteModifier { void AdjustPalette(IReadOnlyDictionary<string, MutablePalette> b); }

5
OpenRA.Mods.Common/Traits/Cloak.cs
View File

@@ -137,6 +137,11 @@ namespace OpenRA.Mods.Common.Traits
return SpriteRenderable.None;
}
IEnumerable<Rectangle> IRenderModifier.ModifyScreenBounds(Actor self, WorldRenderer wr, IEnumerable<Rectangle> bounds)
{
return bounds;
}
void ITick.Tick(Actor self)
{
if (!IsTraitDisabled)

6
OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs
View File

@@ -10,6 +10,7 @@
#endregion
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Primitives;
@@ -148,6 +149,11 @@ namespace OpenRA.Mods.Common.Traits
{
return IsVisible(self, self.World.RenderPlayer) || isRendering ? r : SpriteRenderable.None;
}
IEnumerable<Rectangle> IRenderModifier.ModifyScreenBounds(Actor self, WorldRenderer wr, IEnumerable<Rectangle> bounds)
{
return bounds;
}
}
public class HiddenUnderFogInit : IActorInit { }

8
OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderShroud.cs
View File

@@ -10,6 +10,7 @@
#endregion
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Traits;
@@ -58,9 +59,14 @@ namespace OpenRA.Mods.Common.Traits
return Info.AlwaysVisibleStances.HasStance(stance) || IsVisibleInner(self, byPlayer);
}
public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
IEnumerable<IRenderable> IRenderModifier.ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
{
return IsVisible(self, self.World.RenderPlayer) ? r : SpriteRenderable.None;
}
IEnumerable<Rectangle> IRenderModifier.ModifyScreenBounds(Actor self, WorldRenderer wr, IEnumerable<Rectangle> bounds)
{
return bounds;
}
}
}

6
OpenRA.Mods.Common/Traits/Modifiers/WithColoredOverlay.cs
View File

@@ -10,6 +10,7 @@
#endregion
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Traits;
@@ -49,5 +50,10 @@ namespace OpenRA.Mods.Common.Traits
.AsDecoration();
}
}
IEnumerable<Rectangle> IRenderModifier.ModifyScreenBounds(Actor self, WorldRenderer wr, IEnumerable<Rectangle> bounds)
{
return bounds;
}
}
}

6
OpenRA.Mods.Common/Traits/Render/Hovers.cs
View File

@@ -11,6 +11,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
@@ -50,5 +51,10 @@ namespace OpenRA.Mods.Common.Traits.Render
return r.Select(a => a.OffsetBy(worldVisualOffset));
}
IEnumerable<Rectangle> IRenderModifier.ModifyScreenBounds(Actor self, WorldRenderer wr, IEnumerable<Rectangle> bounds)
{
return bounds;
}
}
}

17
OpenRA.Mods.Common/Traits/Render/WithShadow.cs
View File

@@ -10,6 +10,7 @@
#endregion
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
@@ -40,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits.Render
this.info = info;
}
public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
IEnumerable<IRenderable> IRenderModifier.ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
{
if (IsTraitDisabled)
return r;
@@ -55,5 +56,19 @@ namespace OpenRA.Mods.Common.Traits.Render
return shadowSprites.Concat(r);
}
IEnumerable<Rectangle> IRenderModifier.ModifyScreenBounds(Actor self, WorldRenderer wr, IEnumerable<Rectangle> bounds)
{
foreach (var r in bounds)
yield return r;
if (IsTraitDisabled)
yield break;
var height = self.World.Map.DistanceAboveTerrain(self.CenterPosition).Length;
var offset = wr.ScreenPxOffset(info.Offset - new WVec(0, 0, height));
foreach (var r in bounds)
yield return new Rectangle(r.X + offset.X, r.Y + offset.Y, r.Width, r.Height);
}
}
}