#64

Author: codenamecpp

src/CarnageGame.cpp

@@ -168,11 +168,6 @@ void CarnageGame::InputEventLost()
 
 void CarnageGame::InputEvent(KeyInputEvent& inputEvent)
 {
-    if (inputEvent.HasPressed(eKeycode_TILDE)) // show debug console
-    {
-        gDebugConsoleWindow.mWindowShown = !gDebugConsoleWindow.mWindowShown;
-        return;
-    }
     if (inputEvent.HasPressed(eKeycode_F3))
     {
         gRenderManager.ReloadRenderPrograms();

src/ConsoleWindow.cpp

@@ -118,15 +118,6 @@ int ConsoleWindow::TextEditCallback(ImGuiInputTextCallbackData* data)
 {
     switch (data->EventFlag)
     {
-    case ImGuiInputTextFlags_CallbackCharFilter:
-        {
-            if (data->EventChar == L'`')
-            {
-                ToggleWindowShown();
-                return 1;
-            }
-            break;
-        }
     case ImGuiInputTextFlags_CallbackCompletion:
         {
             // Locate beginning of current word

src/InputsDefs.h

@@ -229,10 +229,14 @@ struct KeyInputEvent: public BaseInputEvent
     {
         return (mMods & bits) == bits;
     }
-    // test whether specific key was pressed
+    // test whether specific key was pressed or released
     inline bool HasPressed(eKeycode keycode) const
     {
-        return mPressed && keycode == mKeycode;
+        return mPressed && (keycode == mKeycode);
+    }
+    inline bool HasReleased(eKeycode keycode) const
+    {
+        return !mPressed && (keycode == mKeycode);
     }
 public:
     eKeycode mKeycode;

src/InputsManager.cpp

@@ -2,6 +2,7 @@
 #include "InputsManager.h"
 #include "ImGuiManager.h"
 #include "CarnageGame.h"
+#include "ConsoleWindow.h"
 
 InputsManager gInputs;
 
@@ -73,6 +74,12 @@ void InputsManager::InputEvent(GamepadInputEvent& inputEvent)
 
 void InputsManager::InputEvent(KeyInputEvent& inputEvent)
 {
+    if (HandleDebugKeys(inputEvent))
+    {
+        InputEventConsumed(nullptr);
+        return;
+    }
+
     mKeyboardKeys[inputEvent.mKeycode] = inputEvent.mPressed;
 
     for (InputEventsHandler* currentHandler: mInputHandlers)
@@ -142,3 +149,19 @@ void InputsManager::UpdateFrame()
     mInputHandlers.push_back(&gGuiManager);
     mInputHandlers.push_back(&gCarnageGame);
 }
+
+bool InputsManager::HandleDebugKeys(KeyInputEvent& inputEvent)
+{
+    // show/hide debug console window
+    if (inputEvent.HasPressed(eKeycode_TILDE) || inputEvent.HasReleased(eKeycode_TILDE))
+    {
+        if (inputEvent.HasPressed(eKeycode_TILDE))
+        {
+            gDebugConsoleWindow.ToggleWindowShown();
+        }
+        inputEvent.SetConsumed();
+        return true;
+    }
+
+    return false;
+}

src/InputsManager.h

@@ -86,6 +86,7 @@ class InputsManager final: public cxx::noncopyable
 
 private:
     void InputEventConsumed(InputEventsHandler* handler);
+    bool HandleDebugKeys(KeyInputEvent& inputEvent);
 
 private:
     InputEventsHandler* mLastInputsHandler = nullptr;