Merge pull request #6266 from huwpascoe/uiscaling

Cursor Doubling

OpenRA.Game/Graphics/CursorProvider.cs

@@ -22,6 +22,8 @@ namespace OpenRA.Graphics
 		Dictionary<string, CursorSequence> cursors;
 		Cache<string, PaletteReference> palettes;
 
+		public static bool CursorViewportZoomed { get { return Game.Settings.Graphics.CursorDouble && Game.Settings.Graphics.PixelDouble; } }
+
 		public CursorProvider(ModData modData)
 		{
 			var sequenceFiles = modData.Manifest.Cursors;
@@ -72,12 +74,17 @@ namespace OpenRA.Graphics
 		{
 			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 - cursorSequence.Hotspot - (0.5f * cursorSprite.size).ToInt2(),
-			                                   palettes[cursorSequence.Palette],
-			                                   cursorSprite.size);
+				lastMousePos - cursorOffset,
+				palettes[cursorSequence.Palette],
+				cursorSize);
 		}
 
 		public CursorSequence GetCursorSequence(string cursor)

OpenRA.Game/Graphics/Sprite.cs

@@ -20,6 +20,7 @@ namespace OpenRA.Graphics
 		public readonly TextureChannel channel;
 		public readonly float2 size;
 		public readonly float2 offset;
+		public readonly float2 fractionalOffset;
 		readonly float2[] textureCoords;
 
 		public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel)
@@ -37,6 +38,8 @@ namespace OpenRA.Graphics
 			this.size = new float2(bounds.Size);
 			this.blendMode = blendMode;
 
+			this.fractionalOffset = offset / this.size;
+
 			var left = (float)(bounds.Left) / sheet.Size.Width;
 			var top = (float)(bounds.Top) / sheet.Size.Height;
 			var right = (float)(bounds.Right) / sheet.Size.Width;

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -73,7 +73,7 @@ namespace OpenRA.Graphics
 
 			currentBlend = s.blendMode;
 			currentSheet = s.sheet;
-			Util.FastCreateQuad(vertices, location + s.offset, s, paletteIndex, nv, size);
+			Util.FastCreateQuad(vertices, location + s.fractionalOffset * size, s, paletteIndex, nv, size);
 			nv += 4;
 		}
 

OpenRA.Game/Settings.cs

@@ -86,6 +86,7 @@ namespace OpenRA
 		public int2 FullscreenSize = new int2(0, 0);
 		public int2 WindowedSize = new int2(1024, 768);
 		public bool PixelDouble = false;
+		public bool CursorDouble = false;
 		public bool CapFramerate = true;
 		public int MaxFramerate = 60;
 

OpenRA.Game/Widgets/TooltipContainerWidget.cs

@@ -47,7 +47,7 @@ namespace OpenRA.Widgets
 		{
 			get
 			{
-				var pos = Viewport.LastMousePos + CursorOffset;
+				var pos = Viewport.LastMousePos + (CursorProvider.CursorViewportZoomed ? CursorOffset * 2 : CursorOffset);
 				if (tooltip != null)
 				{
 					if (pos.X + tooltip.Bounds.Right > Game.Renderer.Resolution.Width)