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

Rewrite color inversal in a reusable way

Browse Source
This commit is contained in:
Oliver Brakmann
2016-08-26 22:06:10 +02:00
parent d0109491a7
commit 8ad18ad161
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Support; using OpenRA.Support;
using OpenRA.Widgets;
using SharpFont; using SharpFont;
namespace OpenRA.Graphics namespace OpenRA.Graphics
@@ -93,6 +94,11 @@ namespace OpenRA.Graphics
DrawText(text, location, fg); DrawText(text, location, fg);
} }
public void DrawTextWithContrast(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset)
{
DrawTextWithContrast(text, location, fg, WidgetUtils.GetContrastColor(fg, bgDark, bgLight), offset);
}
public int2 Measure(string text) public int2 Measure(string text)
{ {
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))

6
OpenRA.Game/Widgets/WidgetUtils.cs
View File

@@ -250,6 +250,12 @@ namespace OpenRA.Widgets
return trimmed; return trimmed;
} }
public static Color GetContrastColor(Color fgColor, Color bgDark, Color bgLight)
{
var fg = new HSLColor(fgColor);
return fg.RGB == Color.White || fg.L > 80 ? bgDark : bgLight;
}
} }
public class CachedTransform<T, U> public class CachedTransform<T, U>

16
OpenRA.Mods.Common/Widgets/SupportPowerTimerWidget.cs
View File

@@ -29,7 +29,8 @@ namespace OpenRA.Mods.Common.Widgets
readonly int timestep; readonly int timestep;
readonly IEnumerable<SupportPowerInstance> powers; readonly IEnumerable<SupportPowerInstance> powers;
Tuple<string, Color, Color>[] texts; readonly Color bgDark, bgLight;
Pair<string, Color>[] texts;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public SupportPowerTimerWidget(World world) public SupportPowerTimerWidget(World world)
@@ -43,6 +44,9 @@ namespace OpenRA.Mods.Common.Widgets
timestep = world.Timestep; timestep = world.Timestep;
if (world.IsReplay) if (world.IsReplay)
timestep = world.WorldActor.Trait<MapOptions>().GameSpeed.Timestep; timestep = world.WorldActor.Trait<MapOptions>().GameSpeed.Timestep;
bgDark = ChromeMetrics.Get<Color>("TextContrastColorDark");
bgLight = ChromeMetrics.Get<Color>("TextContrastColorLight");
} }
public override void Tick() public override void Tick()
@@ -66,11 +70,7 @@ namespace OpenRA.Mods.Common.Widgets
var color = !p.Ready || Game.LocalTick % 50 < 25 ? playerColor : Color.White; var color = !p.Ready || Game.LocalTick % 50 < 25 ? playerColor : Color.White;
var inversedColor = self.Owner.Color; return Pair.New(text, color);
var inversedL = color == Color.White || inversedColor.L > 128 ? (byte)0 : (byte)255;
inversedColor = new HSLColor(inversedColor.H, 0, inversedL);
return Tuple.Create(text, color, inversedColor.RGB);
}).ToArray(); }).ToArray();
} }
@@ -83,8 +83,8 @@ namespace OpenRA.Mods.Common.Widgets
foreach (var t in texts) foreach (var t in texts)
{ {
var font = Game.Renderer.Fonts[Font]; var font = Game.Renderer.Fonts[Font];
font.DrawTextWithContrast(t.Item1, new float2(Bounds.Location) + new float2(0, y), t.Item2, t.Item3, 1); font.DrawTextWithContrast(t.First, new float2(Bounds.Location) + new float2(0, y), t.Second, bgDark, bgLight, 1);
y += (font.Measure(t.Item1).Y + 5) * (int)Order; y += (font.Measure(t.First).Y + 5) * (int)Order;
} }
} }