Merge pull request #3169 from pchote/colorpicker

New Colorpicker with graphical mixer

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -433,6 +433,8 @@
     <Compile Include="ServerTraits\PlayerPinger.cs" />
     <Compile Include="Widgets\Logic\SpawnSelectorTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\ClientTooltipLogic.cs" />
+    <Compile Include="Widgets\ColorMixerWidget.cs" />
+    <Compile Include="Widgets\HueSliderWidget.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

OpenRA.Mods.RA/Widgets/ColorMixerWidget.cs

@@ -0,0 +1,228 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 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 COPYING.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Linq;
+using System.Threading;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Widgets;
+
+namespace OpenRA.Mods.RA.Widgets
+{
+	public class ColorMixerWidget : Widget
+	{
+		public float[] SRange = {0.2f, 1.0f};
+		public float[] VRange = {0.2f, 1.0f};
+		public event Action OnChange = () => {};
+
+		float H, S, V;
+		Bitmap frontBitmap, swapBitmap, backBitmap;
+		Sprite mixerSprite;
+		bool isMoving;
+
+		bool updateFront, updateBack;
+		object syncWorker = new object();
+		Thread workerThread;
+		bool workerAlive;
+
+		public ColorMixerWidget() : base() {}
+		public ColorMixerWidget(ColorMixerWidget other)
+			: base(other)
+		{
+			OnChange = other.OnChange;
+			H = other.H;
+			S = other.S;
+			V = other.V;
+		}
+
+		public override void Initialize(WidgetArgs args)
+		{
+			base.Initialize(args);
+
+			// Bitmap data is generated in a background thread and then flipped
+			frontBitmap = new Bitmap(256, 256);
+			swapBitmap = new Bitmap(256, 256);
+			backBitmap = new Bitmap(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);
+			mixerSprite = new Sprite(new Sheet(new Size(256, 256)), rect, TextureChannel.Alpha);
+			mixerSprite.sheet.Texture.SetData(frontBitmap);
+		}
+
+		void GenerateBitmap()
+		{
+			// Generating the selection bitmap is slow,
+			// so we do it in a background thread
+			lock (syncWorker)
+			{
+				updateBack = true;
+
+				if (workerThread == null || !workerAlive)
+				{
+					workerThread = new Thread(GenerateBitmapWorker);
+					workerThread.Start();
+				}
+			}
+		}
+
+		void GenerateBitmapWorker()
+		{
+			lock (syncWorker)
+				workerAlive = true;
+
+			for (;;)
+			{
+				float hue;
+				lock (syncWorker)
+				{
+					if (!updateBack)
+					{
+						workerAlive = false;
+						break;
+					}
+					updateBack = false;
+
+					// Take a local copy of the hue to generate to avoid tearing
+					hue = H;
+				}
+
+				var bitmapData = backBitmap.LockBits(backBitmap.Bounds(),
+					ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+
+				unsafe
+				{
+					int* c = (int*)bitmapData.Scan0;
+
+					// Generate palette in HSV
+					for (var v = 0; v < 256; v++)
+						for (var s = 0; s < 256; s++)
+							*(c + (v * bitmapData.Stride >> 2) + s) = HSLColor.FromHSV(hue, s / 255f, (255 - v) / 255f).ToColor().ToArgb();
+				}
+
+				backBitmap.UnlockBits(bitmapData);
+				lock (syncWorker)
+				{
+					var swap = swapBitmap;
+					swapBitmap = backBitmap;
+					backBitmap = swap;
+					updateFront = true;
+				}
+			}
+		}
+
+		public override void Draw()
+		{
+			lock (syncWorker)
+			{
+				if (updateFront)
+				{
+					var swap = swapBitmap;
+					swapBitmap = frontBitmap;
+					frontBitmap = swap;
+
+					mixerSprite.sheet.Texture.SetData(frontBitmap);
+					updateFront = false;
+				}
+			}
+
+			Game.Renderer.RgbaSpriteRenderer.DrawSprite(mixerSprite, RenderOrigin, new float2(RenderBounds.Size));
+
+			var sprite = ChromeProvider.GetImage("lobby-bits", "colorpicker");
+			var pos = RenderOrigin + PxFromValue() - new int2(sprite.bounds.Width/2, sprite.bounds.Height/2);
+			WidgetUtils.FillRectWithColor(new Rectangle(pos.X + 3, pos.Y + 3, 10, 10), Color.ToColor());
+			Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos);
+		}
+
+		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]);
+		}
+
+		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]));
+			return new int2((int)x.Clamp(0, rb.Width), (int)y.Clamp(0, rb.Height));
+		}
+
+		public override bool HandleMouseInput(MouseInput mi)
+		{
+			if (mi.Button != MouseButton.Left)
+				return false;
+			if (mi.Event == MouseInputEvent.Down && !TakeFocus(mi))
+				return false;
+			if (!Focused)
+				return false;
+
+			switch (mi.Event)
+			{
+			case MouseInputEvent.Up:
+				isMoving = false;
+				LoseFocus(mi);
+				break;
+
+			case MouseInputEvent.Down:
+				isMoving = true;
+				SetValueFromPx(mi.Location - RenderOrigin);
+				OnChange();
+				break;
+
+			case MouseInputEvent.Move:
+				if (isMoving)
+				{
+					SetValueFromPx(mi.Location - RenderOrigin);
+					OnChange();
+				}
+				break;
+			}
+
+			return true;
+		}
+
+		public HSLColor Color { get { return HSLColor.FromHSV(H, S, V); } }
+
+		public void Set(float hue)
+		{
+			if (H != hue)
+			{
+				H = hue;
+				GenerateBitmap();
+				OnChange();
+			}
+		}
+
+		public void Set(HSLColor color)
+		{
+			float h,s,v;
+			color.ToHSV(out h, out s, out v);
+
+			if (H != h || S != s || V != v)
+			{
+				if (H != h)
+				{
+					H = h;
+					GenerateBitmap();
+				}
+
+				S = s.Clamp(SRange[0], SRange[1]);
+				V = v.Clamp(VRange[0], VRange[1]);
+				OnChange();
+			}
+		}
+	}
+}

OpenRA.Mods.RA/Widgets/HueSliderWidget.cs

@@ -0,0 +1,63 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 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 COPYING.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Widgets;
+
+namespace OpenRA.Mods.RA.Widgets
+{
+	public class HueSliderWidget : SliderWidget
+	{
+		Bitmap hueBitmap;
+		Sprite hueSprite;
+
+		public HueSliderWidget() : base() {}
+		public HueSliderWidget(HueSliderWidget other) : base(other) {}
+
+		public override void Initialize(WidgetArgs args)
+		{
+			base.Initialize(args);
+
+			hueBitmap = new Bitmap(256, 256);
+			hueSprite = new Sprite(new Sheet(new Size(256, 256)), new Rectangle(0, 0, 256, 1), TextureChannel.Alpha);
+
+			var bitmapData = hueBitmap.LockBits(hueBitmap.Bounds(),
+				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+			unsafe
+			{
+				int* c = (int*)bitmapData.Scan0;
+				for (var h = 0; h < 256; h++)
+					*(c + h) = HSLColor.FromHSV(h/255f, 1, 1).ToColor().ToArgb();
+			}
+			hueBitmap.UnlockBits(bitmapData);
+
+			hueSprite.sheet.Texture.SetData(hueBitmap);
+		}
+
+		public override void Draw()
+		{
+			if (!IsVisible())
+				return;
+
+			var ro = RenderOrigin;
+			var rb = RenderBounds;
+			Game.Renderer.RgbaSpriteRenderer.DrawSprite(hueSprite, ro, new float2(rb.Size));
+
+			var sprite = ChromeProvider.GetImage("lobby-bits", "huepicker");
+			var pos = RenderOrigin + new int2(PxFromValue(Value).Clamp(0, rb.Width-1) - sprite.bounds.Width/2, (rb.Height-sprite.bounds.Height)/2);
+			Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos);
+		}
+	}
+}
+

OpenRA.Mods.RA/Widgets/Logic/ColorPickerLogic.cs

@@ -17,56 +17,32 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 {
 	public class ColorPickerLogic
 	{
-		ColorRamp ramp;
-
 		[ObjectCreator.UseCtor]
-		public ColorPickerLogic(Widget widget, ColorRamp initialRamp, Action<ColorRamp> onChange,
-			Action<ColorRamp> onSelect, WorldRenderer worldRenderer)
+		public ColorPickerLogic(Widget widget, HSLColor initialColor, Action<HSLColor> onChange, WorldRenderer worldRenderer)
 		{
-			var panel = widget;
-			ramp = initialRamp;
-			var hueSlider = panel.Get<SliderWidget>("HUE");
-			var satSlider = panel.Get<SliderWidget>("SAT");
-			var lumSlider = panel.Get<SliderWidget>("LUM");
+			var hueSlider = widget.Get<SliderWidget>("HUE");
+			var mixer = widget.Get<ColorMixerWidget>("MIXER");
+			var randomButton = widget.GetOrNull<ButtonWidget>("RANDOM_BUTTON");
 
-			Action sliderChanged = () =>
-			{
-				ramp = new ColorRamp((byte)(255*hueSlider.Value),
-									 (byte)(255*satSlider.Value),
-									 (byte)(255*lumSlider.Value),
-									 10);
-				onChange(ramp);
-			};
+			hueSlider.OnChange += _ => mixer.Set(hueSlider.Value);
+			mixer.OnChange += () =>	onChange(mixer.Color);
 
-			hueSlider.OnChange += _ => sliderChanged();
-			satSlider.OnChange += _ => sliderChanged();
-			lumSlider.OnChange += _ => sliderChanged();
-
-			Action updateSliders = () =>
-			{
-				hueSlider.Value = ramp.H / 255f;
-				satSlider.Value = ramp.S / 255f;
-				lumSlider.Value = ramp.L / 255f;
-			};
-
-			panel.Get<ButtonWidget>("SAVE_BUTTON").OnClick = () => onSelect(ramp);
-
-			var randomButton = panel.Get<ButtonWidget>("RANDOM_BUTTON");
 			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(255);
-					var lum = (byte)Game.CosmeticRandom.Next(51,255);
+					var sat = (byte)Game.CosmeticRandom.Next(70, 255);
+					var lum = (byte)Game.CosmeticRandom.Next(70, 255);
 
-					ramp = new ColorRamp(hue, sat, lum, 10);
-					updateSliders();
-					sliderChanged();
+					mixer.Set(new HSLColor(hue, sat, lum));
+					hueSlider.Value = hue / 255f;
 				};
 
 			// Set the initial state
-			updateSliders();
-			onChange(ramp);
+			mixer.Set(initialColor);
+			hueSlider.Value = initialColor.H / 255f;
+			onChange(mixer.Color);
 		}
 	}
 }

OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs

@@ -103,28 +103,27 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		public static void ShowColorDropDown(DropDownButtonWidget color, Session.Client client,
 			OrderManager orderManager, ColorPreviewManagerWidget preview)
 		{
-			Action<ColorRamp> onSelect = c =>
+			Action onExit = () =>
 			{
 				if (client.Bot == null)
 				{
-					Game.Settings.Player.ColorRamp = c;
+					Game.Settings.Player.ColorRamp = preview.Ramp;
 					Game.Settings.Save();
 				}
 
 				color.RemovePanel();
-				orderManager.IssueOrder(Order.Command("color {0} {1}".F(client.Index, c)));
+				orderManager.IssueOrder(Order.Command("color {0} {1}".F(client.Index, preview.Ramp)));
 			};
 
-			Action<ColorRamp> onChange = c => preview.Ramp = c;
+			Action<HSLColor> onChange = c => preview.Ramp = new ColorRamp(c, 10);
 
 			var colorChooser = Game.LoadWidget(orderManager.world, "COLOR_CHOOSER", null, new WidgetArgs()
 			{
-				{ "onSelect", onSelect },
 				{ "onChange", onChange },
-				{ "initialRamp", client.ColorRamp }
+				{ "initialColor", client.ColorRamp.Color }
 			});
 
-			color.AttachPanel(colorChooser);
+			color.AttachPanel(colorChooser, onExit);
 		}
 
 		public static Dictionary<int2, Session.Client> GetSpawnClients(OrderManager orderManager, Map map)