Resurrected old colour picker.

OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Widgets
 		public float H { get; private set; }
 		public float S { get; private set; }
 		public float V { get; private set; }
-		float minSat, maxSat;
+		float minSat, maxSat, minVal, maxVal;
 
 		Sheet mixerSheet;
 		Sprite mixerSprite;
@@ -37,7 +37,6 @@ namespace OpenRA.Mods.Common.Widgets
 		public ColorMixerWidget(ModData modData)
 		{
 			modRules = modData.DefaultRules;
-			V = 1.0f;
 		}
 
 		public ColorMixerWidget(ColorMixerWidget other)
@@ -51,13 +50,19 @@ namespace OpenRA.Mods.Common.Widgets
 			V = other.V;
 			minSat = other.minSat;
 			maxSat = other.maxSat;
+			minVal = other.minVal;
+			maxVal = other.maxVal;
 		}
 
-		public void SetColorLimits(float minSaturation, float maxSaturation, float v)
+		public void SetColorLimits(float minSaturation, float maxSaturation, float minValue, float maxValue, float? newHue = null)
 		{
 			minSat = minSaturation;
 			maxSat = maxSaturation;
-			V = v;
+			minVal = minValue;
+			maxVal = maxValue;
+
+			if (newHue == null)
+				newHue = H;
 
 			var buffer = new byte[4 * 256 * 256];
 			unsafe
@@ -66,19 +71,25 @@ namespace OpenRA.Mods.Common.Widgets
 				fixed (byte* cc = &buffer[0])
 				{
 					var c = (int*)cc;
-					for (var s = 0; s < 256; s++)
-						for (var h = 0; h < 256; h++)
+					for (var v = 0; v < 256; v++)
+					{
+						for (var s = 0; s < 256; s++)
 						{
 							#pragma warning disable IDE0047
-							(*(c + s * 256 + h)) = Color.FromAhsv(h / 255f, 1 - s / 255f, V).ToArgb();
+							(*(c + s * 256 + v)) = Color.FromAhsv(newHue.Value, 1 - s / 255f, v / 255f).ToArgb();
 							#pragma warning restore IDE0047
 						}
+					}
 				}
 			}
 
-			var rect = new Rectangle(0, (int)(255 * (1 - maxSat)), 255, (int)(255 * (maxSat - minSat)) + 1);
-			mixerSprite = new Sprite(mixerSheet, rect, TextureChannel.RGBA);
+			var rect = new Rectangle(
+				(int)(255 * minVal),
+				(int)(255 * (1 - maxSat)),
+				(int)(255 * (maxVal - minVal)),
+				(int)(255 * (maxSat - minSat)) + 1);
 
+			mixerSprite = new Sprite(mixerSheet, rect, TextureChannel.RGBA);
 			mixerSheet.GetTexture().SetData(buffer, 256, 256);
 		}
 
@@ -87,7 +98,7 @@ namespace OpenRA.Mods.Common.Widgets
 			base.Initialize(args);
 
 			mixerSheet = new Sheet(SheetType.BGRA, new Size(256, 256));
-			SetColorLimits(minSat, maxSat, V);
+			SetColorLimits(minSat, maxSat, minVal, maxVal);
 		}
 
 		public override void Draw()
@@ -103,17 +114,17 @@ namespace OpenRA.Mods.Common.Widgets
 		void SetValueFromPx(int2 xy)
 		{
 			var rb = RenderBounds;
-			var h = xy.X * 1f / rb.Width;
+			var v = float2.Lerp(minVal, maxVal, xy.X * 1f / rb.Width);
 			var s = float2.Lerp(minSat, maxSat, 1 - xy.Y * 1f / rb.Height);
-			H = h.Clamp(0, 1f);
+			V = v.Clamp(minVal, maxVal);
 			S = s.Clamp(minSat, maxSat);
 		}
 
 		int2 PxFromValue()
 		{
 			var rb = RenderBounds;
-			var x = RenderBounds.Width * H;
-			var y = RenderBounds.Height * (1 - (S - minSat) / (maxSat - minSat));
+			var x = rb.Width * (V - minVal) / (maxVal - minVal);
+			var y = rb.Height * (1 - (S - minSat) / (maxSat - minSat));
 			return new int2((int)x.Clamp(0, rb.Width), (int)y.Clamp(0, rb.Height));
 		}
 
@@ -162,12 +173,13 @@ namespace OpenRA.Mods.Common.Widgets
 		/// </summary>
 		public void Set(Color color)
 		{
-			var (_, h, s, _) = color.ToAhsv();
+			var (_, h, s, v) = color.ToAhsv();
 
-			if (H != h || S != s)
+			if (H != h || S != s || V != v)
 			{
 				H = h;
 				S = s.Clamp(minSat, maxSat);
+				V = v.Clamp(minVal, maxVal);
 				OnChange();
 			}
 		}