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

move ColorFromHSL out of the ui code

Browse Source
This commit is contained in:
Chris Forbes
2010-10-11 19:52:46 +13:00
parent b905d343af
commit 99d92ee095
3 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenRA.FileFormats/PlayerColorRemap.cs
View File

@@ -46,5 +46,34 @@ 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));
}
} }
} }

38
OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs
View File

@@ -157,8 +157,8 @@ namespace OpenRA.Widgets.Delegates
void UpdatePlayerColor(float hf, float sf, float lf, float r) void UpdatePlayerColor(float hf, float sf, float lf, float r)
{ {
var c1 = ColorFromHSL(hf, sf, lf); var c1 = PlayerColorRemap.ColorFromHSL(hf, sf, lf);
var c2 = ColorFromHSL(hf, sf, r*lf); var c2 = PlayerColorRemap.ColorFromHSL(hf, sf, r * lf);
Game.Settings.Player.Color1 = c1; Game.Settings.Player.Color1 = c1;
Game.Settings.Player.Color2 = c2; Game.Settings.Player.Color2 = c2;
@@ -168,41 +168,11 @@ namespace OpenRA.Widgets.Delegates
void UpdateColorPreview(float hf, float sf, float lf, float r) void UpdateColorPreview(float hf, float sf, float lf, float r)
{ {
CurrentColorPreview1 = ColorFromHSL(hf, sf, lf); CurrentColorPreview1 = PlayerColorRemap.ColorFromHSL(hf, sf, lf);
CurrentColorPreview2 = ColorFromHSL(hf, sf, r*lf); CurrentColorPreview2 = PlayerColorRemap.ColorFromHSL(hf, sf, r * lf);
Game.viewport.RefreshPalette(); Game.viewport.RefreshPalette();
} }
// 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));
}
void UpdateCurrentMap() void UpdateCurrentMap()
{ {
if (MapUid == Game.LobbyInfo.GlobalSettings.Map) return; if (MapUid == Game.LobbyInfo.GlobalSettings.Map) return;

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

@@ -9,9 +9,9 @@
#endregion #endregion
using System.Linq; using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Network; using OpenRA.Network;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets.Delegates;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
@@ -51,8 +51,8 @@ namespace OpenRA.Mods.RA
/* pick a random color for the bot */ /* pick a random color for the bot */
var hue = (float)w.SharedRandom.NextDouble(); var hue = (float)w.SharedRandom.NextDouble();
w.Map.Players[slot.MapPlayer].Color = LobbyDelegate.ColorFromHSL(hue, 1.0f, 0.7f); w.Map.Players[slot.MapPlayer].Color = PlayerColorRemap.ColorFromHSL(hue, 1.0f, 0.7f);
w.Map.Players[slot.MapPlayer].Color2 = LobbyDelegate.ColorFromHSL(hue, 1.0f, 0.2f); 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 */