Add a shadow to text drawn in player colors

This commit is contained in:
Oliver Brakmann
2016-08-26 23:37:15 +02:00
parent 1059d5b88d
commit 38c16e4f7a
25 changed files with 140 additions and 5 deletions

View File

@@ -12,6 +12,7 @@
using System;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Graphics
{
@@ -21,17 +22,27 @@ namespace OpenRA.Mods.Common.Graphics
readonly WPos pos;
readonly int zOffset;
readonly Color color;
readonly Color bgDark;
readonly Color bgLight;
readonly string text;
public TextRenderable(SpriteFont font, WPos pos, int zOffset, Color color, string text)
public TextRenderable(SpriteFont font, WPos pos, int zOffset, Color color, Color bgDark, Color bgLight, string text)
{
this.font = font;
this.pos = pos;
this.zOffset = zOffset;
this.color = color;
this.bgDark = bgDark;
this.bgLight = bgLight;
this.text = text;
}
public TextRenderable(SpriteFont font, WPos pos, int zOffset, Color color, string text)
: this(font, pos, zOffset, color,
ChromeMetrics.Get<Color>("TextContrastColorDark"),
ChromeMetrics.Get<Color>("TextContrastColorLight"),
text) { }
public WPos Pos { get { return pos; } }
public PaletteReference Palette { get { return null; } }
public int ZOffset { get { return zOffset; } }
@@ -47,7 +58,7 @@ namespace OpenRA.Mods.Common.Graphics
{
var screenPos = wr.Viewport.Zoom * (wr.ScreenPosition(pos) - wr.Viewport.TopLeft.ToFloat2()) - 0.5f * font.Measure(text).ToFloat2();
var screenPxPos = new float2((float)Math.Round(screenPos.X), (float)Math.Round(screenPos.Y));
font.DrawTextWithContrast(text, screenPxPos, color, Color.Black, 1);
font.DrawTextWithContrast(text, screenPxPos, color, bgDark, bgLight, 1);
}
public void RenderDebugGeometry(WorldRenderer wr)

View File

@@ -21,6 +21,8 @@ namespace OpenRA.Mods.Common.Widgets
{
public readonly int RemoveTime = 0;
public readonly bool UseContrast = false;
public readonly Color BackgroundColorDark = ChromeMetrics.Get<Color>("TextContrastColorDark");
public readonly Color BackgroundColorLight = ChromeMetrics.Get<Color>("TextContrastColorLight");
public string Notification = "";
const int LogLength = 9;
@@ -57,7 +59,7 @@ namespace OpenRA.Mods.Common.Widgets
if (owner != null)
{
font.DrawTextWithContrast(owner, chatpos,
line.Color, Color.Black, UseContrast ? 1 : 0);
line.Color, BackgroundColorDark, BackgroundColorLight, UseContrast ? 1 : 0);
}
font.DrawTextWithContrast(text, chatpos + new int2(inset, 0),

View File

@@ -40,6 +40,8 @@ namespace OpenRA.Mods.Common.Widgets
public bool DisplayFirstYAxisValue = false;
public string LabelFont;
public string AxisFont;
public Color BackgroundColorDark = ChromeMetrics.Get<Color>("TextContrastColorDark");
public Color BackgroundColorLight = ChromeMetrics.Get<Color>("TextContrastColorLight");
public LineGraphWidget()
{
@@ -79,6 +81,8 @@ namespace OpenRA.Mods.Common.Widgets
DisplayFirstYAxisValue = other.DisplayFirstYAxisValue;
LabelFont = other.LabelFont;
AxisFont = other.AxisFont;
BackgroundColorDark = other.BackgroundColorDark;
BackgroundColorLight = other.BackgroundColorLight;
}
public override void Draw()
@@ -131,10 +135,12 @@ namespace OpenRA.Mods.Common.Widgets
}), 1, color);
if (lastPoint != 0f)
tiny.DrawText(GetValueFormat().F(lastPoint), origin + new float2(lastX * xStep, -lastPoint * scale - 2), color);
tiny.DrawTextWithShadow(GetValueFormat().F(lastPoint), origin + new float2(lastX * xStep, -lastPoint * scale - 2),
color, BackgroundColorDark, BackgroundColorLight, 1);
}
tiny.DrawText(key, new float2(rect.Left, rect.Top) + new float2(5, 10 * keyOffset + 3), color);
tiny.DrawTextWithShadow(key, new float2(rect.Left, rect.Top) + new float2(5, 10 * keyOffset + 3),
color, BackgroundColorDark, BackgroundColorLight, 1);
keyOffset++;
}

View File

@@ -128,10 +128,12 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
X: 40
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
Background@THREEBUTTON_PROMPT:
X: (WINDOW_RIGHT - WIDTH)/2

View File

@@ -59,9 +59,11 @@ Container@CHAT_PANEL:
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@TEXT:
X: 12
Width: PARENT_RIGHT - 17
Height: 15
WordWrap: true
VAlign: Top
Shadow: True

View File

@@ -88,6 +88,7 @@ Container@SKIRMISH_STATS:
X: 10
Width: 210
Height: 25
Shadow: True
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer: TOOLTIP_CONTAINER
Template: INGAME_CLIENT_TOOLTIP
@@ -103,8 +104,10 @@ Container@SKIRMISH_STATS:
X: 264
Width: 86
Height: 25
Shadow: True
Label@SCORE:
X: 360
Width: 75
Height: 25
Align: Right
Shadow: True

View File

@@ -308,57 +308,67 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@POWER:
X: 395
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@KILLS:
X: 455
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@DEATHS:
X: 515
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_DESTROYED:
X: 575
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_LOST:
X: 655
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EXPERIENCE:
X: 735
Y: 0
Width: 95
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ACTIONS_MIN:
X: 830
Y: 0
Width: 90
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -378,42 +388,50 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_THIS_MIN:
X: 395
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS:
X: 535
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED:
X: 615
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@SPENT:
X: 695
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@HARVESTERS:
X: 775
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -433,6 +451,7 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverProductionIcons@PRODUCTION_ICONS:
X: 215
Y: 0
@@ -462,40 +481,47 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@ASSETS_DESTROYED:
X: 215
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS_LOST:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@UNITS_KILLED:
X: 395
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@UNITS_DEAD:
X: 495
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_KILLED:
X: 615
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_DEAD:
X: 715
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
X: 10
Y: 10

View File

@@ -220,10 +220,12 @@ Container@OBSERVER_WIDGETS:
X: 40
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
Container@PLAYER_WIDGETS:
Children:

View File

@@ -92,17 +92,20 @@ Container@SERVER_LOBBY:
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@NAME:
X: 45
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@TEXT:
X: 55
Width: PARENT_RIGHT - 60
Height: 15
WordWrap: true
VAlign: Top
Shadow: True
TextField@CHAT_TEXTFIELD:
X: 200
Y: PARENT_BOTTOM - HEIGHT

View File

@@ -275,6 +275,7 @@ Container@REPLAYBROWSER_PANEL:
X: 40
Width: PARENT_RIGHT-50
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT

View File

@@ -49,6 +49,7 @@ Background@WORLD_TOOLTIP:
Y: 19
Height: 23
Font: Bold
Shadow: True
Label@EXTRA:
X: 5
Y: 47

View File

@@ -90,10 +90,12 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
X: 34
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
ScrollPanel@NEWS_PANEL:
Width: 400

View File

@@ -89,6 +89,7 @@ Container@SKIRMISH_STATS:
X: 10
Width: 210
Height: 25
Shadow: True
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer: TOOLTIP_CONTAINER
Template: INGAME_CLIENT_TOOLTIP
@@ -104,8 +105,10 @@ Container@SKIRMISH_STATS:
X: 264
Width: 86
Height: 25
Shadow: True
Label@SCORE:
X: 360
Width: 75
Height: 25
Align: Right
Shadow: True

View File

@@ -73,10 +73,12 @@ Container@OBSERVER_WIDGETS:
X: 34
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
Container@REPLAY_PLAYER:
Logic: ReplayControlBarLogic
Y: 39

View File

@@ -52,6 +52,7 @@ Background@WORLD_TOOLTIP:
Y: 25
Height: 23
Font: Bold
Shadow: True
Label@EXTRA:
X: 7
Y: 57

View File

@@ -93,10 +93,12 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
X: 40
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
ScrollPanel@NEWS_PANEL:
Width: 400

View File

@@ -55,9 +55,11 @@ Container@CHAT_PANEL:
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@TEXT:
X: 12
Width: PARENT_RIGHT - 17
Height: 15
WordWrap: true
VAlign: Top
Shadow: True

View File

@@ -89,6 +89,7 @@ Container@SKIRMISH_STATS:
X: 10
Width: 210
Height: 25
Shadow: True
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer: TOOLTIP_CONTAINER
Template: INGAME_CLIENT_TOOLTIP
@@ -104,8 +105,10 @@ Container@SKIRMISH_STATS:
X: 264
Width: 86
Height: 25
Shadow: True
Label@SCORE:
X: 360
Width: 75
Height: 25
Align: Right
Shadow: True

View File

@@ -101,10 +101,12 @@ Container@OBSERVER_WIDGETS:
X: 40
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
Image@SIDEBAR_BACKGROUND_BOTTOM:
X: WINDOW_RIGHT - 250
Y: 297

View File

@@ -308,57 +308,67 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@POWER:
X: 395
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@KILLS:
X: 455
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@DEATHS:
X: 515
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_DESTROYED:
X: 575
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_LOST:
X: 655
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EXPERIENCE:
X: 735
Y: 0
Width: 95
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ACTIONS_MIN:
X: 830
Y: 0
Width: 90
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -378,42 +388,50 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_THIS_MIN:
X: 395
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS:
X: 535
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED:
X: 615
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@SPENT:
X: 695
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@HARVESTERS:
X: 775
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -433,6 +451,7 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverProductionIcons@PRODUCTION_ICONS:
X: 215
Y: 0
@@ -462,40 +481,47 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@ASSETS_DESTROYED:
X: 215
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS_LOST:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@UNITS_KILLED:
X: 395
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@UNITS_DEAD:
X: 495
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_KILLED:
X: 615
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_DEAD:
X: 715
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
X: 0
Y: 0

View File

@@ -93,17 +93,20 @@ Background@SERVER_LOBBY:
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@NAME:
X: 45
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@TEXT:
X: 55
Width: PARENT_RIGHT - 60
Height: 15
WordWrap: true
VAlign: Top
Shadow: True
TextField@CHAT_TEXTFIELD:
X: 205
Y: PARENT_BOTTOM - HEIGHT

View File

@@ -264,6 +264,7 @@ Background@REPLAYBROWSER_PANEL:
X: 40
Width: PARENT_RIGHT-50
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT

View File

@@ -52,6 +52,7 @@ Background@WORLD_TOOLTIP:
Y: 22
Height: 23
Font: Bold
Shadow: True
Label@EXTRA:
X: 7
Y: 50

View File

@@ -90,10 +90,12 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
X: 40
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
ScrollPanel@NEWS_PANEL:
Width: 400

View File

@@ -308,57 +308,67 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@POWER:
X: 395
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@KILLS:
X: 455
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@DEATHS:
X: 515
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_DESTROYED:
X: 575
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_LOST:
X: 655
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EXPERIENCE:
X: 735
Y: 0
Width: 95
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ACTIONS_MIN:
X: 830
Y: 0
Width: 90
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -378,42 +388,50 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_THIS_MIN:
X: 395
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS:
X: 535
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED:
X: 615
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@SPENT:
X: 695
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@HARVESTERS:
X: 775
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -433,6 +451,7 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverProductionIcons@PRODUCTION_ICONS:
X: 215
Y: 0
@@ -464,40 +483,47 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@ASSETS_DESTROYED:
X: 215
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS_LOST:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@UNITS_KILLED:
X: 395
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@UNITS_DEAD:
X: 495
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_KILLED:
X: 615
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_DEAD:
X: 715
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
X: 0
Y: 0