epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix software cursor rendering at fractional scales.

Browse Source
This commit is contained in:
Paul Chote
2020-01-26 16:39:39 +00:00
committed by abcdefg30
parent 25a7299c67
commit bd4724842c
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Graphics/CursorManager.cs
View File

@@ -190,11 +190,17 @@ namespace OpenRA.Graphics
var doubleCursor = graphicSettings.CursorDouble; var doubleCursor = graphicSettings.CursorDouble;
var cursorSprite = cursor.Sprites[frame % cursor.Length]; var cursorSprite = cursor.Sprites[frame % cursor.Length];
var cursorSize = doubleCursor ? 2.0f * cursorSprite.Size : cursorSprite.Size; var cursorSize = doubleCursor ? 2.0f * cursorSprite.Size : cursorSprite.Size;
var mousePos = isLocked ? lockedPosition : Viewport.LastMousePos;
// Cursor is rendered in native window coordinates
// Apply same scaling rules as hardware cursors
var ws = Game.Renderer.WindowScale;
if (ws > 1.5f)
cursorSize = 2 * cursorSize;
var mousePos = isLocked ? lockedPosition : Viewport.LastMousePos;
renderer.RgbaSpriteRenderer.DrawSprite(cursorSprite, renderer.RgbaSpriteRenderer.DrawSprite(cursorSprite,
mousePos, mousePos,
cursorSize); cursorSize / ws);
} }
public void Lock() public void Lock()

7
OpenRA.Mods.Common/Widgets/MouseAttachmentWidget.cs
View File

@@ -36,7 +36,12 @@ namespace OpenRA.Mods.Common.Widgets
if (sprite != null && palette != null) if (sprite != null && palette != null)
{ {
var directionPalette = worldRenderer.Palette(palette); var directionPalette = worldRenderer.Palette(palette);
WidgetUtils.DrawSHPCentered(sprite, ChildOrigin, directionPalette, graphicSettings.CursorDouble ? 2 : 1);
// Cursor is rendered in native window coordinates
// Apply same scaling rules as hardware cursors
var ws = Game.Renderer.WindowScale;
var scale = (graphicSettings.CursorDouble ? 2 : 1) * (ws > 1.5f ? 2 : 1);
WidgetUtils.DrawSHPCentered(sprite, ChildOrigin, directionPalette, scale / ws);
} }
} }