Restrict player color choices to the hue-saturation plane.
This commit is contained in:
Paul Chote
@@ -19,29 +19,22 @@ namespace OpenRA.Mods.Common.Widgets
|
||||
{
|
||||
public class ColorMixerWidget : Widget
|
||||
{
|
||||
public float STrim = 0.025f;
|
||||
public float VTrim = 0.025f;
|
||||
|
||||
public event Action OnChange = () => { };
|
||||
|
||||
public float H { get; private set; }
|
||||
public float S { get; private set; }
|
||||
public float V { get; private set; }
|
||||
float minSat, maxSat;
|
||||
|
||||
byte[] front, back;
|
||||
Sheet mixerSheet;
|
||||
Sprite mixerSprite;
|
||||
bool isMoving;
|
||||
|
||||
bool update;
|
||||
readonly object syncWorker = new object();
|
||||
readonly object bufferSync = new object();
|
||||
Thread workerThread;
|
||||
bool workerAlive;
|
||||
public ColorMixerWidget()
|
||||
{
|
||||
V = 1.0f;
|
||||
}
|
||||
|
||||
float[] sRange = { 0.0f, 1.0f };
|
||||
float[] vRange = { 0.0f, 1.0f };
|
||||
|
||||
public ColorMixerWidget() { }
|
||||
public ColorMixerWidget(ColorMixerWidget other)
|
||||
: base(other)
|
||||
{
|
||||
@@ -49,118 +42,45 @@ namespace OpenRA.Mods.Common.Widgets
|
||||
H = other.H;
|
||||
S = other.S;
|
||||
V = other.V;
|
||||
|
||||
sRange = (float[])other.sRange.Clone();
|
||||
vRange = (float[])other.vRange.Clone();
|
||||
|
||||
STrim = other.STrim;
|
||||
VTrim = other.VTrim;
|
||||
minSat = other.minSat;
|
||||
maxSat = other.maxSat;
|
||||
}
|
||||
|
||||
public void SetPaletteRange(float sMin, float sMax, float vMin, float vMax)
|
||||
public void SetColorLimits(float minSaturation, float maxSaturation, float v)
|
||||
{
|
||||
sRange[0] = sMin + STrim;
|
||||
sRange[1] = sMax - STrim;
|
||||
vRange[0] = vMin + VTrim;
|
||||
vRange[1] = vMax - VTrim;
|
||||
minSat = minSaturation;
|
||||
maxSat = maxSaturation;
|
||||
V = v;
|
||||
|
||||
var rect = new Rectangle((int)(255 * sRange[0]), (int)(255 * (1 - vRange[1])), (int)(255 * (sRange[1] - sRange[0])) + 1, (int)(255 * (vRange[1] - vRange[0])) + 1);
|
||||
mixerSprite = new Sprite(mixerSprite.Sheet, rect, TextureChannel.RGBA);
|
||||
var buffer = new byte[4 * 256 * 256];
|
||||
unsafe
|
||||
{
|
||||
// Generate palette in HSV
|
||||
fixed (byte* cc = &buffer[0])
|
||||
{
|
||||
var c = (int*)cc;
|
||||
for (var s = 0; s < 256; s++)
|
||||
for (var h = 0; h < 256; h++)
|
||||
(*(c + s * 256 + h)) = Color.FromAhsv(h / 255f, 1 - s / 255f, V).ToArgb();
|
||||
}
|
||||
}
|
||||
|
||||
var rect = new Rectangle(0, (int)(255 * (1 - maxSat)), 255, (int)(255 * (maxSat - minSat)) + 1);
|
||||
mixerSprite = new Sprite(mixerSheet, rect, TextureChannel.RGBA);
|
||||
|
||||
mixerSheet.GetTexture().SetData(buffer, 256, 256);
|
||||
}
|
||||
|
||||
public override void Initialize(WidgetArgs args)
|
||||
{
|
||||
base.Initialize(args);
|
||||
|
||||
sRange[0] += STrim;
|
||||
sRange[1] -= STrim;
|
||||
vRange[0] += VTrim;
|
||||
vRange[1] -= VTrim;
|
||||
|
||||
// Bitmap data is generated in a background thread and then flipped
|
||||
front = new byte[4 * 256 * 256];
|
||||
back = new byte[4 * 256 * 256];
|
||||
|
||||
var rect = new Rectangle((int)(255 * sRange[0]), (int)(255 * (1 - vRange[1])), (int)(255 * (sRange[1] - sRange[0])) + 1, (int)(255 * (vRange[1] - vRange[0])) + 1);
|
||||
var mixerSheet = new Sheet(SheetType.BGRA, new Size(256, 256));
|
||||
mixerSheet.GetTexture().SetData(front, 256, 256);
|
||||
mixerSprite = new Sprite(mixerSheet, rect, TextureChannel.RGBA);
|
||||
GenerateBitmap();
|
||||
}
|
||||
|
||||
void GenerateBitmap()
|
||||
{
|
||||
// Generating the selection bitmap is slow,
|
||||
// so we do it in a background thread
|
||||
lock (syncWorker)
|
||||
{
|
||||
update = true;
|
||||
|
||||
if (workerThread == null || !workerAlive)
|
||||
{
|
||||
workerThread = new Thread(GenerateBitmapWorker);
|
||||
workerThread.Start();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void GenerateBitmapWorker()
|
||||
{
|
||||
lock (syncWorker)
|
||||
workerAlive = true;
|
||||
|
||||
while (true)
|
||||
{
|
||||
float hue;
|
||||
lock (syncWorker)
|
||||
{
|
||||
if (!update)
|
||||
{
|
||||
workerAlive = false;
|
||||
break;
|
||||
}
|
||||
|
||||
update = false;
|
||||
|
||||
// Take a local copy of the hue to generate to avoid tearing
|
||||
hue = H;
|
||||
}
|
||||
|
||||
unsafe
|
||||
{
|
||||
// Generate palette in HSV
|
||||
fixed (byte* cc = &back[0])
|
||||
{
|
||||
var c = (int*)cc;
|
||||
for (var v = 0; v < 256; v++)
|
||||
for (var s = 0; s < 256; s++)
|
||||
(*(c + (v * 256) + s)) = Color.FromAhsv(hue, s / 255f, (255 - v) / 255f).ToArgb();
|
||||
}
|
||||
}
|
||||
|
||||
lock (bufferSync)
|
||||
{
|
||||
var swap = front;
|
||||
front = back;
|
||||
back = swap;
|
||||
}
|
||||
}
|
||||
mixerSheet = new Sheet(SheetType.BGRA, new Size(256, 256));
|
||||
SetColorLimits(minSat, maxSat, V);
|
||||
}
|
||||
|
||||
public override void Draw()
|
||||
{
|
||||
if (Monitor.TryEnter(bufferSync))
|
||||
{
|
||||
try
|
||||
{
|
||||
mixerSprite.Sheet.GetTexture().SetData(front, 256, 256);
|
||||
}
|
||||
finally
|
||||
{
|
||||
Monitor.Exit(bufferSync);
|
||||
}
|
||||
}
|
||||
|
||||
Game.Renderer.RgbaSpriteRenderer.DrawSprite(mixerSprite, RenderOrigin, new float2(RenderBounds.Size));
|
||||
|
||||
var sprite = ChromeProvider.GetImage("lobby-bits", "colorpicker");
|
||||
@@ -172,17 +92,17 @@ namespace OpenRA.Mods.Common.Widgets
|
||||
void SetValueFromPx(int2 xy)
|
||||
{
|
||||
var rb = RenderBounds;
|
||||
var s = sRange[0] + xy.X * (sRange[1] - sRange[0]) / rb.Width;
|
||||
var v = sRange[1] - xy.Y * (vRange[1] - vRange[0]) / rb.Height;
|
||||
S = s.Clamp(sRange[0], sRange[1]);
|
||||
V = v.Clamp(vRange[0], vRange[1]);
|
||||
var h = xy.X * 1f / rb.Width;
|
||||
var s = float2.Lerp(minSat, maxSat, 1 - xy.Y * 1f / rb.Height);
|
||||
H = h.Clamp(0, 1f);
|
||||
S = s.Clamp(minSat, maxSat);
|
||||
}
|
||||
|
||||
int2 PxFromValue()
|
||||
{
|
||||
var rb = RenderBounds;
|
||||
var x = RenderBounds.Width * (S - sRange[0]) / (sRange[1] - sRange[0]);
|
||||
var y = RenderBounds.Height * (1 - (V - vRange[0]) / (vRange[1] - vRange[0]));
|
||||
var x = RenderBounds.Width * H;
|
||||
var y = RenderBounds.Height * (1 - (S - minSat) / (maxSat - minSat));
|
||||
return new int2((int)x.Clamp(0, rb.Width), (int)y.Clamp(0, rb.Height));
|
||||
}
|
||||
|
||||
@@ -223,30 +143,18 @@ namespace OpenRA.Mods.Common.Widgets
|
||||
|
||||
public Color Color => Color.FromAhsv(H, S, V);
|
||||
|
||||
public void Set(float hue)
|
||||
{
|
||||
if (H != hue)
|
||||
{
|
||||
H = hue;
|
||||
GenerateBitmap();
|
||||
OnChange();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Set the color picker to nearest valid color to the given value.
|
||||
/// The saturation and brightness may be adjusted.
|
||||
/// </summary>
|
||||
public void Set(Color color)
|
||||
{
|
||||
color.ToAhsv(out _, out var h, out var s, out var v);
|
||||
color.ToAhsv(out _, out var h, out var s, out _);
|
||||
|
||||
if (H != h || S != s || V != v)
|
||||
if (H != h || S != s)
|
||||
{
|
||||
if (H != h)
|
||||
{
|
||||
H = h;
|
||||
GenerateBitmap();
|
||||
}
|
||||
|
||||
S = s.Clamp(sRange[0], sRange[1]);
|
||||
V = v.Clamp(vRange[0], vRange[1]);
|
||||
H = h;
|
||||
S = s.Clamp(minSat, maxSat);
|
||||
OnChange();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
#region Copyright & License Information
|
||||
/*
|
||||
* Copyright 2007-2020 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, either version 3 of
|
||||
* the License, or (at your option) any later version. For more
|
||||
* information, see COPYING.
|
||||
*/
|
||||
#endregion
|
||||
|
||||
using OpenRA.Graphics;
|
||||
using OpenRA.Primitives;
|
||||
using OpenRA.Widgets;
|
||||
|
||||
namespace OpenRA.Mods.Common.Widgets
|
||||
{
|
||||
public class HueSliderWidget : SliderWidget
|
||||
{
|
||||
Sprite hueSprite;
|
||||
Sprite pickerSprite;
|
||||
|
||||
public HueSliderWidget() { }
|
||||
public HueSliderWidget(HueSliderWidget other)
|
||||
: base(other) { }
|
||||
|
||||
public override void Initialize(WidgetArgs args)
|
||||
{
|
||||
base.Initialize(args);
|
||||
|
||||
var hueSheet = new Sheet(SheetType.BGRA, new Size(256, 1));
|
||||
hueSprite = new Sprite(hueSheet, new Rectangle(0, 0, 256, 1), TextureChannel.RGBA);
|
||||
|
||||
var hueData = new uint[1, 256];
|
||||
for (var x = 0; x < 256; x++)
|
||||
hueData[0, x] = (uint)Color.FromAhsv(x / 255f, 1, 1).ToArgb();
|
||||
|
||||
hueSheet.GetTexture().SetData(hueData);
|
||||
|
||||
pickerSprite = ChromeProvider.GetImage("lobby-bits", "huepicker");
|
||||
}
|
||||
|
||||
public override void Draw()
|
||||
{
|
||||
if (!IsVisible())
|
||||
return;
|
||||
|
||||
var ro = RenderOrigin;
|
||||
var rb = RenderBounds;
|
||||
Game.Renderer.RgbaSpriteRenderer.DrawSprite(hueSprite, ro, new float2(rb.Size));
|
||||
|
||||
var pos = RenderOrigin + new int2(PxFromValue(Value).Clamp(0, rb.Width - 1) - (int)pickerSprite.Size.X / 2, (rb.Height - (int)pickerSprite.Size.Y) / 2);
|
||||
Game.Renderer.RgbaSpriteRenderer.DrawSprite(pickerSprite, pos);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -28,33 +28,24 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
public ColorPickerLogic(Widget widget, ModData modData, World world, Color initialColor, string initialFaction, Action<Color> onChange,
|
||||
Dictionary<string, MiniYaml> logicArgs)
|
||||
{
|
||||
var hueSlider = widget.Get<SliderWidget>("HUE");
|
||||
var mixer = widget.Get<ColorMixerWidget>("MIXER");
|
||||
var randomButton = widget.GetOrNull<ButtonWidget>("RANDOM_BUTTON");
|
||||
|
||||
hueSlider.OnChange += _ => mixer.Set(hueSlider.Value);
|
||||
mixer.OnChange += () => onChange(mixer.Color);
|
||||
|
||||
if (randomButton != null)
|
||||
{
|
||||
randomButton.OnClick = () =>
|
||||
{
|
||||
// Avoid colors with low sat or lum
|
||||
var hue = (byte)Game.CosmeticRandom.Next(255);
|
||||
var sat = (byte)Game.CosmeticRandom.Next(70, 255);
|
||||
var lum = (byte)Game.CosmeticRandom.Next(70, 255);
|
||||
var color = Color.FromAhsl(hue, sat, lum);
|
||||
|
||||
mixer.Set(color);
|
||||
hueSlider.Value = HueFromColor(color);
|
||||
};
|
||||
}
|
||||
|
||||
// Set the initial state
|
||||
var colorManager = world.WorldActor.Info.TraitInfo<ColorPickerManagerInfo>();
|
||||
mixer.SetPaletteRange(colorManager.HsvSaturationRange[0], colorManager.HsvSaturationRange[1], colorManager.HsvValueRange[0], colorManager.HsvValueRange[1]);
|
||||
mixer.SetColorLimits(colorManager.HsvSaturationRange[0], colorManager.HsvSaturationRange[1], colorManager.V);
|
||||
mixer.OnChange += () => onChange(mixer.Color);
|
||||
mixer.Set(initialColor);
|
||||
hueSlider.Value = HueFromColor(initialColor);
|
||||
|
||||
var randomButton = widget.GetOrNull<ButtonWidget>("RANDOM_BUTTON");
|
||||
if (randomButton != null)
|
||||
{
|
||||
var terrainColors = modData.DefaultTerrainInfo
|
||||
.SelectMany(t => t.Value.RestrictedPlayerColors)
|
||||
.Distinct()
|
||||
.ToList();
|
||||
var playerColors = Enumerable.Empty<Color>();
|
||||
randomButton.OnClick = () => mixer.Set(colorManager.RandomValidColor(world.LocalRandom, terrainColors, playerColors));
|
||||
}
|
||||
|
||||
if (initialFaction == null || !colorManager.FactionPreviewActors.TryGetValue(initialFaction, out var actorType))
|
||||
actorType = colorManager.PreviewActor;
|
||||
@@ -125,15 +116,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
if (!int.TryParse(yaml.Value, out paletteCustomRows))
|
||||
throw new YamlException($"Invalid value for PaletteCustomRows: {yaml.Value}");
|
||||
|
||||
var presetColors = colorManager.PresetColors().ToList();
|
||||
for (var j = 0; j < palettePresetRows; j++)
|
||||
{
|
||||
for (var i = 0; i < paletteCols; i++)
|
||||
{
|
||||
var colorIndex = j * paletteCols + i;
|
||||
if (colorIndex >= colorManager.TeamColorPresets.Length)
|
||||
if (colorIndex >= presetColors.Count)
|
||||
break;
|
||||
|
||||
var color = colorManager.TeamColorPresets[colorIndex];
|
||||
var color = presetColors[colorIndex];
|
||||
|
||||
var newSwatch = (ColorBlockWidget)presetColorTemplate.Clone();
|
||||
newSwatch.GetColor = () => color;
|
||||
@@ -143,7 +135,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
newSwatch.OnMouseUp = m =>
|
||||
{
|
||||
mixer.Set(color);
|
||||
hueSlider.Value = HueFromColor(color);
|
||||
onChange(color);
|
||||
};
|
||||
|
||||
@@ -166,7 +157,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
{
|
||||
var color = Game.Settings.Player.CustomColors[colorIndex];
|
||||
mixer.Set(color);
|
||||
hueSlider.Value = HueFromColor(color);
|
||||
onChange(color);
|
||||
};
|
||||
|
||||
@@ -198,12 +188,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
}
|
||||
}
|
||||
|
||||
static float HueFromColor(Color c)
|
||||
{
|
||||
c.ToAhsv(out _, out var h, out _, out _);
|
||||
return h;
|
||||
}
|
||||
|
||||
public static void ShowColorDropDown(DropDownButtonWidget color, ColorPickerManagerInfo colorManager, WorldRenderer worldRenderer, Action onExit = null)
|
||||
{
|
||||
color.RemovePanel();
|
||||
|
||||
Reference in New Issue
Block a user