name order these properly

2014-10-12 17:16:28 +02:00
parent 02fabf8ce8
commit 337bcac045
12 changed files with 22 additions and 15 deletions
--- a/OpenRA.Mods.D2k/World/ChooseBuildTabOnSelect.cs
+++ b/OpenRA.Mods.D2k/World/ChooseBuildTabOnSelect.cs
@@ -0,0 +1,66 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 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.Linq;
+using OpenRA.Mods.D2k.Widgets;
+using OpenRA.Mods.RA;
+using OpenRA.Traits;
+using OpenRA.Widgets;
+
+namespace OpenRA.Mods.D2k
+{
+	class ChooseBuildTabOnSelectInfo : ITraitInfo
+	{
+		public readonly string BuildPaletteWidgetName = "INGAME_BUILD_PALETTE";
+
+		public object Create(ActorInitializer init) { return new ChooseBuildTabOnSelect(init, this); }
+	}
+
+	class ChooseBuildTabOnSelect : INotifySelection
+	{
+		readonly World world;
+		readonly ChooseBuildTabOnSelectInfo info;
+
+		public ChooseBuildTabOnSelect(ActorInitializer init, ChooseBuildTabOnSelectInfo info)
+		{
+			world = init.world;
+			this.info = info;
+		}
+
+		public void SelectionChanged()
+		{
+			var palette = Ui.Root.GetOrNull<BuildPaletteWidget>(info.BuildPaletteWidgetName);
+			if (palette == null)
+				return;
+
+			// Queue-per-structure
+			var perqueue = world.Selection.Actors.FirstOrDefault(a => a.IsInWorld && a.World.LocalPlayer == a.Owner
+				&& a.TraitsImplementing<ProductionQueue>().Any(q => q.Enabled));
+
+			if (perqueue != null)
+			{
+				palette.SetCurrentTab(perqueue.TraitsImplementing<ProductionQueue>().First(q => q.Enabled));
+				return;
+			}
+
+			// Queue-per-player
+			var types = world.Selection.Actors.Where(a => a.IsInWorld && (a.World.LocalPlayer == a.Owner))
+				.SelectMany(a => a.TraitsImplementing<Production>())
+				.SelectMany(t => t.Info.Produces)
+				.ToArray();
+
+			if (types.Length == 0)
+				return;
+
+			palette.SetCurrentTab(world.LocalPlayer.PlayerActor.TraitsImplementing<ProductionQueue>()
+				.FirstOrDefault(q => q.Enabled && types.Contains(q.Info.Type)));
+		}
+	}
+}
--- a/OpenRA.Mods.D2k/World/D2kResourceLayer.cs
+++ b/OpenRA.Mods.D2k/World/D2kResourceLayer.cs
@@ -0,0 +1,173 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 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.Collections.Generic;
+using System.Linq;
+using OpenRA.Mods.RA;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.D2k
+{
+	[Desc("Used to render spice with round borders.")]
+	public class D2kResourceLayerInfo : TraitInfo<D2kResourceLayer> { }
+
+	public class D2kResourceLayer : ResourceLayer
+	{
+		[Flags] enum ClearSides : byte
+		{
+			None = 0x0,
+			Left = 0x1,
+			Top = 0x2,
+			Right = 0x4,
+			Bottom = 0x8,
+
+			TopLeft = 0x10,
+			TopRight = 0x20,
+			BottomLeft = 0x40,
+			BottomRight = 0x80,
+
+			All = 0xFF
+		}
+
+		static readonly Dictionary<string, int[]> Variants = new Dictionary<string, int[]>()
+		{
+			{ "cleara", new[] { 0, 50 } },
+			{ "clearb", new[] { 1, 51 } },
+			{ "clearc", new[] { 43, 52 } },
+			{ "cleard", new[] { 0, 53 } },
+		};
+
+		static readonly Dictionary<ClearSides, int> SpriteMap = new Dictionary<ClearSides, int>()
+		{
+			{ ClearSides.None, 0 },
+			{ ClearSides.Left | ClearSides.Top | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 2 },
+			{ ClearSides.Top | ClearSides.Right | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 3 },
+			{ ClearSides.Left | ClearSides.Bottom | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 4 },
+			{ ClearSides.Right | ClearSides.Bottom | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 5 },
+			{ ClearSides.Left | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 6 },
+			{ ClearSides.Right | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 7 },
+			{ ClearSides.Top | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 8 },
+			{ ClearSides.Bottom | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 9 },
+			{ ClearSides.Left | ClearSides.Top | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft, 10 },
+			{ ClearSides.Top | ClearSides.Right | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomRight, 11 },
+			{ ClearSides.Left | ClearSides.Bottom | ClearSides.TopLeft | ClearSides.BottomLeft | ClearSides.BottomRight, 12 },
+			{ ClearSides.Right | ClearSides.Bottom | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 13 },
+			{ ClearSides.Left | ClearSides.Top | ClearSides.Right | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 14 },
+			{ ClearSides.Left | ClearSides.Right | ClearSides.Bottom | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 15 },
+			{ ClearSides.Left | ClearSides.Top | ClearSides.Bottom | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 16 },
+			{ ClearSides.Top | ClearSides.Right | ClearSides.Bottom | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 17 },
+			{ ClearSides.Top | ClearSides.TopLeft | ClearSides.TopRight, 18 },
+			{ ClearSides.Right | ClearSides.TopRight | ClearSides.BottomRight, 19 },
+			{ ClearSides.Left | ClearSides.TopLeft | ClearSides.BottomLeft, 20 },
+			{ ClearSides.Bottom | ClearSides.BottomLeft | ClearSides.BottomRight, 21 },
+			{ ClearSides.TopLeft, 22 },
+			{ ClearSides.TopRight, 23 },
+			{ ClearSides.BottomLeft, 24 },
+			{ ClearSides.BottomRight, 25 },
+			{ ClearSides.Left | ClearSides.TopLeft | ClearSides.BottomLeft | ClearSides.BottomRight, 26 },
+			{ ClearSides.Right | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 27 },
+			{ ClearSides.Top | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomRight, 28 },
+			{ ClearSides.Top | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft, 29 },
+			{ ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 30 },
+			{ ClearSides.TopLeft | ClearSides.BottomLeft | ClearSides.BottomRight, 31 },
+			{ ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomRight, 32 },
+			{ ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft, 33 },
+			{ ClearSides.TopRight | ClearSides.BottomRight, 34 },
+			{ ClearSides.TopLeft | ClearSides.TopRight, 35 },
+			{ ClearSides.TopRight | ClearSides.BottomLeft, 36 },
+			{ ClearSides.TopLeft | ClearSides.BottomLeft, 37 },
+			{ ClearSides.BottomLeft | ClearSides.BottomRight, 38 },
+			{ ClearSides.TopLeft | ClearSides.BottomRight, 39 },
+			{ ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 40 },
+			{ ClearSides.Left | ClearSides.Right | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 41 },
+			{ ClearSides.Top | ClearSides.Bottom | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 42 },
+			{ ClearSides.All, 44 },
+			{ ClearSides.Left | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft, 46 },
+			{ ClearSides.Right | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomRight, 47 },
+			{ ClearSides.Bottom | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 48 },
+			{ ClearSides.Bottom | ClearSides.TopLeft | ClearSides.BottomLeft | ClearSides.BottomRight, 49 },
+		};
+
+		ClearSides FindClearSides(ResourceType t, CPos p)
+		{
+			var ret = ClearSides.None;
+			if (render[p + new CVec(0, -1)].Type != t)
+				ret |= ClearSides.Top | ClearSides.TopLeft | ClearSides.TopRight;
+
+			if (render[p + new CVec(-1, 0)].Type != t)
+				ret |= ClearSides.Left | ClearSides.TopLeft | ClearSides.BottomLeft;
+
+			if (render[p + new CVec(1, 0)].Type != t)
+				ret |= ClearSides.Right | ClearSides.TopRight | ClearSides.BottomRight;
+
+			if (render[p + new CVec(0, 1)].Type != t)
+				ret |= ClearSides.Bottom | ClearSides.BottomLeft | ClearSides.BottomRight;
+
+			if (render[p + new CVec(-1, -1)].Type != t)
+				ret |= ClearSides.TopLeft;
+
+			if (render[p + new CVec(1, -1)].Type != t)
+				ret |= ClearSides.TopRight;
+
+			if (render[p + new CVec(-1, 1)].Type != t)
+				ret |= ClearSides.BottomLeft;
+
+			if (render[p + new CVec(1, 1)].Type != t)
+				ret |= ClearSides.BottomRight;
+
+			return ret;
+		}
+
+		void UpdateRenderedTileInner(CPos p)
+		{
+			var t = render[p];
+			if (t.Density > 0)
+			{
+				var clear = FindClearSides(t.Type, p);
+				int index;
+
+				if (clear == ClearSides.None)
+				{
+					var sprites = Variants[t.Variant];
+					var frame = t.Density > t.Type.Info.MaxDensity / 2 ? 1 : 0;
+					t.Sprite = t.Type.Variants.First().Value[sprites[frame]];
+				}
+				else if (SpriteMap.TryGetValue(clear, out index))
+					t.Sprite = t.Type.Variants.First().Value[index];
+				else
+					t.Sprite = null;
+			}
+			else
+				t.Sprite = null;
+
+			render[p] = t;
+		}
+
+		protected override void UpdateRenderedSprite(CPos p)
+		{
+			// Need to update neighbouring tiles too
+			UpdateRenderedTileInner(p);
+			UpdateRenderedTileInner(p + new CVec(-1, -1));
+			UpdateRenderedTileInner(p + new CVec(0, -1));
+			UpdateRenderedTileInner(p + new CVec(1, -1));
+			UpdateRenderedTileInner(p + new CVec(-1, 0));
+			UpdateRenderedTileInner(p + new CVec(1, 0));
+			UpdateRenderedTileInner(p + new CVec(-1, 1));
+			UpdateRenderedTileInner(p + new CVec(0, 1));
+			UpdateRenderedTileInner(p + new CVec(1, 1));
+		}
+
+		protected override string ChooseRandomVariant(ResourceType t)
+		{
+			return Variants.Keys.Random(Game.CosmeticRandom);
+		}
+	}
+}
--- a/OpenRA.Mods.D2k/World/FogPaletteFromR8.cs
+++ b/OpenRA.Mods.D2k/World/FogPaletteFromR8.cs
@@ -0,0 +1,59 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 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.IO;
+using OpenRA.FileSystem;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.D2k
+{
+	class FogPaletteFromR8Info : ITraitInfo
+	{
+		[Desc("Internal palette name")]
+		public readonly string Name = null;
+		[Desc("Filename to load")]
+		public readonly string Filename = null;
+		[Desc("Palette byte offset")]
+		public readonly long Offset = 0;
+		public readonly bool AllowModifiers = true;
+		public readonly bool InvertColor = false;
+
+		public object Create(ActorInitializer init) { return new FogPaletteFromR8(this); }
+	}
+
+	class FogPaletteFromR8 : ILoadsPalettes
+	{
+		readonly FogPaletteFromR8Info info;
+		public FogPaletteFromR8(FogPaletteFromR8Info info) { this.info = info; }
+
+		public void LoadPalettes(WorldRenderer wr)
+		{
+			var colors = new uint[Palette.Size];
+			using (var s = GlobalFileSystem.Open(info.Filename))
+			{
+				s.Seek(info.Offset, SeekOrigin.Begin);
+
+				for (var i = 0; i < Palette.Size; i++)
+				{
+					var packed = s.ReadUInt16();
+
+					// Fog is rendered with half opacity
+					colors[i] = (uint)((255 << 24) | ((packed & 0xF800) << 7) | ((packed & 0x7E0) << 4) | ((packed & 0x1f) << 2));
+
+					if (info.InvertColor)
+						colors[i] ^= 0x00FFFFFF;
+				}
+			}
+
+			wr.AddPalette(info.Name, new ImmutablePalette(colors), info.AllowModifiers);
+		}
+	}
+}
--- a/OpenRA.Mods.D2k/World/PaletteFromR8.cs
+++ b/OpenRA.Mods.D2k/World/PaletteFromR8.cs
@@ -0,0 +1,57 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 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.IO;
+using OpenRA.FileSystem;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.D2k
+{
+	class PaletteFromR8Info : ITraitInfo
+	{
+		[Desc("Internal palette name")]
+		public readonly string Name = null;
+		[Desc("Filename to load")]
+		public readonly string Filename = null;
+		[Desc("Palette byte offset")]
+		public readonly long Offset = 0;
+		public readonly bool AllowModifiers = true;
+		public readonly bool InvertColor = false;
+		
+		public object Create(ActorInitializer init) { return new PaletteFromR8(this); }
+	}
+
+	class PaletteFromR8 : ILoadsPalettes
+	{
+		readonly PaletteFromR8Info info;
+		public PaletteFromR8(PaletteFromR8Info info) { this.info = info; }
+
+		public void LoadPalettes(WorldRenderer wr)
+		{
+			var colors = new uint[Palette.Size];
+			using (var s = GlobalFileSystem.Open(info.Filename))
+			{
+				s.Seek(info.Offset, SeekOrigin.Begin);
+
+				for (var i = 0; i < Palette.Size; i++)
+				{
+					var packed = s.ReadUInt16();
+					colors[i] = (uint)((255 << 24) | ((packed & 0xF800) << 8) | ((packed & 0x7E0) << 5) | ((packed & 0x1f) << 3));
+
+					if (info.InvertColor)
+						colors[i] ^= 0x00FFFFFF;
+				}
+			}
+
+			wr.AddPalette(info.Name, new ImmutablePalette(colors), info.AllowModifiers);
+		}
+	}
+}
--- a/OpenRA.Mods.D2k/World/PaletteFromScaledPalette.cs
+++ b/OpenRA.Mods.D2k/World/PaletteFromScaledPalette.cs
@@ -0,0 +1,69 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 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.Drawing;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.D2k
+{
+	[Desc("Create a palette by applying a scale and offset to the colors in another palette.")]
+	class PaletteFromScaledPaletteInfo : ITraitInfo
+	{
+		[Desc("Internal palette name")]
+		public readonly string Name = null;
+
+		[Desc("The name of the palette to base off.")]
+		public readonly string BasePalette = null;
+
+		[Desc("Allow palette modifiers to change the palette.")]
+		public readonly bool AllowModifiers = true;
+
+		[Desc("Amount to scale the base palette colors by.")]
+		public readonly float Scale = 1.0f;
+
+		[Desc("Amount to offset the base palette colors by.")]
+		public readonly int Offset = 0;
+
+		public object Create(ActorInitializer init) { return new PaletteFromScaledPalette(this); }
+	}
+
+	class PaletteFromScaledPalette : ILoadsPalettes
+	{
+		readonly PaletteFromScaledPaletteInfo info;
+		public PaletteFromScaledPalette(PaletteFromScaledPaletteInfo info) { this.info = info; }
+
+		public void LoadPalettes(WorldRenderer wr)
+		{
+			var remap = new ScaledPaletteRemap(info.Scale, info.Offset);
+			wr.AddPalette(info.Name, new ImmutablePalette(wr.Palette(info.BasePalette).Palette, remap), info.AllowModifiers);
+		}
+	}
+
+	class ScaledPaletteRemap : IPaletteRemap
+	{
+		readonly float scale;
+		readonly int offset;
+
+		public ScaledPaletteRemap(float scale, int offset)
+		{
+			this.scale = scale;
+			this.offset = offset;
+		}
+
+		public Color GetRemappedColor(Color original, int index)
+		{
+			return Color.FromArgb(original.A,
+				(int)Exts.Clamp((int)(scale * original.R + offset), 0, 255),
+				(int)Exts.Clamp((int)(scale * original.G + offset), 0, 255),
+				(int)Exts.Clamp((int)(scale * original.B + offset), 0, 255));
+		}
+	}
+}