naming

Author: briaguya-ai

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

@@ -3,8 +3,8 @@
 
 namespace Ship {
 ControllerDefaultMappings::ControllerDefaultMappings(
-    std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardButtonMappings) {
-    SetDefaultKeyboardButtonMappings(defaultKeyboardButtonMappings);
+    std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardKeyToButtonMappings) {
+    SetDefaultKeyboardKeyToButtonMappings(defaultKeyboardKeyToButtonMappings);
 }
 
 ControllerDefaultMappings::ControllerDefaultMappings()
@@ -15,30 +15,30 @@ ControllerDefaultMappings::~ControllerDefaultMappings() {
 }
 
 std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>>
-ControllerDefaultMappings::GetDefaultKeyboardButtonMappings() {
-    return mDefaultKeyboardButtonMappings;
+ControllerDefaultMappings::GetDefaultKeyboardKeyToButtonMappings() {
+    return mDefaultKeyboardKeyToButtonMappings;
 }
 
-void ControllerDefaultMappings::SetDefaultKeyboardButtonMappings(
-    std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardButtonMappings) {
-    if (!defaultKeyboardButtonMappings.empty()) {
-        mDefaultKeyboardButtonMappings = defaultKeyboardButtonMappings;
+void ControllerDefaultMappings::SetDefaultKeyboardKeyToButtonMappings(
+    std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardKeyToButtonMappings) {
+    if (!defaultKeyboardKeyToButtonMappings.empty()) {
+        mDefaultKeyboardKeyToButtonMappings = defaultKeyboardKeyToButtonMappings;
         return;
     }
 
-    mDefaultKeyboardButtonMappings[BTN_A] = { KbScancode::LUS_KB_X };
-    mDefaultKeyboardButtonMappings[BTN_B] = { KbScancode::LUS_KB_C };
-    mDefaultKeyboardButtonMappings[BTN_L] = { KbScancode::LUS_KB_E };
-    mDefaultKeyboardButtonMappings[BTN_R] = { KbScancode::LUS_KB_R };
-    mDefaultKeyboardButtonMappings[BTN_Z] = { KbScancode::LUS_KB_Z };
-    mDefaultKeyboardButtonMappings[BTN_START] = { KbScancode::LUS_KB_SPACE };
-    mDefaultKeyboardButtonMappings[BTN_CUP] = { KbScancode::LUS_KB_ARROWKEY_UP };
-    mDefaultKeyboardButtonMappings[BTN_CDOWN] = { KbScancode::LUS_KB_ARROWKEY_DOWN };
-    mDefaultKeyboardButtonMappings[BTN_CLEFT] = { KbScancode::LUS_KB_ARROWKEY_LEFT };
-    mDefaultKeyboardButtonMappings[BTN_CRIGHT] = { KbScancode::LUS_KB_ARROWKEY_RIGHT };
-    mDefaultKeyboardButtonMappings[BTN_DUP] = { KbScancode::LUS_KB_T };
-    mDefaultKeyboardButtonMappings[BTN_DDOWN] = { KbScancode::LUS_KB_G };
-    mDefaultKeyboardButtonMappings[BTN_DLEFT] = { KbScancode::LUS_KB_F };
-    mDefaultKeyboardButtonMappings[BTN_DRIGHT] = { KbScancode::LUS_KB_H };
+    mDefaultKeyboardKeyToButtonMappings[BTN_A] = { KbScancode::LUS_KB_X };
+    mDefaultKeyboardKeyToButtonMappings[BTN_B] = { KbScancode::LUS_KB_C };
+    mDefaultKeyboardKeyToButtonMappings[BTN_L] = { KbScancode::LUS_KB_E };
+    mDefaultKeyboardKeyToButtonMappings[BTN_R] = { KbScancode::LUS_KB_R };
+    mDefaultKeyboardKeyToButtonMappings[BTN_Z] = { KbScancode::LUS_KB_Z };
+    mDefaultKeyboardKeyToButtonMappings[BTN_START] = { KbScancode::LUS_KB_SPACE };
+    mDefaultKeyboardKeyToButtonMappings[BTN_CUP] = { KbScancode::LUS_KB_ARROWKEY_UP };
+    mDefaultKeyboardKeyToButtonMappings[BTN_CDOWN] = { KbScancode::LUS_KB_ARROWKEY_DOWN };
+    mDefaultKeyboardKeyToButtonMappings[BTN_CLEFT] = { KbScancode::LUS_KB_ARROWKEY_LEFT };
+    mDefaultKeyboardKeyToButtonMappings[BTN_CRIGHT] = { KbScancode::LUS_KB_ARROWKEY_RIGHT };
+    mDefaultKeyboardKeyToButtonMappings[BTN_DUP] = { KbScancode::LUS_KB_T };
+    mDefaultKeyboardKeyToButtonMappings[BTN_DDOWN] = { KbScancode::LUS_KB_G };
+    mDefaultKeyboardKeyToButtonMappings[BTN_DLEFT] = { KbScancode::LUS_KB_F };
+    mDefaultKeyboardKeyToButtonMappings[BTN_DRIGHT] = { KbScancode::LUS_KB_H };
 }
 } // namespace Ship

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

@@ -3,6 +3,7 @@
 #include <cstdint>
 #include <unordered_map>
 #include <unordered_set>
+#include <SDL2/SDL.h>
 
 #ifndef CONTROLLERBUTTONS_T
 #define CONTROLLERBUTTONS_T uint16_t
@@ -15,15 +16,17 @@ namespace Ship {
 class ControllerDefaultMappings {
   public:
     ControllerDefaultMappings(
-        std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardButtonMappings);
+        std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardKeyToButtonMappings);
     ControllerDefaultMappings();
     ~ControllerDefaultMappings();
 
-    std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> GetDefaultKeyboardButtonMappings();
+    std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> GetDefaultKeyboardKeyToButtonMappings();
 
   private:
-    void SetDefaultKeyboardButtonMappings(
-        std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardButtonMappings);
-    std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> mDefaultKeyboardButtonMappings;
+    void SetDefaultKeyboardKeyToButtonMappings(
+        std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> defaultKeyboardKeyToButtonMappings);
+    std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<KbScancode>> mDefaultKeyboardKeyToButtonMappings;
+
+    // std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<SDL_GameControllerButton>> mDefaultSDLButtonToButton
 };
 } // namespace Ship

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

@@ -87,7 +87,7 @@ ButtonMappingFactory::CreateDefaultKeyboardButtonMappings(uint8_t portIndex, CON
     auto defaultsForBitmask = Context::GetInstance()
                                   ->GetControlDeck()
                                   ->GetControllerDefaultMappings()
-                                  ->GetDefaultKeyboardButtonMappings()[bitmask];
+                                  ->GetDefaultKeyboardKeyToButtonMappings()[bitmask];
 
     for (const auto& scancode : defaultsForBitmask) {
         mappings.push_back(std::make_shared<KeyboardKeyToButtonMapping>(portIndex, bitmask, scancode));