two players can play on one keyboard #52

thomasbringer-madbox · 2026-05-12T23:44:38Z

Yes, this is this issue - i believe it's out of scope for this PR, i suggest we fix in upcoming PR.

thomasbringer-madbox · 2026-05-12T23:10:19Z

There is also some calculation here that could potentially be outsourced

thomasbringer-madbox · 2026-05-12T23:18:48Z

Unless I missed it, i see no unsubscription: possible memory leak.

Honestly I'm not sure how this code works, I did not write it and didn't quite look into it, I just assumed that it was preferable to subscribe to that event in Awake rather than doing it every frame in Update.

thomasbringer-madbox · 2026-05-12T23:45:10Z

Yes, correct I believe

thomasbringer-madbox · 2026-05-12T23:22:27Z

This is still very painful to read, especially that if statement. I'm sure there are more elegant ways to write it. Consider using a Left/Right enum.

This is a slight improvement ChatGPT suggested (there could be better ways though, for instance with a left/right enum)

bool isLeftPlayer = Keyboard.current.escapeKey.wasPressedThisFrame; string targetScheme = isLeftPlayer ? "Keyboard_left" : "Keyboard_right"; PlayerInput playerInputToRemove = null; foreach (PlayerInput playerInput in inputProviders.Keys) { if (playerInput.currentControlScheme != targetScheme) continue; playerInputToRemove = playerInput; break; }

thomasbringer-madbox · 2026-05-12T23:16:56Z

It's usually not a good practice to have a same method be both triggered by an event AND be triggered manually. Now here we're doing some weird stuff so not sure the core issue, but still a possibly relevant lesson:

You would prefer using the following pattern:
OnDidStuff subscribes to event DidStuff
OnDidStuff simply calls method DoThings
And then you can also call manually DoThings whenever required.
This way, all method names correspond exactly to their functionality. It's also super readable code. A more real example could be:
OnScored subscribes to event Scored
OnScored simply calls method PlayScoreVFX. This way it's super readable that we trigger a VFX every time we score a point.

thomasbringer-madbox · 2026-05-12T23:46:27Z

A potential issue yes, kinda linked to this comment

thomasbringer-madbox · 2026-05-12T23:24:22Z

Using booleans for keyboard players (left/right) is hard to read and maintain. Consider using a Left/Right enum.

thomasbringer-madbox · 2026-05-12T23:24:52Z

This still looks bad and looks almost duplicate to the logic from before, consider refactoring it into a single method

thomasbringer-madbox · 2026-05-12T23:42:18Z

AH. Your code doesn't compile but you made the PR anyway? 😭

thomasbringer-madbox · 2026-05-12T23:27:21Z

From a design point of view, I sure wouldn't want to play a top-down shooter... where you can't aim.

thomasbringer-madbox · 2026-05-12T23:29:26Z

I think this should be removed, see this comment

-Original file line number
+Diff line change
@@ -1,20 +1,31 @@
+    using Automathon.Utility;
+    using System.Collections.Generic;
     using UnityEngine;
     using UnityEngine.InputSystem;
     namespace Automathon.Game.Input
     {
         public class PlayerInputProvider : IInputProvider
         {
-            private bool isGamepad;
+            public enum PlayerControlsType { LeftKeyboard, RightKeyboard, Gamepad }
+            public PlayerControlsType PlayerControls { get; private set; }
             private InputAction dashAction;
             private InputAction grenadeAction;
             private InputAction shieldAction;
             private InputAction shootAction;
             private InputAction moveAction;
             private InputAction aimAction;
+            private Dictionary<string, PlayerControlsType> schemeToControlsType = new Dictionary<string, PlayerControlsType>
+            {
+                { "Gamepad", PlayerControlsType.Gamepad },
+                { "Keyboard_left", PlayerControlsType.LeftKeyboard },
+                { "Keyboard_right", PlayerControlsType.RightKeyboard }
+            };
             public PlayerInputProvider(PlayerInput playerInput)
             {
-                isGamepad = playerInput.currentControlScheme == "Gamepad";
+                PlayerControls = schemeToControlsType[playerInput.currentControlScheme];
                 dashAction = playerInput.actions["Dash"];
                 grenadeAction = playerInput.actions["Grenade"];
                 shieldAction = playerInput.actions["Shield"];
@@ Expand All / @@ -39,13 +50,13 @@ public Vector2Int GetMilliMovementDir() @@
             public Vector2Int GetMilliAimingDir()
             {
-                if (isGamepad)
+                Vector2 aimingDir = aimAction.ReadValue<Vector2>();
+                if (PlayerControls == PlayerControlsType.RightKeyboard)
                 {
-                    Vector2 aimingDir = aimAction.ReadValue<Vector2>();
-                    return new Vector2Int((int)(aimingDir.x * 1000), (int)(aimingDir.y * 1000));
+                    Vector3 worldPos = aimingDir.ScreenToWorldSpace();
+                    return ((Vector2)worldPos).ToVector2IntScaled();
                 }
-                return GetMilliMovementDir();
+                return new Vector2Int((int)(aimingDir.x * 1000), (int)(aimingDir.y * 1000));
             }
         }
     }

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,31 +13,38 @@ public class TankSpawnerView : MonoBehaviour @@
             [SerializeField] private PlayerInputManager playerInputManager;
             private Dictionary<PlayerInput, IInputProvider> inputProviders = new();
+            private void Awake()
+            {
+                playerInputManager.onPlayerLeft += OnPlayerLeft;
+            }
             private void Update()
             {
                 if (GameplayManager.State != GameplayManager.GameState.Lobby)
                     return;
-                playerInputManager.onPlayerLeft += OnPlayerLeft;
                 HandleGamepadJoinInput();
                 HandleKeyboardJoinInput();
-                if (Keyboard.current != null && Keyboard.current.escapeKey.wasPressedThisFrame)
+                if (Keyboard.current != null)
                 {
-                    PlayerInput playerInputToRemove = null;
-                    foreach (PlayerInput playerInput in inputProviders.Keys)
+                    if (Keyboard.current.escapeKey.wasPressedThisFrame || Keyboard.current.deleteKey.wasPressedThisFrame)
                     {
-                        if (playerInput.currentControlScheme == "Keyboard&Mouse")
+                        bool isLeftPlayer = Keyboard.current.escapeKey.wasPressedThisFrame;
+                        PlayerInput playerInputToRemove = null;
+                        foreach (PlayerInput playerInput in inputProviders.Keys)
                         {
-                            playerInputToRemove = playerInput;
-                            break;
+                            if ((isLeftPlayer && playerInput.currentControlScheme == "Keyboard_left") || (!isLeftPlayer && playerInput.currentControlScheme == "Keyboard_right"))
+                            {
+                                playerInputToRemove = playerInput;
+                                break;
+                            }
                         }
-                    }
-                    if (playerInputToRemove != null)
-                        OnPlayerLeft(playerInputToRemove);
+                        if (playerInputToRemove != null)
+                            OnPlayerLeft(playerInputToRemove);
+                    }
                 }
             }
@@ Expand All / @@ -49,7 +56,12 @@ private void HandleKeyboardJoinInput() @@
                 if (keyboard.eKey.wasPressedThisFrame || keyboard.wKey.wasPressedThisFrame || keyboard.aKey.wasPressedThisFrame ||
                     keyboard.sKey.wasPressedThisFrame || keyboard.dKey.wasPressedThisFrame || keyboard.qKey.wasPressedThisFrame)
                 {
-                    JoinKeyboardPlayer();
+                    JoinKeyboardPlayer(true);
+                }
+                else if (keyboard.upArrowKey.wasPressedThisFrame || keyboard.downArrowKey.wasPressedThisFrame || keyboard.leftArrowKey.wasPressedThisFrame ||
+                         keyboard.rightArrowKey.wasPressedThisFrame || keyboard.rightShiftKey.wasPressedThisFrame || keyboard.slashKey.wasPressedThisFrame)
+                {
+                    JoinKeyboardPlayer(false);
                 }
             }
@@ Expand Down Expand Up / @@ -103,23 +115,24 @@ private void JoinGamepadPlayer(Gamepad gamepad) @@
                 SpawnTank(playerInput);
             }
-            private void JoinKeyboardPlayer()
+            private void JoinKeyboardPlayer(bool isLeft)
             {
                 if (PlayerInput.all.Count >= playerInputManager.maxPlayerCount)
                     return;
                 foreach (PlayerInput playerInputTemp in inputProviders.Keys)
                 {
-                    if (playerInputTemp.currentControlScheme == "Keyboard&Mouse")
+                    if ((isLeft && playerInputTemp.currentControlScheme == "Keyboard_left") || (!isLeft && playerInputTemp.currentControlScheme == "Keyboard_right"))
                         return;
                 }
                 // 2. Manually trigger the join
                 // We pass -1 for playerIndex to let Unity assign the next available index (0, 1, 2, etc.)
+                string controlScheme = isLeft ? "Keyboard_left" : "Keyboard_right";
                 PlayerInput playerInput = playerInputManager.JoinPlayer(
                     playerIndex: -1,
                     splitScreenIndex: -1,
-                    controlScheme: "Keyboard&Mouse",
+                    controlScheme: controlScheme,
                     pairWithDevice: Keyboard.current
                 );
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
             protected override void Activate()
             {
                 Vector2Int position = Tank.Position + Tank.LastMilliDirection * SPAWN_DISTANCE_FROM_TANK / 1000;
-                int rotationMilliRad = Tank.RotationMilli + IntMath.PI_MILLI / 2;
+                int rotationMilliRad = Tank.LastMilliDirection.CalculateAngleMilliRad() + IntMath.PI_MILLI / 2;
                 GameplayManager.Instantiate(new Shield(position, rotationMilliRad));
             }
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -44,16 +44,22 @@ public override void Update() @@
                 rigidbody.Velocity = movementInput * SPEED / 1000;
                 Vector2Int directionInput = InputProvider.GetMilliAimingDir();
+                if (InputProvider is PlayerInputProvider playerInputProvider && playerInputProvider.PlayerControls == PlayerInputProvider.playerControlsType.Right)
+                {
+                    directionInput = new Vector2Int(directionInput.X - Position.X, directionInput.Y - Position.Y);
+                }
                 directionInput.NormalizeAtScale(1000);
                 if (directionInput != Vector2Int.Zero)
                 {
-                    RotationMilli = directionInput.CalculateAngleMilliRad();
-                    rigidbody.AngularVelocityMilli = 0;
                     LastMilliDirection = directionInput;
                     LastMilliDirection.NormalizeAtScale(1000);
                 }
+                if (movementInput != Vector2Int.Zero)
+                {
+                    RotationMilli = movementInput.CalculateAngleMilliRad();
+                    rigidbody.AngularVelocityMilli = 0;
+                }
             }
             private void Death()
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    using Automathon.Game.World;
     using UnityEngine;
     namespace Automathon.Utility
@@ Expand All @@
             {
                 return Quaternion.Euler(0, 0, rotationMillirad * Mathf.Rad2Deg / 1000f);
             }
+            public static Vector2Int ToVector2IntScaled(this Vector2 vector)
+                => new Vector2Int((int)(vector.x * WorldConstants.SPACE_SCALE), (int)(vector.y * WorldConstants.SPACE_SCALE));
         }
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

two players can play on one keyboard #52

Uh oh!

Diff view

Diff view

There are no files selected for viewing

thomasbringer-madbox May 12, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

pro2p May 13, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

thomasbringer-madbox May 12, 2026

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,6 @@ @@
         public static class WorldConstants
         {
             public const int SPACE_SCALE = 1000;
+            public const int CAMERA_DISTANCE = 10000;
         }
     }

two players can play on one keyboard #52

Are you sure you want to change the base?

Uh oh!

two players can play on one keyboard #52

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!