keyboard key to axis direction

Author: briaguya-ai

src/controller/controldevice/controller/Controller.cpp

@@ -107,6 +107,7 @@ void Controller::AddDefaultMappings(PhysicalDeviceType physicalDeviceType) {
         button->AddDefaultMappings(physicalDeviceType);
     }
     GetLeftStick()->AddDefaultMappings(physicalDeviceType);
+    GetRightStick()->AddDefaultMappings(physicalDeviceType);
     GetRumble()->AddDefaultMappings(physicalDeviceType);
 
     const std::string hasConfigCvarKey =

src/controller/controldevice/controller/mapping/ControllerDefaultMappings.cpp

@@ -4,18 +4,22 @@
 namespace Ship {
 ControllerDefaultMappings::ControllerDefaultMappings(
     std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardKeyToButtonMappings,
+    std::unordered_map<StickIndex, std::vector<std::pair<Direction, KbScancode>>>
+        defaultKeyboardKeyToAxisDirectionMappings,
     std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<SDL_GameControllerButton>>
         defaultSDLButtonToButtonMappings,
     std::unordered_map<CONTROLLERBUTTONS_T, std::vector<std::pair<SDL_GameControllerAxis, int32_t>>>
         defaultSDLAxisDirectionToButtonMappings) {
     SetDefaultKeyboardKeyToButtonMappings(defaultKeyboardKeyToButtonMappings);
+    SetDefaultKeyboardKeyToAxisDirectionMappings(defaultKeyboardKeyToAxisDirectionMappings);
     SetDefaultSDLButtonToButtonMappings(defaultSDLButtonToButtonMappings);
     SetDefaultSDLAxisDirectionToButtonMappings(defaultSDLAxisDirectionToButtonMappings);
 }
 
 ControllerDefaultMappings::ControllerDefaultMappings()
     : ControllerDefaultMappings(
           std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>>(),
+          std::unordered_map<StickIndex, std::vector<std::pair<Direction, KbScancode>>>(),
           std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<SDL_GameControllerButton>>(),
           std::unordered_map<CONTROLLERBUTTONS_T, std::vector<std::pair<SDL_GameControllerAxis, int32_t>>>()) {
 }
@@ -51,6 +55,25 @@ void ControllerDefaultMappings::SetDefaultKeyboardKeyToButtonMappings(
     mDefaultKeyboardKeyToButtonMappings[BTN_DRIGHT] = { KbScancode::LUS_KB_H };
 }
 
+std::unordered_map<StickIndex, std::vector<std::pair<Direction, KbScancode>>>
+ControllerDefaultMappings::GetDefaultKeyboardKeyToAxisDirectionMappings() {
+    return mDefaultKeyboardKeyToAxisDirectionMappings;
+}
+
+void ControllerDefaultMappings::SetDefaultKeyboardKeyToAxisDirectionMappings(
+    std::unordered_map<StickIndex, std::vector<std::pair<Direction, KbScancode>>>
+        defaultKeyboardKeyToAxisDirectionMappings) {
+    if (!defaultKeyboardKeyToAxisDirectionMappings.empty()) {
+        mDefaultKeyboardKeyToAxisDirectionMappings = defaultKeyboardKeyToAxisDirectionMappings;
+        return;
+    }
+
+    mDefaultKeyboardKeyToAxisDirectionMappings[LEFT_STICK] = { { LEFT, KbScancode::LUS_KB_A },
+                                                               { RIGHT, KbScancode::LUS_KB_D },
+                                                               { UP, KbScancode::LUS_KB_W },
+                                                               { DOWN, KbScancode::LUS_KB_S } };
+}
+
 std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<SDL_GameControllerButton>>
 ControllerDefaultMappings::GetDefaultSDLButtonToButtonMappings() {
     return mDefaultSDLButtonToButtonMappings;

src/controller/controldevice/controller/mapping/ControllerDefaultMappings.h

@@ -5,6 +5,7 @@
 #include <unordered_set>
 #include <vector>
 #include <SDL2/SDL.h>
+#include "ControllerAxisDirectionMapping.h"
 
 #ifndef CONTROLLERBUTTONS_T
 #define CONTROLLERBUTTONS_T uint16_t
@@ -18,6 +19,8 @@ class ControllerDefaultMappings {
   public:
     ControllerDefaultMappings(
         std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardKeyToButtonMappings,
+        std::unordered_map<StickIndex, std::vector<std::pair<Direction, KbScancode>>>
+            defaultKeyboardKeyToAxisDirectionMappings,
         std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<SDL_GameControllerButton>>
             defaultSDLButtonToButtonMappings,
         std::unordered_map<CONTROLLERBUTTONS_T, std::vector<std::pair<SDL_GameControllerAxis, int32_t>>>
@@ -26,6 +29,8 @@ class ControllerDefaultMappings {
     ~ControllerDefaultMappings();
 
     std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> GetDefaultKeyboardKeyToButtonMappings();
+    std::unordered_map<StickIndex, std::vector<std::pair<Direction, KbScancode>>>
+    GetDefaultKeyboardKeyToAxisDirectionMappings();
     std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<SDL_GameControllerButton>>
     GetDefaultSDLButtonToButtonMappings();
     std::unordered_map<CONTROLLERBUTTONS_T, std::vector<std::pair<SDL_GameControllerAxis, int32_t>>>
@@ -36,6 +41,12 @@ class ControllerDefaultMappings {
         std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardKeyToButtonMappings);
     std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> mDefaultKeyboardKeyToButtonMappings;
 
+    void SetDefaultKeyboardKeyToAxisDirectionMappings(
+        std::unordered_map<StickIndex, std::vector<std::pair<Direction, KbScancode>>>
+            defaultKeyboardKeyToAxisDirectionMappings);
+    std::unordered_map<StickIndex, std::vector<std::pair<Direction, KbScancode>>>
+        mDefaultKeyboardKeyToAxisDirectionMappings;
+
     void SetDefaultSDLButtonToButtonMappings(
         std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<SDL_GameControllerButton>>
             defaultSDLButtonToButtonMappings);

src/controller/controldevice/controller/mapping/factories/AxisDirectionMappingFactory.cpp

@@ -109,15 +109,17 @@ AxisDirectionMappingFactory::CreateAxisDirectionMappingFromConfig(uint8_t portIn
 
 std::vector<std::shared_ptr<ControllerAxisDirectionMapping>>
 AxisDirectionMappingFactory::CreateDefaultKeyboardAxisDirectionMappings(uint8_t portIndex, StickIndex stickIndex) {
-    std::vector<std::shared_ptr<ControllerAxisDirectionMapping>> mappings = {
-        std::make_shared<KeyboardKeyToAxisDirectionMapping>(portIndex, stickIndex, LEFT,
-                                                            LUS_DEFAULT_KB_MAPPING_STICKLEFT),
-        std::make_shared<KeyboardKeyToAxisDirectionMapping>(portIndex, stickIndex, RIGHT,
-                                                            LUS_DEFAULT_KB_MAPPING_STICKRIGHT),
-        std::make_shared<KeyboardKeyToAxisDirectionMapping>(portIndex, stickIndex, UP, LUS_DEFAULT_KB_MAPPING_STICKUP),
-        std::make_shared<KeyboardKeyToAxisDirectionMapping>(portIndex, stickIndex, DOWN,
-                                                            LUS_DEFAULT_KB_MAPPING_STICKDOWN)
-    };
+    std::vector<std::shared_ptr<ControllerAxisDirectionMapping>> mappings;
+
+    auto defaultsForStick = Context::GetInstance()
+                                ->GetControlDeck()
+                                ->GetControllerDefaultMappings()
+                                ->GetDefaultKeyboardKeyToAxisDirectionMappings()[stickIndex];
+
+    for (const auto& [direction, scancode] : defaultsForStick) {
+        mappings.push_back(
+            std::make_shared<KeyboardKeyToAxisDirectionMapping>(portIndex, stickIndex, direction, scancode));
+    }
 
     return mappings;
 }