Skip to content

Remove Mouse Centering #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SoulSilverJD wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove Mouse Centering #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 1 addition & 30 deletions StarControl/Menus/RadialMenuController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ public void Update(TimeSpan elapsed)
);
InputPatches.AwaitRightStickMoveForCursor();
InputPatches.ForceHideCursor = true;
ResetMouseToPlayer();
InputPatches.NotifyMousePositionReset();
AnimateMenuOpen(elapsed); // Skip "zero" frame
}
Expand Down Expand Up @@ -355,7 +354,6 @@ private void Reset(bool fromActivation = false)
RestoreHudState();
if (usedRightStickInMenu)
{
ResetMouseToPlayer();
InputPatches.SuppressRightStickFor(InputPatches.RightStickSuppressionDuration);
}
if (Game1.player is not null)
Expand Down Expand Up @@ -691,32 +689,5 @@ private Vector2 SelectThumbstick(Vector2 left, Vector2 right)
return left;
}

private static void ResetMouseToPlayer()
{
var player = Game1.player;
if (player is null)
{
return;
}
var facingOffset = player.FacingDirection switch
{
0 => new Vector2(0, -1), // Up
1 => new Vector2(1, 0), // Right
2 => new Vector2(0, 1), // Down
3 => new Vector2(-1, 0), // Left
_ => Vector2.Zero,
};
var standingPos = player.getStandingPosition();
var targetTile =
new Vector2(
(int)(standingPos.X / Game1.tileSize),
(int)(standingPos.Y / Game1.tileSize)
) + facingOffset;
var targetPos =
targetTile * Game1.tileSize + new Vector2(Game1.tileSize / 2f, Game1.tileSize / 2f);
var viewport = Game1.viewport;
var cursorX = (int)(targetPos.X - viewport.X);
var cursorY = (int)(targetPos.Y - viewport.Y);
Game1.setMousePosition(cursorX, cursorY);
}

}