maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-16 13:13:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rudimentary mouse aiming

Browse source
This commit is contained in:
Marco 2025-03-13 15:01:21 +01:00
commit 4d9d566b2f
1 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Scripts/Components/Actors/KeyboardInputProvider.cs
View file

@ -34,6 +34,9 @@ public partial class KeyboardInputProvider : InputProvider
[Export] private StringName _inventoryActionName = "inventory"; [Export] private StringName _inventoryActionName = "inventory";
[Export] private StringName _pauseActionName = "pause"; [Export] private StringName _pauseActionName = "pause";
private enum AimInputMethod { RightStick, Mouse }
private AimInputMethod _lastUsedInput = AimInputMethod.RightStick;
public override Vector2 GetMovementInput() public override Vector2 GetMovementInput()
{ {
return Input.GetVector(LeftAxisName, RightAxisName, UpAxisName, DownAxisName); return Input.GetVector(LeftAxisName, RightAxisName, UpAxisName, DownAxisName);
@ -41,7 +44,20 @@ public partial class KeyboardInputProvider : InputProvider
public override Vector2 GetAimInput() public override Vector2 GetAimInput()
{ {
return GetRightStickInput(); Vector2 rightStickInput = GetRightStickInput();
Vector2 mouseInput = GetMouseAimInput();
// Determine which input method to use
if (rightStickInput != Vector2.Zero)
{
_lastUsedInput = AimInputMethod.RightStick;
}
else if (mouseInput != Vector2.Zero)
{
_lastUsedInput = AimInputMethod.Mouse;
}
return _lastUsedInput == AimInputMethod.RightStick ? rightStickInput : mouseInput;
} }
private Vector2 GetRightStickInput() private Vector2 GetRightStickInput()
@ -51,6 +67,17 @@ public partial class KeyboardInputProvider : InputProvider
Input.GetAxis(UpAimName, DownAimName) Input.GetAxis(UpAimName, DownAimName)
); );
} }
private Vector2 GetMouseAimInput()
{
//Camera2D camera = GetViewport().GetCamera2D();
//if (camera == null) return Vector2.Zero; // Ensure there's a valid camera
//Vector2 mouseScreenPos = GetViewport().get_local_mouse_position();
Vector2 mouseWorldPos = this.GetGlobalMousePosition();
return mouseWorldPos - this.GlobalPosition; // Get direction vector
}
public override bool GetActionJustPressed(string action) public override bool GetActionJustPressed(string action)
{ {