Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions Examples/GameloopExamples.cs
Original file line number Diff line number Diff line change
Expand Up @@ -535,9 +535,10 @@ protected override void LoadContent()
contentPackAll.Clear();
}

protected override Vector2 ChangeMousePos(float dt, Vector2 mousePos, Rect screenArea)
protected override bool ChangeMousePos(float dt, Vector2 mousePos, Rect screenArea, out Vector2 newMousePos)
{
if (!MouseControlEnabled) return mousePos;
newMousePos = mousePos;
if (!MouseControlEnabled) return false;

if (Input.CurrentInputDeviceType == InputDeviceType.Gamepad && Input.GamepadManager.LastUsedGamepad != null &&
Input.GamepadManager.LastUsedGamepad.IsDown(ShapeGamepadTriggerAxis.RIGHT))
Expand All @@ -550,10 +551,14 @@ protected override Vector2 ChangeMousePos(float dt, Vector2 mousePos, Rect scree

var movement = new Vector2(x, y);
float l = movement.Length();
if (l <= 0f) return mousePos;
if (l <= 0f)
{
return false;
}

var dir = movement / l;
return mousePos + dir * l * speed;
newMousePos = mousePos + dir * l * speed;
return true;
}

if (Input.CurrentInputDeviceType == InputDeviceType.Keyboard)
Expand All @@ -568,11 +573,12 @@ protected override Vector2 ChangeMousePos(float dt, Vector2 mousePos, Rect scree

var movement = new Vector2(x, y);
if (movement.LengthSquared() <= 0f) mouseMovementTimer = 0f;
return mousePos + movement.Normalize() * speed;
newMousePos = mousePos + movement.Normalize() * speed;
return true;
}

mouseMovementTimer = 0f;
return mousePos;
return false;
}

protected override void EndRun()
Expand Down
5 changes: 4 additions & 1 deletion ShapeEngine/Core/GameDef/GameGameloop.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ private void RunGameloop()
{
if (Input.CurrentInputDeviceType is InputDeviceType.Keyboard or InputDeviceType.Gamepad)
{
Window.MoveMouse(ChangeMousePos(dt, Window.MousePosition, Window.ScreenArea));
if (ChangeMousePos(dt, Window.MousePosition, Window.ScreenArea, out var newMousePos))
{
Window.MoveMouse(newMousePos);
}
}
}

Expand Down
18 changes: 18 additions & 0 deletions ShapeEngine/Core/GameDef/GameVirtual.cs
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,33 @@ protected virtual void OnWindowTopmostChanged(bool topmost)
{
}

/// <deprecated>
/// This function will be removed in a future version. Use <see cref="ChangeMousePos(float, Vector2, Rect, out Vector2)"/> instead.
/// </deprecated>
/// <summary>
/// Allows modification of the mouse position before it's used for input processing.
/// </summary>
/// <param name="dt">Delta time since the last frame.</param>
/// <param name="mousePos">The current mouse position.</param>
/// <param name="screenArea">The screen area rectangle.</param>
/// <returns>The modified mouse position.</returns>
[Obsolete("Use ChangeMousePos(float, Vector2, Rect, out Vector2) instead.", error: false)]
protected virtual Vector2 ChangeMousePos(float dt, Vector2 mousePos, Rect screenArea) => mousePos;

/// <summary>
/// Allows modification of the mouse position before it's used for input processing.
/// </summary>
/// <param name="dt">Delta time since the last frame.</param>
/// <param name="mousePos">The current mouse position.</param>
/// <param name="screenArea">The screen area rectangle.</param>
/// <param name="newMousePos">The modified mouse position.</param>
/// <returns>Whether the mouse position was modified and should be changed.</returns>
protected virtual bool ChangeMousePos(float dt, Vector2 mousePos, Rect screenArea, out Vector2 newMousePos)
{
newMousePos = mousePos;
return false;
}

/// <summary>
/// Called when an input button is pressed.
/// </summary>
Expand Down
Loading