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

add ColorRamp type; change everything to use it; maps not yet upgraded

Browse Source
This commit is contained in:
Chris Forbes
2011-01-08 17:10:00 +13:00
parent e2ff40dc7f
commit 3426b52247
22 changed files with 163 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Editor/Surface.cs
View File

@@ -476,7 +476,7 @@ namespace OpenRA.Editor
{ {
var pr = Map.Players[name]; var pr = Map.Players[name];
var pcpi = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>(); var pcpi = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>();
var remap = new PlayerColorRemap(pr.Color, pr.Color2, pcpi.PaletteFormat); var remap = new PlayerColorRemap(pr.ColorRamp, pcpi.PaletteFormat);
return RenderUtils.MakeSystemPalette(new Palette(Palette, remap)); return RenderUtils.MakeSystemPalette(new Palette(Palette, remap));
} }

64
OpenRA.FileFormats/ColorHSLR.cs Normal file
View File

@@ -0,0 +1,64 @@
#region Copyright & License Information
/*
* Copyright 2007-2010 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. For more information,
* see LICENSE.
*/
#endregion
using System.Drawing;
namespace OpenRA.FileFormats
{
public struct ColorRamp
{
public byte H,S,L,R;
public ColorRamp(byte h, byte s, byte l, byte r)
{
H = h; S = s; L = l; R = r;
}
/* returns a color along the Lum ramp */
public Color GetColor( float t )
{
return ColorFromHSL( H / 255f, S / 255f, float2.Lerp( L, R, t ) / 255f );
}
public override string ToString()
{
return "{0},{1},{2},{3}".F(H, S, L, R);
}
// hk is hue in the range [0,1] instead of [0,360]
public static Color ColorFromHSL(float hk, float s, float l)
{
// Convert from HSL to RGB
var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
var p = 2 * l - q;
float[] trgb = { hk + 1 / 3.0f,
hk,
hk - 1/3.0f };
float[] rgb = { 0, 0, 0 };
for (int k = 0; k < 3; k++)
{
while (trgb[k] < 0) trgb[k] += 1.0f;
while (trgb[k] > 1) trgb[k] -= 1.0f;
}
for (int k = 0; k < 3; k++)
{
if (trgb[k] < 1 / 6.0f) { rgb[k] = (p + ((q - p) * 6 * trgb[k])); }
else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = (p + ((q - p) * 6 * (2.0f / 3 - trgb[k]))); }
else { rgb[k] = p; }
}
return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
}
}
}

83
OpenRA.FileFormats/FieldLoader.cs
View File

@@ -126,45 +126,58 @@ namespace OpenRA.FileFormats
return InvalidValueAction(x,fieldType, field); return InvalidValueAction(x,fieldType, field);
} }
else if (fieldType.IsEnum) else if (fieldType == typeof(ColorRamp))
{ {
if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower())) var parts = x.Split(',');
return InvalidValueAction(x,fieldType, field); if (parts.Length == 4)
return Enum.Parse(fieldType, x, true); return new ColorRamp(
} (byte)int.Parse(parts[0]).Clamp(0, 255),
(byte)int.Parse(parts[1]).Clamp(0, 255),
(byte)int.Parse(parts[2]).Clamp(0, 255),
(byte)int.Parse(parts[3]).Clamp(0, 255));
else if (fieldType == typeof(bool)) return InvalidValueAction(x, fieldType, field);
return ParseYesNo(x, fieldType, field); }
else if (fieldType.IsArray) else if (fieldType.IsEnum)
{ {
if (x == null) if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
return Array.CreateInstance(fieldType.GetElementType(), 0); return InvalidValueAction(x, fieldType, field);
return Enum.Parse(fieldType, x, true);
}
var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); else if (fieldType == typeof(bool))
return ParseYesNo(x, fieldType, field);
var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length); else if (fieldType.IsArray)
for (int i = 0; i < parts.Length; i++) {
ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i); if (x == null)
return ret; return Array.CreateInstance(fieldType.GetElementType(), 0);
}
else if (fieldType == typeof(int2)) var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
{
var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
return new int2(int.Parse(parts[0]), int.Parse(parts[1])); for (int i = 0; i < parts.Length; i++)
} ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
else if (fieldType == typeof(float2)) return ret;
{ }
var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); else if (fieldType == typeof(int2))
float xx = 0; {
float yy = 0; var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
float res; return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
if (float.TryParse(parts[0].Replace("%",""), out res)) }
xx = res * (parts[0].Contains( '%' ) ? 0.01f : 1f); else if (fieldType == typeof(float2))
if (float.TryParse(parts[1].Replace("%",""), out res)) {
yy = res * (parts[1].Contains( '%' ) ? 0.01f : 1f); var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
return new float2(xx,yy); float xx = 0;
} float yy = 0;
float res;
if (float.TryParse(parts[0].Replace("%", ""), out res))
xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
if (float.TryParse(parts[1].Replace("%", ""), out res))
yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
return new float2(xx, yy);
}
UnknownFieldAction("[Type] {0}".F(x),fieldType); UnknownFieldAction("[Type] {0}".F(x),fieldType);
return null; return null;

8
OpenRA.FileFormats/Map/PlayerReference.cs
View File

@@ -8,7 +8,8 @@
*/ */
#endregion #endregion
using System.Drawing; using System.Drawing;
using System;
namespace OpenRA.FileFormats namespace OpenRA.FileFormats
{ {
@@ -26,8 +27,9 @@ namespace OpenRA.FileFormats
public string Race; public string Race;
public bool LockColor = false; public bool LockColor = false;
public Color Color = Color.FromArgb(238,238,238); [Obsolete] public Color Color = Color.FromArgb(238,238,238);
public Color Color2 = Color.FromArgb(44,28,24); [Obsolete] public Color Color2 = Color.FromArgb(44,28,24);
public ColorRamp ColorRamp = new ColorRamp(75, 255, 180, 25);
public int InitialCash = 0; public int InitialCash = 0;
public string[] Allies = {}; public string[] Allies = {};

1
OpenRA.FileFormats/OpenRA.FileFormats.csproj
View File

@@ -60,6 +60,7 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="ColorHSLR.cs" />
<Compile Include="Evaluator.cs" /> <Compile Include="Evaluator.cs" />
<Compile Include="Exts.cs" /> <Compile Include="Exts.cs" />
<Compile Include="FieldLoader.cs" /> <Compile Include="FieldLoader.cs" />

34
OpenRA.FileFormats/PlayerColorRemap.cs
View File

@@ -21,8 +21,11 @@ namespace OpenRA.FileFormats
{ {
Dictionary<int, Color> remapColors; Dictionary<int, Color> remapColors;
public PlayerColorRemap(Color c1, Color c2, PaletteFormat fmt) public PlayerColorRemap(ColorRamp c, PaletteFormat fmt)
{ {
var c1 = c.GetColor(0);
var c2 = c.GetColor(1); /* temptemp: this can be expressed better */
var baseIndex = (fmt == PaletteFormat.cnc) ? 0xb0 : (fmt == PaletteFormat.d2k) ? 240 : 80; var baseIndex = (fmt == PaletteFormat.cnc) ? 0xb0 : (fmt == PaletteFormat.d2k) ? 240 : 80;
var ramp = (fmt == PaletteFormat.cnc) var ramp = (fmt == PaletteFormat.cnc)
? new[] { 0, 2, 4, 6, 8, 10, 13, 15, 1, 3, 5, 7, 9, 11, 12, 14 } ? new[] { 0, 2, 4, 6, 8, 10, 13, 15, 1, 3, 5, 7, 9, 11, 12, 14 }
@@ -46,34 +49,5 @@ namespace OpenRA.FileFormats
return remapColors.TryGetValue(index, out c) return remapColors.TryGetValue(index, out c)
? c : original; ? c : original;
} }
// hk is hue in the range [0,1] instead of [0,360]
public static Color ColorFromHSL(float hk, float s, float l)
{
// Convert from HSL to RGB
var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
var p = 2 * l - q;
float[] trgb = { hk + 1 / 3.0f,
hk,
hk - 1/3.0f };
float[] rgb = { 0, 0, 0 };
for (int k = 0; k < 3; k++)
{
while (trgb[k] < 0) trgb[k] += 1.0f;
while (trgb[k] > 1) trgb[k] -= 1.0f;
}
for (int k = 0; k < 3; k++)
{
if (trgb[k] < 1 / 6.0f) { rgb[k] = (p + ((q - p) * 6 * trgb[k])); }
else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = (p + ((q - p) * 6 * (2.0f / 3 - trgb[k]))); }
else { rgb[k] = p; }
}
return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
}
} }
} }

5
OpenRA.Game/GameRules/Settings.cs
View File

@@ -58,8 +58,9 @@ namespace OpenRA.GameRules
public class PlayerSettings public class PlayerSettings
{ {
public string Name = "Newbie"; public string Name = "Newbie";
public Color Color1 = Color.FromArgb(255,160,238); [Obsolete] public Color Color1 = Color.FromArgb(255,160,238);
public Color Color2 = Color.FromArgb(68,0,56); [Obsolete] public Color Color2 = Color.FromArgb(68,0,56);
public ColorRamp ColorRamp = new ColorRamp(75, 255, 180, 25);
public string LastServer = "localhost:1234"; public string LastServer = "localhost:1234";
} }

3
OpenRA.Game/Network/Session.cs
View File

@@ -41,8 +41,7 @@ namespace OpenRA.Network
public class Client public class Client
{ {
public int Index; public int Index;
public Color Color1; public ColorRamp ColorRamp;
public Color Color2;
public string Country; public string Country;
public int SpawnPoint; public int SpawnPoint;
public string Name; public string Name;

9
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Network
{ {
var player = world != null ? world.FindPlayerByClient(client) : null; var player = world != null ? world.FindPlayerByClient(client) : null;
var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : ""; var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : "";
Game.AddChatLine(client.Color1, client.Name + suffix, order.TargetString); Game.AddChatLine(client.ColorRamp.GetColor(1), client.Name + suffix, order.TargetString);
} }
else else
Game.AddChatLine(Color.White, "(player {0})".F(clientId), order.TargetString); Game.AddChatLine(Color.White, "(player {0})".F(clientId), order.TargetString);
@@ -69,7 +69,7 @@ namespace OpenRA.Network
if (world == null) if (world == null)
{ {
if (client.Team == orderManager.LocalClient.Team) if (client.Team == orderManager.LocalClient.Team)
Game.AddChatLine(client.Color1, client.Name + " (Team)", Game.AddChatLine(client.ColorRamp.GetColor(1), client.Name + " (Team)",
order.TargetString); order.TargetString);
} }
else else
@@ -86,7 +86,7 @@ namespace OpenRA.Network
var suffix = (player != null && player.WinState == WinState.Lost) var suffix = (player != null && player.WinState == WinState.Lost)
? " (Dead)" ? " (Dead)"
: " (Team)"; : " (Team)";
Game.AddChatLine(client.Color1, client.Name + suffix, order.TargetString); Game.AddChatLine(client.ColorRamp.GetColor(1), client.Name + suffix, order.TargetString);
} }
} }
} }
@@ -110,8 +110,7 @@ namespace OpenRA.Network
var info = new Session.Client() var info = new Session.Client()
{ {
Name = Game.Settings.Player.Name, Name = Game.Settings.Player.Name,
Color1 = Game.Settings.Player.Color1, ColorRamp = Game.Settings.Player.ColorRamp,
Color2 = Game.Settings.Player.Color2,
Country = "random", Country = "random",
SpawnPoint = 0, SpawnPoint = 0,
Team = 0, Team = 0,

9
OpenRA.Game/Player.cs
View File

@@ -28,8 +28,7 @@ namespace OpenRA
public WinState WinState = WinState.Undefined; public WinState WinState = WinState.Undefined;
public readonly string Palette; public readonly string Palette;
public readonly Color Color; public readonly ColorRamp ColorRamp;
public readonly Color Color2;
public readonly string PlayerName; public readonly string PlayerName;
public readonly string InternalName; public readonly string InternalName;
@@ -50,8 +49,7 @@ namespace OpenRA
Index = index; Index = index;
Palette = "player" + index; Palette = "player" + index;
Color = pr.Color; ColorRamp = pr.ColorRamp;
Color2 = pr.Color2;
ClientIndex = 0; /* it's a map player, "owned" by host */ ClientIndex = 0; /* it's a map player, "owned" by host */
PlayerName = InternalName = pr.Name; PlayerName = InternalName = pr.Name;
@@ -70,8 +68,7 @@ namespace OpenRA
World = world; World = world;
Index = index; Index = index;
Palette = "player" + index; Palette = "player" + index;
Color = client.Color1; ColorRamp = client.ColorRamp;
Color2 = client.Color2;
PlayerName = client.Name; PlayerName = client.Name;
InternalName = pr.Name; InternalName = pr.Name;

5
OpenRA.Game/Server/Server.cs
View File

@@ -245,10 +245,7 @@ namespace OpenRA.Server
if (pr == null) if (pr == null)
return; return;
if (pr.LockColor) if (pr.LockColor)
{ c.ColorRamp = pr.ColorRamp;
c.Color1 = pr.Color;
c.Color2 = pr.Color2;
}
if (pr.LockRace) if (pr.LockRace)
c.Country = pr.Race; c.Country = pr.Race;
} }

2
OpenRA.Game/Traits/World/PlayerColorPalette.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Traits
{ {
var paletteName = "{0}{1}".F( info.BaseName, owner.Index ); var paletteName = "{0}{1}".F( info.BaseName, owner.Index );
var newpal = new Palette(wr.GetPalette(info.BasePalette), var newpal = new Palette(wr.GetPalette(info.BasePalette),
new PlayerColorRemap(owner.Color, owner.Color2, info.PaletteFormat)); new PlayerColorRemap(owner.ColorRamp, info.PaletteFormat));
wr.AddPalette(paletteName, newpal); wr.AddPalette(paletteName, newpal);
} }
} }

2
OpenRA.Mods.RA/AppearsOnRadar.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA
if (mod != null) if (mod != null)
return mod.RadarColorOverride(self); return mod.RadarColorOverride(self);
return self.Owner.Color; return self.Owner.ColorRamp.GetColor(0);
} }
} }
} }

2
OpenRA.Mods.RA/Cloak.cs
View File

@@ -111,7 +111,7 @@ namespace OpenRA.Mods.RA
public Color RadarColorOverride(Actor self) public Color RadarColorOverride(Actor self)
{ {
var c = self.Owner.Color; var c = self.Owner.ColorRamp.GetColor(0);
if (self.Owner == self.World.LocalPlayer && Cloaked) if (self.Owner == self.World.LocalPlayer && Cloaked)
c = Color.FromArgb(128, c); c = Color.FromArgb(128, c);
return c; return c;

5
OpenRA.Mods.RA/ColorPickerPaletteModifier.cs
View File

@@ -11,8 +11,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits;
using OpenRA.Mods.RA.Widgets.Delegates; using OpenRA.Mods.RA.Widgets.Delegates;
using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
@@ -31,8 +31,7 @@ namespace OpenRA.Mods.RA
public void AdjustPalette(Dictionary<string, Palette> palettes) public void AdjustPalette(Dictionary<string, Palette> palettes)
{ {
palettes["colorpicker"] = new Palette(palettes["colorpicker"], palettes["colorpicker"] = new Palette(palettes["colorpicker"],
new PlayerColorRemap(LobbyDelegate.CurrentColorPreview1, new PlayerColorRemap(LobbyDelegate.CurrentColorPreview, format));
LobbyDelegate.CurrentColorPreview2, format));
} }
} }
} }

5
OpenRA.Mods.RA/CreateMPPlayers.cs
View File

@@ -50,9 +50,8 @@ namespace OpenRA.Mods.RA
/* spawn a bot in this slot, "owned" by the host */ /* spawn a bot in this slot, "owned" by the host */
/* pick a random color for the bot */ /* pick a random color for the bot */
var hue = (float)w.SharedRandom.NextDouble(); var hue = (byte)w.SharedRandom.Next(256);
w.Map.Players[slot.MapPlayer].Color = PlayerColorRemap.ColorFromHSL(hue, 1.0f, 0.7f); w.Map.Players[slot.MapPlayer].ColorRamp = new ColorRamp(hue, 255, 180, 25);
w.Map.Players[slot.MapPlayer].Color2 = PlayerColorRemap.ColorFromHSL(hue, 1.0f, 0.2f);
/* todo: pick a random name from the pool */ /* todo: pick a random name from the pool */

2
OpenRA.Mods.RA/Effects/Contrail.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.RA
if (Info.UsePlayerColor) if (Info.UsePlayerColor)
{ {
var ownerColor = Color.FromArgb(255, self.Owner.Color); var ownerColor = Color.FromArgb(255, self.Owner.ColorRamp.GetColor(0));
TrailColor = PlayerColorRemap.ColorLerp(0.5f, ownerColor, Color.White); TrailColor = PlayerColorRemap.ColorLerp(0.5f, ownerColor, Color.White);
} }
} }

2
OpenRA.Mods.RA/Effects/LaserZap.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.RA.Effects
public IEffect Create(ProjectileArgs args) public IEffect Create(ProjectileArgs args)
{ {
Color c = UsePlayerColor ? args.firedBy.Owner.Color : Color.Red; Color c = UsePlayerColor ? args.firedBy.Owner.ColorRamp.GetColor(0) : Color.Red;
return new LaserZap(args, BeamRadius, c); return new LaserZap(args, BeamRadius, c);
} }
} }

2
OpenRA.Mods.RA/InvisibleToOthers.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA
public Color RadarColorOverride(Actor self) public Color RadarColorOverride(Actor self)
{ {
return Color.FromArgb(128, self.Owner.Color); return Color.FromArgb(128, self.Owner.ColorRamp.GetColor(0));
} }
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r) public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)

4
OpenRA.Mods.RA/ServerTraits/PlayerCommands.cs
View File

@@ -15,6 +15,7 @@ using System.Linq;
using OpenRA.Network; using OpenRA.Network;
using OpenRA.Server; using OpenRA.Server;
using S = OpenRA.Server.Server; using S = OpenRA.Server.Server;
using OpenRA.FileFormats;
namespace OpenRA.Mods.RA.Server namespace OpenRA.Mods.RA.Server
{ {
@@ -84,8 +85,7 @@ namespace OpenRA.Mods.RA.Server
s => s =>
{ {
var c = s.Split(',').Select(cc => int.Parse(cc)).ToArray(); var c = s.Split(',').Select(cc => int.Parse(cc)).ToArray();
client.Color1 = Color.FromArgb(c[0],c[1],c[2]); client.ColorRamp = new ColorRamp((byte)c[0], (byte)c[1], (byte)c[2], (byte)c[3]);
client.Color2 = Color.FromArgb(c[3],c[4],c[5]);
server.SyncLobbyInfo(); server.SyncLobbyInfo();
return true; return true;
}} }}

36
OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs
View File

@@ -26,9 +26,8 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
Dictionary<string, string> CountryNames; Dictionary<string, string> CountryNames;
string MapUid; string MapUid;
Map Map; Map Map;
public static Color CurrentColorPreview1; public static ColorRamp CurrentColorPreview;
public static Color CurrentColorPreview2;
readonly OrderManager orderManager; readonly OrderManager orderManager;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
@@ -38,8 +37,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
Game.LobbyInfoChanged += UpdateCurrentMap; Game.LobbyInfoChanged += UpdateCurrentMap;
UpdateCurrentMap(); UpdateCurrentMap();
CurrentColorPreview1 = Game.Settings.Player.Color1; CurrentColorPreview = Game.Settings.Player.ColorRamp;
CurrentColorPreview2 = Game.Settings.Player.Color2;
Players = lobby.GetWidget<ScrollPanelWidget>("PLAYERS"); Players = lobby.GetWidget<ScrollPanelWidget>("PLAYERS");
LocalPlayerTemplate = Players.GetWidget("TEMPLATE_LOCAL"); LocalPlayerTemplate = Players.GetWidget("TEMPLATE_LOCAL");
@@ -79,7 +77,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
var client = orderManager.LobbyInfo.Clients.FirstOrDefault(c => c.SpawnPoint == i); var client = orderManager.LobbyInfo.Clients.FirstOrDefault(c => c.SpawnPoint == i);
if (client == null) if (client == null)
continue; continue;
sc.Add(spawns.ElementAt(i - 1), client.Color1); sc.Add(spawns.ElementAt(i - 1), client.ColorRamp.GetColor(0));
} }
return sc; return sc;
}; };
@@ -152,19 +150,15 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
void UpdatePlayerColor(float hf, float sf, float lf, float r) void UpdatePlayerColor(float hf, float sf, float lf, float r)
{ {
var c1 = PlayerColorRemap.ColorFromHSL(hf, sf, lf); var ramp = new ColorRamp((byte) (hf*255), (byte) (sf*255), (byte) (lf*255), (byte)(r*255));
var c2 = PlayerColorRemap.ColorFromHSL(hf, sf, r * lf); Game.Settings.Player.ColorRamp = ramp;
Game.Settings.Player.Color1 = c1;
Game.Settings.Player.Color2 = c2;
Game.Settings.Save(); Game.Settings.Save();
orderManager.IssueOrder(Order.Command("color {0},{1},{2},{3},{4},{5}".F(c1.R,c1.G,c1.B,c2.R,c2.G,c2.B))); orderManager.IssueOrder(Order.Command("color {0}".F(ramp)));
} }
void UpdateColorPreview(float hf, float sf, float lf, float r) void UpdateColorPreview(float hf, float sf, float lf, float r)
{ {
CurrentColorPreview1 = PlayerColorRemap.ColorFromHSL(hf, sf, lf); CurrentColorPreview = new ColorRamp((byte)(hf * 255), (byte)(sf * 255), (byte)(lf * 255), (byte)(r * 255));
CurrentColorPreview2 = PlayerColorRemap.ColorFromHSL(hf, sf, r * lf);
} }
void UpdateCurrentMap() void UpdateCurrentMap()
@@ -274,16 +268,16 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
var colorChooser = Game.modData.WidgetLoader.LoadWidget( new Dictionary<string,object>(), null, "COLOR_CHOOSER" ); var colorChooser = Game.modData.WidgetLoader.LoadWidget( new Dictionary<string,object>(), null, "COLOR_CHOOSER" );
var hueSlider = colorChooser.GetWidget<SliderWidget>("HUE_SLIDER"); var hueSlider = colorChooser.GetWidget<SliderWidget>("HUE_SLIDER");
hueSlider.SetOffset(orderManager.LocalClient.Color1.GetHue()/360f); hueSlider.SetOffset(orderManager.LocalClient.ColorRamp.H / 255f);
var satSlider = colorChooser.GetWidget<SliderWidget>("SAT_SLIDER"); var satSlider = colorChooser.GetWidget<SliderWidget>("SAT_SLIDER");
satSlider.SetOffset(orderManager.LocalClient.Color1.GetSaturation()); satSlider.SetOffset(orderManager.LocalClient.ColorRamp.S / 255f);
var lumSlider = colorChooser.GetWidget<SliderWidget>("LUM_SLIDER"); var lumSlider = colorChooser.GetWidget<SliderWidget>("LUM_SLIDER");
lumSlider.SetOffset(orderManager.LocalClient.Color1.GetBrightness()); lumSlider.SetOffset(orderManager.LocalClient.ColorRamp.L / 255f);
var rangeSlider = colorChooser.GetWidget<SliderWidget>("RANGE_SLIDER"); var rangeSlider = colorChooser.GetWidget<SliderWidget>("RANGE_SLIDER");
rangeSlider.SetOffset(orderManager.LocalClient.Color1.GetBrightness() == 0 ? 0 : orderManager.LocalClient.Color2.GetBrightness()/orderManager.LocalClient.Color1.GetBrightness()); rangeSlider.SetOffset(orderManager.LocalClient.ColorRamp.R / 255f);
hueSlider.OnChange += _ => UpdateColorPreview(hueSlider.GetOffset(), satSlider.GetOffset(), lumSlider.GetOffset(), rangeSlider.GetOffset()); hueSlider.OnChange += _ => UpdateColorPreview(hueSlider.GetOffset(), satSlider.GetOffset(), lumSlider.GetOffset(), rangeSlider.GetOffset());
satSlider.OnChange += _ => UpdateColorPreview(hueSlider.GetOffset(), satSlider.GetOffset(), lumSlider.GetOffset(), rangeSlider.GetOffset()); satSlider.OnChange += _ => UpdateColorPreview(hueSlider.GetOffset(), satSlider.GetOffset(), lumSlider.GetOffset(), rangeSlider.GetOffset());
@@ -382,7 +376,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
color.OnMouseUp = _ => ShowColorDropDown(s, color); color.OnMouseUp = _ => ShowColorDropDown(s, color);
var colorBlock = color.GetWidget<ColorBlockWidget>("COLORBLOCK"); var colorBlock = color.GetWidget<ColorBlockWidget>("COLORBLOCK");
colorBlock.GetColor = () => c.Color1; colorBlock.GetColor = () => c.ColorRamp.GetColor(0);
var faction = template.GetWidget<ButtonWidget>("FACTION"); var faction = template.GetWidget<ButtonWidget>("FACTION");
faction.OnMouseDown = _ => ShowRaceDropDown(s, faction); faction.OnMouseDown = _ => ShowRaceDropDown(s, faction);
@@ -417,7 +411,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
template = RemotePlayerTemplate.Clone(); template = RemotePlayerTemplate.Clone();
template.GetWidget<LabelWidget>("NAME").GetText = () => c.Name; template.GetWidget<LabelWidget>("NAME").GetText = () => c.Name;
var color = template.GetWidget<ColorBlockWidget>("COLOR"); var color = template.GetWidget<ColorBlockWidget>("COLOR");
color.GetColor = () => c.Color1; color.GetColor = () => c.ColorRamp.GetColor(0);
var faction = template.GetWidget<LabelWidget>("FACTION"); var faction = template.GetWidget<LabelWidget>("FACTION");
var factionname = faction.GetWidget<LabelWidget>("FACTIONNAME"); var factionname = faction.GetWidget<LabelWidget>("FACTIONNAME");

2
OpenRA.Mods.RA/Widgets/WorldTooltipWidget.cs
View File

@@ -82,7 +82,7 @@ namespace OpenRA.Mods.RA.Widgets
if (text2 != "") if (text2 != "")
{ {
Game.Renderer.RegularFont.DrawText(text2, Game.Renderer.RegularFont.DrawText(text2,
new float2(Viewport.LastMousePos.X + 65, Viewport.LastMousePos.Y + 50), actor.Owner.Color); new float2(Viewport.LastMousePos.X + 65, Viewport.LastMousePos.Y + 50), actor.Owner.ColorRamp.GetColor(0));
Game.Renderer.RegularFont.DrawText(text3, Game.Renderer.RegularFont.DrawText(text3,
new float2(Viewport.LastMousePos.X + 65 + sz2.X, Viewport.LastMousePos.Y + 50), Color.White); new float2(Viewport.LastMousePos.X + 65 + sz2.X, Viewport.LastMousePos.Y + 50), Color.White);