Reorganize cursor plumbing in preparation for hardware cursors.

OpenRA.Game/Graphics/CursorProvider.cs

@@ -10,26 +10,21 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using OpenRA.FileSystem;
 using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
-	public sealed class CursorProvider : IDisposable
+	public sealed class CursorProvider
 	{
-		readonly HardwarePalette palette = new HardwarePalette();
-		readonly Dictionary<string, CursorSequence> cursors = new Dictionary<string, CursorSequence>();
-		readonly Cache<string, PaletteReference> palettes;
-		readonly SheetBuilder sheetBuilder;
-
-		public static bool CursorViewportZoomed { get { return Game.Settings.Graphics.CursorDouble && Game.Settings.Graphics.PixelDouble; } }
+		public readonly IReadOnlyDictionary<string, CursorSequence> Cursors;
+		public readonly IReadOnlyDictionary<string, ImmutablePalette> Palettes;
 
 		public CursorProvider(ModData modData)
 		{
 			var sequenceFiles = modData.Manifest.Cursors;
-
-			palettes = new Cache<string, PaletteReference>(CreatePaletteReference);
 			var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal));
 			var shadowIndex = new int[] { };
 
@@ -41,65 +36,35 @@ namespace OpenRA.Graphics
 					out shadowIndex[shadowIndex.Length - 1]);
 			}
 
+			var palettes = new Dictionary<string, ImmutablePalette>();
 			foreach (var p in nodesDict["Palettes"].Nodes)
-				palette.AddPalette(p.Key, new ImmutablePalette(GlobalFileSystem.Open(p.Value.Value), shadowIndex), false);
+				palettes.Add(p.Key, new ImmutablePalette(GlobalFileSystem.Open(p.Value.Value), shadowIndex));
 
-			sheetBuilder = new SheetBuilder(SheetType.Indexed);
-			var spriteCache = new SpriteCache(modData.SpriteLoaders, new string[0], sheetBuilder);
+			Palettes = palettes.AsReadOnly();
+
+			var frameCache = new FrameCache(modData.SpriteLoaders, new string[0]);
+			var cursors = new Dictionary<string, CursorSequence>();
 			foreach (var s in nodesDict["Cursors"].Nodes)
-				LoadSequencesForCursor(spriteCache, s.Key, s.Value);
-			sheetBuilder.Current.ReleaseBuffer();
+				foreach (var sequence in s.Value.Nodes)
+					cursors.Add(sequence.Key, new CursorSequence(frameCache, sequence.Key, s.Key, s.Value.Value, sequence.Value));
 
-			palette.Initialize();
+			Cursors = cursors.AsReadOnly();
 		}
 
-		PaletteReference CreatePaletteReference(string name)
-		{
-			var pal = palette.GetPalette(name);
-			return new PaletteReference(name, palette.GetPaletteIndex(name), pal);
-		}
-
-		void LoadSequencesForCursor(SpriteCache cache, string cursorSrc, MiniYaml cursor)
-		{
-			foreach (var sequence in cursor.Nodes)
-				cursors.Add(sequence.Key, new CursorSequence(cache, cursorSrc, cursor.Value, sequence.Value));
-		}
+		public static bool CursorViewportZoomed { get { return Game.Settings.Graphics.CursorDouble && Game.Settings.Graphics.PixelDouble; } }
 
 		public bool HasCursorSequence(string cursor)
 		{
-			return cursors.ContainsKey(cursor);
-		}
-
-		public void DrawCursor(Renderer renderer, string cursorName, int2 lastMousePos, int cursorFrame)
-		{
-			var cursorSequence = GetCursorSequence(cursorName);
-			var cursorSprite = cursorSequence.GetSprite(cursorFrame);
-			var cursorSize = CursorViewportZoomed ? 2.0f * cursorSprite.size : cursorSprite.size;
-
-			var cursorOffset = CursorViewportZoomed ?
-				(2 * cursorSequence.Hotspot) + cursorSprite.size.ToInt2() :
-				cursorSequence.Hotspot + (0.5f * cursorSprite.size).ToInt2();
-
-			renderer.SetPalette(palette);
-			renderer.SpriteRenderer.DrawSprite(cursorSprite,
-				lastMousePos - cursorOffset,
-				palettes[cursorSequence.Palette],
-				cursorSize);
+			return Cursors.ContainsKey(cursor);
 		}
 
 		public CursorSequence GetCursorSequence(string cursor)
 		{
-			try { return cursors[cursor]; }
+			try { return Cursors[cursor]; }
 			catch (KeyNotFoundException)
 			{
 				throw new InvalidOperationException("Cursor does not have a sequence `{0}`".F(cursor));
 			}
 		}
-
-		public void Dispose()
-		{
-			palette.Dispose();
-			sheetBuilder.Dispose();
-		}
 	}
 }