tweak: cleanup + add shared_ptrs

Code/client/Services/Debug/Views/RebindView.cpp

@@ -13,19 +13,18 @@ void DebugService::DrawRebindView()
     auto& inputService = World::Get().GetInputService();
     auto& rebindService = World::Get().GetRebindService();
     auto uiKey = inputService.GetUIKey();
-    static bool s_bindingActive = false;
 
     ImGui::SetNextWindowSize(ImVec2(250, 440), ImGuiCond_FirstUseEver);
     ImGui::Begin("Rebind");
 
     if (ImGui::CollapsingHeader("UI"))
     {
-        if (ImGui::Button("Open/Close", ImVec2(100, 30)) || s_bindingActive)
+        if (ImGui::Button("Open/Close", ImVec2(100, 30)) || m_rebindActive)
         {
             ImGui::SameLine(0);
-            s_bindingActive = true;
+            m_rebindActive = true;
 
-            if (s_bindingActive)
+            if (m_rebindActive)
                 ImGui::Text("Press a key...");
             else
                 ImGui::Text(uiKey.first.c_str());
@@ -36,16 +35,19 @@ void DebugService::DrawRebindView()
                 if (GetAsyncKeyState(key) & 0x8000)
                 {
                     if (key == VK_ESCAPE || key == VK_LBUTTON || key == VK_RBUTTON)
+                    {
+                        m_rebindActive = false;
                         break;
+                    }
 
-                    auto& newKey = rebindService.GetKeyFromVKKeyCode(key);
-
-                    if (!newKey.first.empty())
+                    auto newKey = rebindService.GetKeyFromVKKeyCode(key);
+                    
+                    if (!newKey->first.empty())
                     {
-                        s_bindingActive = false;
-                        uiKey = newKey;
+                        m_rebindActive = false;
+                            uiKey = *newKey;
 
-                        if(rebindService.SetUIKey(uiKey))
+                        if(rebindService.SetUIKey(std::move(newKey)))
                         {
                             TiltedPhoques::DInputHook::Get().SetToggleKeys({DIK_RCONTROL, static_cast<unsigned>(uiKey.second.diKeyCode)});
                             break;

Code/client/Services/DebugService.h

@@ -81,6 +81,8 @@ struct DebugService
     String SubtitleText = "";
     uint32_t TopicID = 0;
 
+    bool m_rebindActive = false;
+
     entt::scoped_connection m_updateConnection;
     entt::scoped_connection m_drawImGuiConnection;
     entt::scoped_connection m_dialogueConnection;

Code/client/Services/Generic/InputService.cpp

@@ -458,12 +458,12 @@ LRESULT CALLBACK InputService::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
     return 0;
 }
 
-bool InputService::SetUIKey(const RebindService::Key& acKey) noexcept
+bool InputService::SetUIKey(std::shared_ptr<RebindService::Key> acKey) noexcept
 {
-    if (acKey.first.empty() || acKey.second.diKeyCode == -1 || acKey.second.vkKeyCode == -1)
+    if (acKey->first.empty() || acKey->second.diKeyCode == -1 || acKey->second.vkKeyCode == -1)
         return false;
 
-    m_pUiKey = acKey;
+    m_pUiKey = *acKey;
     return true;
 }
 

Code/client/Services/Generic/RebindService.cpp

@@ -5,47 +5,46 @@ RebindService::RebindService(InputService& aInputService) :
 {
 }
 
-const RebindService::Key& RebindService::GetKeyFromName(const TiltedPhoques::String& acKeyName) const noexcept
+std::shared_ptr<RebindService::Key> RebindService::GetKeyFromName(const TiltedPhoques::String& acKeyName) const noexcept
 {
     const auto& key = std::find_if(m_keys.begin(), m_keys.end(), [acKeyName](const Key& aKey) { return aKey.first == acKeyName; });
 
-    Key pKey;
+    std::shared_ptr newKey = std::make_shared<Key>(*key);
 
     if (key != m_keys.end())
     {
-        pKey = *key;
+        *newKey = *key;
     }
 
-    return pKey;
+    return newKey;
 }
 
-
-const RebindService::Key& RebindService::GetKeyFromVKKeyCode(int32_t aKeyCode) const noexcept
+std::shared_ptr<RebindService::Key> RebindService::GetKeyFromVKKeyCode(int32_t aKeyCode) const noexcept
 {
     const auto& key = std::find_if(m_keys.begin(), m_keys.end(), [aKeyCode](const Key& aKey) { return aKey.second.vkKeyCode == aKeyCode; });
 
-    Key pKey;
+    std::shared_ptr newKey = std::make_shared<Key>(*key);
 
     if (key != m_keys.end())
     {
-        pKey = *key;
+        *newKey = *key;
     }
 
-    return pKey;
+    return newKey;
 }
 
-const RebindService::Key& RebindService::GetKeyFromDIKeyCode(int32_t aKeyCode) const noexcept
+std::shared_ptr<RebindService::Key> RebindService::GetKeyFromDIKeyCode(int32_t aKeyCode) const noexcept
 {
     const auto& key = std::find_if(m_keys.begin(), m_keys.end(), [aKeyCode](const Key& aKey) { return aKey.second.diKeyCode == aKeyCode; });
 
-    Key pKey;
+    std::shared_ptr newKey = std::make_shared<Key>(*key);
 
     if (key != m_keys.end())
     {
-        pKey = *key;
+        *newKey = *key;
     }
 
-    return pKey;
+    return newKey;
 }
 
 int32_t RebindService::GetDIKeyCode(const TiltedPhoques::String& aKeyName) const noexcept
@@ -80,21 +79,21 @@ int32_t RebindService::GetVKKeyCode(const TiltedPhoques::String& aKeyName) const
     return KeyCodes::Error;
 }
 
-bool RebindService::SetUIKey(const Key& apKey) noexcept
+bool RebindService::SetUIKey(std::shared_ptr<RebindService::Key> apKey) noexcept
 {
-    m_inputService.SetUIKey(apKey);
-    m_pUiKey = apKey;
+    m_pUiKey = *apKey;
+    m_inputService.SetUIKey(std::move(apKey));
     return true;
 }
 
 bool RebindService::SetUIKeyFromVKKeyCode(int32_t aKeyCode) noexcept
 {
     const auto& key = GetKeyFromVKKeyCode(aKeyCode);
 
-    if (key != m_errorKey)
+    if (!key->first.empty())
     {
-        m_inputService.SetUIKey(key);
-        m_pUiKey = key;
+        m_pUiKey = *key;
+        m_inputService.SetUIKey(std::move(key));
         return true;
     }
 
@@ -105,10 +104,10 @@ bool RebindService::SetUIKeyFromDIKeyCode(int32_t aKeyCode) noexcept
 {
     const auto& key = GetKeyFromDIKeyCode(aKeyCode);
 
-    if (key != m_errorKey)
+    if (!key->first.empty())
     {
+        m_pUiKey = *key;
         m_inputService.SetUIKey(key);
-        m_pUiKey = key;
         return true;
     }
 
@@ -117,11 +116,10 @@ bool RebindService::SetUIKeyFromDIKeyCode(int32_t aKeyCode) noexcept
 
 bool RebindService::SetUIKeyFromKeyName(const TiltedPhoques::String& acKeyName) noexcept
 {
-    if (const auto& key = GetKeyFromName(acKeyName); key != m_errorKey)
+    if (const auto& key = GetKeyFromName(acKeyName); !key->first.empty())
     {
-        //World::Get().GetInputService().SetUIKey(key);
+        m_pUiKey = *key;
         m_inputService.SetUIKey(key);
-        m_pUiKey = key;
         return true;
     }
 

Code/client/Services/InputService.h

@@ -14,7 +14,7 @@ struct InputService
 
     // Use this function to get the player's current UI key
     RebindService::Key GetUIKey() const noexcept { return m_pUiKey; }
-    bool SetUIKey(const RebindService::Key& apKey) noexcept;
+    bool SetUIKey(std::shared_ptr<RebindService::Key> apKey) noexcept;
 
     static LRESULT WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 

Code/client/Services/RebindService.h

@@ -8,87 +8,45 @@ struct RebindService
 {
     struct KeyCodes
     {
-        enum
-        {
-            Error = -1
-        };
+        enum { Error = -1 };
 
         int32_t vkKeyCode = Error;
         int32_t diKeyCode = Error;
-
-        bool operator==(const KeyCodes& acKeyCodes) const
-        {
-            return this->vkKeyCode == acKeyCodes.vkKeyCode && this->diKeyCode == acKeyCodes.diKeyCode;
-        }
     };
 
-    /*struct Key
-    {
-        TiltedPhoques::String keyName;
-        KeyCodes keyCodes;
-
-        Key() : keyName(""), keyCodes({KeyCodes::Error, KeyCodes::Error})
-        {
-        }
-
-        Key(const TiltedPhoques::String& acKeyName, const KeyCodes& acKeyCodes) :
-            keyName(acKeyName), keyCodes(acKeyCodes)
-        {
-        }
-
-        Key(const Key& acKey)
-        {
-            keyName = acKey.keyName;
-            keyCodes = acKey.keyCodes;
-        }
-
-        Key(const std::pair<TiltedPhoques::String, KeyCodes>& acKey)
-        {
-            keyName = acKey.first;
-            keyCodes = acKey.second;
-        }
-
-        bool operator==(const Key& acKey) const
-        {
-            return this->keyName == acKey.keyName && this->keyCodes == acKey.keyCodes;
-        }
-
-        bool operator==(const std::pair<TiltedPhoques::String, KeyCodes>& acKey) const
-        {
-            return this->keyName == acKey.first && this->keyCodes == acKey.second;
-        }
-    };*/
-
     using Key = std::pair<TiltedPhoques::String, KeyCodes>;
 
-
     RebindService(InputService& aInputService);
     ~RebindService() = default;
 
     TP_NOCOPYMOVE(RebindService);
 
-    const Key& GetUIKey() const noexcept { return m_pUiKey; }
-    const Key& GetDebugKey() const noexcept { return m_pDebugKey; }
+    TiltedPhoques::Map<Key::first_type, Key::second_type> GetKeys() const noexcept { return m_keys; }
 
-    bool SetUIKey(const Key& apKey) noexcept;
+    // UI Key
+    const Key& GetUIKey() const noexcept { return m_pUiKey; }
+    bool SetUIKey(std::shared_ptr<RebindService::Key> apKey) noexcept;
     bool SetUIKeyFromKeyName(const TiltedPhoques::String& acKeyName) noexcept;
     bool SetUIKeyFromVKKeyCode(int32_t aKeyCode) noexcept;
     bool SetUIKeyFromDIKeyCode(int32_t aKeyCode) noexcept;
 
-    const Key& GetKeyFromName(const TiltedPhoques::String& acKeyName) const noexcept;
-    const Key& GetKeyFromVKKeyCode(int32_t aKeyCode) const noexcept;
-    const Key& GetKeyFromDIKeyCode(int32_t aKeyCode) const noexcept;
-
-    TiltedPhoques::Map<Key::first_type, Key::second_type> GetKeys() const noexcept { return m_keys; }
-    //const TiltedPhoques::Map<TiltedPhoques::String, KeyCodes>& GetKeys() const noexcept { return m_keys; }
+    // Debug Key
+    const Key& GetDebugKey() const noexcept { return m_pDebugKey; }
 
-    // Get DirectInput KeyCode
-    int32_t GetDIKeyCode(const TiltedPhoques::String& aKeyName) const noexcept;
-    // Get VirtualKey KeyCode
+    // General Key
+    std::shared_ptr<RebindService::Key> GetKeyFromName(const TiltedPhoques::String& acKeyName) const noexcept;
+    std::shared_ptr<RebindService::Key> GetKeyFromVKKeyCode(int32_t aKeyCode) const noexcept;
     int32_t GetVKKeyCode(const TiltedPhoques::String& aKeyName) const noexcept;
+    std::shared_ptr<RebindService::Key> GetKeyFromDIKeyCode(int32_t aKeyCode) const noexcept;
+    int32_t GetDIKeyCode(const TiltedPhoques::String& aKeyName) const noexcept;
+    bool IsValidKey(const TiltedPhoques::String& acKeyName) const noexcept { return m_keys.find(acKeyName) != m_keys.end(); }
 
 private:
+    Key m_pUiKey = {"F2", {VK_F2, DIK_F2}};
+    Key m_pDebugKey = {"F3", {VK_F3, DIK_F3}};
 
+    InputService& m_inputService;
+
     const TiltedPhoques::Map<Key::first_type, Key::second_type> m_keys
     {
         {"", {KeyCodes::Error, KeyCodes::Error}},
@@ -224,12 +182,4 @@ struct RebindService
         {"]", {VK_OEM_6, DIK_RBRACKET}},
         {"'", {VK_OEM_7, DIK_APOSTROPHE}},
     };
-
-
-private:
-    Key m_pUiKey = {"F2", {VK_F2, DIK_F2}};
-    Key m_pDebugKey = {"F3", {VK_F3, DIK_F3}};
-    Key m_errorKey = {"", {KeyCodes::Error, KeyCodes::Error}};
-
-    InputService& m_inputService;
 };