feat: enhance joystick support for player controls and menu interactions

Author: AhmedAmrNabil

src/game/systems/player-movement-system.cpp

@@ -210,7 +210,9 @@ namespace gameplay {
             moveDir -= joystickMoveDir;
         }
 
-        movement->isSprinting = keyboard.isPressed(GLFW_KEY_LEFT_SHIFT) && !movement->isSliding;
+        bool sprintPressed =
+            keyboard.isPressed(GLFW_KEY_LEFT_SHIFT) || joystick.isPressed(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER);
+        movement->isSprinting = sprintPressed && !movement->isSliding;
 
         float sprintSpeed = movement->walkSpeed * movement->sprintMultiplier;
         float slideStartSpeed = sprintSpeed * movement->slideSpeedMultiplier;

src/game/systems/weapon-switcher-system.hpp

@@ -52,6 +52,11 @@ namespace gameplay {
                     (playerComp->currentActiveWeaponIndex - 1 + weapons.size()) % weapons.size();
             }
 
+            our::Joystick& joystick = app->getJoystick();
+            if (joystick.justPressed(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)) {
+                playerComp->currentActiveWeaponIndex = (playerComp->currentActiveWeaponIndex + 1) % weapons.size();
+            }
+
             weapons[currentIndex]->isActive = false;
             weapons[playerComp->currentActiveWeaponIndex]->isActive = true;
 

src/game/ui/play-overlay.hpp

@@ -300,12 +300,19 @@ namespace gameplay {
             if (!app) return false;
 
             our::Keyboard& keyboard = app->getKeyboard();
+            our::Joystick& joystick = app->getJoystick();
             if (screen == Screen::Pause) {
-                if (keyboard.justPressed(GLFW_KEY_ESCAPE)) {
+                if (keyboard.justPressed(GLFW_KEY_ESCAPE) || joystick.justPressed(GLFW_GAMEPAD_BUTTON_START) ||
+                    joystick.justPressed(GLFW_GAMEPAD_BUTTON_A)) {
                     closePause();
                     return true;
                 }
 
+                if (joystick.justPressed(GLFW_GAMEPAD_BUTTON_B)) {
+                    app->changeState("menu");
+                    return true;
+                }
+
                 glm::ivec2 size = app->getFrameBufferSize();
                 menu_ui::PixelRect menuRect = menu_ui::getMenuRect(size);
                 glm::vec2 mousePosition = menu_ui::getMousePositionInTarget(app, size);
@@ -317,7 +324,15 @@ namespace gameplay {
             }
 
             if (screen == Screen::GameOver) {
-                if (keyboard.justPressed(GLFW_KEY_ESCAPE)) app->changeState("menu");
+                if (keyboard.justPressed(GLFW_KEY_ESCAPE) || joystick.justPressed(GLFW_GAMEPAD_BUTTON_B)) {
+                    app->changeState("menu");
+                    return true;
+                }
+
+                if (joystick.justPressed(GLFW_GAMEPAD_BUTTON_A)) {
+                    app->changeState("loading-play");
+                    return true;
+                }
 
                 glm::ivec2 size = app->getFrameBufferSize();
                 menu_ui::PixelRect menuRect = menu_ui::getMenuRect(size);

src/states/menu-state.hpp

@@ -67,9 +67,10 @@ class Menustate : public our::State {
 
     void onDraw(double deltaTime) override {
         auto& keyboard = getApp()->getKeyboard();
-        if (keyboard.justPressed(GLFW_KEY_SPACE))
+        auto& joystick = getApp()->getJoystick();
+        if (keyboard.justPressed(GLFW_KEY_SPACE) || joystick.justPressed(GLFW_GAMEPAD_BUTTON_A))
             getApp()->changeState("loading-play");
-        else if (keyboard.justPressed(GLFW_KEY_ESCAPE))
+        else if (keyboard.justPressed(GLFW_KEY_ESCAPE) || joystick.justPressed(GLFW_GAMEPAD_BUTTON_B))
             getApp()->close();
 
         glm::ivec2 size = getApp()->getFrameBufferSize();

src/states/play-state.hpp

@@ -149,6 +149,7 @@ class Playstate : public our::State {
     void onDraw(double deltaTime) override {
         float dt = static_cast<float>(deltaTime);
         our::Keyboard& keyboard = getApp()->getKeyboard();
+        our::Joystick& joystick = getApp()->getJoystick();
 
         if (waitFirstFrame) {
             waitFirstFrame = false;
@@ -158,7 +159,7 @@ class Playstate : public our::State {
 
         if (overlay.handleActiveFrame(deltaTime)) return;
 
-        if (keyboard.justPressed(GLFW_KEY_ESCAPE)) {
+        if (keyboard.justPressed(GLFW_KEY_ESCAPE) || joystick.justPressed(GLFW_GAMEPAD_BUTTON_START)) {
             overlay.openPause();
             overlay.renderCurrent(deltaTime);
             return;