Fix input handling

Author: deccer

src/Cpp/1-getting-started/1-3-6-Camera/1-3-6-Camera.vcxproj

@@ -119,9 +119,6 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
     <ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_widgets.cpp" />
     <ClCompile Include="Application.cpp" />
     <ClCompile Include="DeviceContext.cpp" />
-    <ClCompile Include="Input\Input.cpp" />
-    <ClCompile Include="Input\Keyboard.cpp" />
-    <ClCompile Include="Input\Mouse.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="CameraApplication.cpp" />
     <ClCompile Include="ModelFactory.cpp" />
@@ -134,9 +131,6 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
     <ClInclude Include="Definitions.hpp" />
     <ClInclude Include="DeviceContext.hpp" />
     <ClInclude Include="CameraApplication.hpp" />
-    <ClInclude Include="Input\Input.hpp" />
-    <ClInclude Include="Input\Keyboard.hpp" />
-    <ClInclude Include="Input\Mouse.hpp" />
     <ClInclude Include="ModelFactory.hpp" />
     <ClInclude Include="Pipeline.hpp" />
     <ClInclude Include="PipelineFactory.hpp" />

src/Cpp/1-getting-started/1-3-6-Camera/1-3-6-Camera.vcxproj.filters

@@ -60,15 +60,6 @@
     <ClCompile Include="..\..\..\..\lib\imgui\include\imgui\backend\imgui_impl_glfw.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Input\Input.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\Keyboard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\Mouse.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Application.hpp">
@@ -101,15 +92,6 @@
     <ClInclude Include="DeviceContext.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Input\Input.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\Keyboard.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\Mouse.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="Assets\Textures\T_Good_Froge.dds" />

src/Cpp/1-getting-started/1-3-6-Camera/Application.cpp

@@ -1,5 +1,5 @@
 #include "Application.hpp"
-#include "Input/Input.hpp"
+
 #include <GLFW/glfw3.h>
 
 Application::Application(const std::string_view title)
@@ -38,13 +38,14 @@ bool Application::Initialize()
         return false;
     }
 
-    _input = std::make_unique<Input>(_window);
-
     const int32_t windowLeft = videoMode->width / 2 - _width / 2;
     const int32_t windowTop = videoMode->height / 2 - _height / 2;
     glfwSetWindowPos(_window, windowLeft, windowTop);
     glfwSetWindowUserPointer(_window, this);
     glfwSetFramebufferSizeCallback(_window, HandleResize);
+    glfwSetKeyCallback(_window, HandleKeyboard);
+    glfwSetMouseButtonCallback(_window, HandleMouseButton);
+    glfwSetCursorPosCallback(_window, HandleMouseMovement);
     return true;
 }
 
@@ -56,8 +57,30 @@ void Application::OnResize(
     _height = height;
 }
 
+void Application::OnKey(
+    const int32_t key,
+    const int32_t action)
+{
+    switch (action)
+    {
+    case GLFW_PRESS:
+        _keysPressed.insert(key);
+        _keysDown.insert(key);
+        break;
+    case GLFW_RELEASE:
+        _keysReleased.insert(key);
+        _keysDown.erase(key);
+    }
+}
+
 void Application::Cleanup()
 {
+    glfwSetCursorPosCallback(_window, nullptr);
+    glfwSetMouseButtonCallback(_window, nullptr);
+    glfwSetKeyCallback(_window, nullptr);
+    glfwSetFramebufferSizeCallback(_window, nullptr);
+    glfwSetWindowUserPointer(_window, nullptr);
+
     glfwDestroyWindow(_window);
     glfwTerminate();
 }
@@ -82,9 +105,10 @@ void Application::Run()
 
     while (!glfwWindowShouldClose(_window))
     {
-        _input->Update(
+        UpdateInput(
             static_cast<float>(_width) / 2.0f,
             static_cast<float>(_height) / 2.0f);
+
         glfwPollEvents();
         Update();
         Render();
@@ -100,6 +124,88 @@ void Application::HandleResize(
     application.OnResize(width, height);
 }
 
+void Application::HandleKeyboard(
+    GLFWwindow* window,
+    const int32_t key,
+    const int32_t scanCode,
+    const int32_t action,
+    const int32_t modifier)
+{
+    Application& application = *static_cast<Application*>(glfwGetWindowUserPointer(window));
+    application.OnKey(key, action);
+}
+
+void Application::HandleMouseButton(
+    GLFWwindow* window,
+    const int32_t button,
+    const int32_t action,
+    const int32_t modifiers)
+{
+    Application& application = *static_cast<Application*>(glfwGetWindowUserPointer(window));
+    application.OnMouseButton(button, action);
+}
+
+void Application::HandleMouseMovement(
+    GLFWwindow* window,
+    const double x,
+    const double y)
+{
+    Application& application = *static_cast<Application*>(glfwGetWindowUserPointer(window));
+    application.OnMouseMove(static_cast<float>(x), static_cast<float>(y));
+}
+
+void Application::OnMouseButton(
+    const int32_t button,
+    const int32_t action)
+{
+    // ReSharper disable once CppDefaultCaseNotHandledInSwitchStatement
+    switch (action)
+    {
+    case GLFW_PRESS:
+        _buttonsPressed.insert(button);
+        _buttonsDown.insert(button);
+        break;
+    case GLFW_RELEASE:
+        _buttonsUp.insert(button);
+        _buttonsDown.erase(button);
+        break;
+    }
+}
+
+void Application::OnMouseMove(
+    const float x,
+    const float y)
+{
+    DeltaPosition = DirectX::XMFLOAT2(
+        x - CursorPosition.x,
+        y - CursorPosition.y);
+
+    CursorPosition = DirectX::XMFLOAT2(x, y);
+}
+
+void Application::UpdateInput(
+    float centerX,
+    float centerY)
+{
+    _keysDown.clear();
+    _keysUp.clear();
+    _keysPressed.clear();
+    _keysReleased.clear();
+
+    const auto window = glfwGetCurrentContext();
+    _buttonsDown.clear();
+    _buttonsPressed.clear();
+    _buttonsUp.clear();
+
+    DeltaPosition = DirectX::XMFLOAT2(0.0f, 0.0f);
+
+    if (_isCaptured)
+    {
+        CursorPosition = DirectX::XMFLOAT2(centerX, centerY);
+        glfwSetCursorPos(window, centerX, centerY);
+    }
+}
+
 GLFWwindow* Application::GetWindow() const
 {
     return _window;
@@ -115,22 +221,32 @@ int32_t Application::GetWindowHeight() const
     return _height;
 }
 
-bool Application::IsKeyDown(const std::int32_t key) const
+bool Application::IsKeyDown(const int32_t key) const
+{
+    return _keysDown.count(key) != 0;
+}
+
+bool Application::IsKeyPressed(const int32_t key) const
+{
+    return _keysPressed.count(key) != 0;
+}
+
+bool Application::IsKeyUp(const int32_t key) const
 {
-    return _input->GetKeyboard().IsKeyDown(key);
+    return _keysUp.count(key) != 0;
 }
 
-bool Application::IsKeyPressed(const std::int32_t key) const
+bool Application::IsButtonDown(const int32_t button) const
 {
-    return _input->GetKeyboard().IsKeyPressed(key);
+    return _buttonsDown.count(button) != 0;
 }
 
-bool Application::IsKeyUp(const std::int32_t key) const
+bool Application::IsButtonPressed(const int32_t button) const
 {
-    return _input->GetKeyboard().IsKeyUp(key);
+    return _buttonsPressed.count(button) != 0;
 }
 
-bool Application::IsButtonPressed(const std::int32_t button) const
+bool Application::IsButtonUp(const int32_t button) const
 {
-    return _input->GetMouse().IsButtonPressed(button);
+    return _buttonsUp.count(button) != 0;
 }

src/Cpp/1-getting-started/1-3-6-Camera/Application.hpp

@@ -1,11 +1,13 @@
 #pragma once
 
+#include <DirectXMath.h>
+
 #include <string_view>
 #include <cstdint>
 #include <memory>
+#include <set>
 
 struct GLFWwindow;
-class Input;
 
 class Application
 {
@@ -15,13 +17,18 @@ class Application
 
     void Run();
 protected:
-    static void HandleResize(
-        GLFWwindow* window,
-        const int32_t width,
-        const int32_t height);
     virtual void OnResize(
         const int32_t width,
         const int32_t height);
+    void OnKey(
+        const int32_t key,
+        const int32_t action);
+    void OnMouseButton(
+        const int32_t button,
+        const int32_t action);
+    void OnMouseMove(
+        const float x,
+        const float y);
 
     virtual bool Initialize();
     virtual bool Load() = 0;
@@ -34,16 +41,53 @@ class Application
     [[nodiscard]] int32_t GetWindowWidth() const;
     [[nodiscard]] int32_t GetWindowHeight() const;
 
-    [[nodiscard]] bool IsButtonPressed(const std::int32_t button) const;
-    [[nodiscard]] bool IsKeyDown(const std::int32_t key) const;
-    [[nodiscard]] bool IsKeyPressed(const std::int32_t key) const;
-    [[nodiscard]] bool IsKeyUp(const std::int32_t key) const;
+    [[nodiscard]] bool IsButtonPressed(const int32_t button) const;
+    [[nodiscard]] bool IsButtonDown(const int32_t button) const;
+    [[nodiscard]] bool IsButtonUp(const int32_t button) const;
+    [[nodiscard]] bool IsKeyDown(const int32_t key) const;
+    [[nodiscard]] bool IsKeyPressed(const int32_t key) const;
+    [[nodiscard]] bool IsKeyUp(const int32_t key) const;
 
-    std::unique_ptr<Input> _input = nullptr;
+    DirectX::XMFLOAT2 DeltaPosition = { 0.0f, 0.0f };
+    DirectX::XMFLOAT2 CursorPosition = { 0.0f, 0.0f };
 
 private:
+    static void HandleResize(
+        GLFWwindow* window,
+        const int32_t width,
+        const int32_t height);
+
+    static void HandleKeyboard(
+        GLFWwindow* window,
+        const int32_t key,
+        const int32_t scanCode,
+        const int32_t action,
+        const int32_t modifier);
+    static void HandleMouseButton(
+        GLFWwindow* window,
+        const int32_t button,
+        const int32_t action,
+        const int32_t modifiers);
+    static void HandleMouseMovement(
+        GLFWwindow* window,
+        const double x,
+        const double y);
+
+    void UpdateInput(float centerX, float centerY);
+
     GLFWwindow* _window = nullptr;
     int32_t _width = 0;
     int32_t _height = 0;
     std::string_view _title;
+
+    std::set<int32_t> _keysDown;
+    std::set<int32_t> _keysUp;
+    std::set<int32_t> _keysPressed;
+    std::set<int32_t> _keysReleased;
+
+    std::set<int32_t> _buttonsDown{};
+    std::set<int32_t> _buttonsPressed{};
+    std::set<int32_t> _buttonsUp{};
+    bool _isCaptured = false;
+
 };

src/Cpp/1-getting-started/1-3-6-Camera/CameraApplication.cpp

@@ -75,8 +75,8 @@ CameraApplication::~CameraApplication()
 #endif
     _device.Reset();
 
-    ImGui_ImplGlfw_Shutdown();
-    ImGui::DestroyContext(_imGuiContext);
+    //ImGui_ImplGlfw_Shutdown();
+    //ImGui::DestroyContext(_imGuiContext);
 
     Application::Cleanup();
 }
@@ -125,7 +125,7 @@ bool CameraApplication::Initialize()
         return false;
     }
 
-    InitializeImGui();
+    //InitializeImGui();
 
     constexpr char deviceName[] = "DEV_Main";
     _device->SetPrivateData(WKPDID_D3DDebugObjectName, sizeof(deviceName), deviceName);
@@ -339,8 +339,8 @@ void CameraApplication::OnResize(
 
     CreateSwapchainResources();
 
-    ImGuiIO& io = ImGui::GetIO();
-    io.DisplaySize = ImVec2(GetWindowWidth(), GetWindowHeight());
+    //ImGuiIO& io = ImGui::GetIO();
+    //io.DisplaySize = ImVec2(GetWindowWidth(), GetWindowHeight());
 
     _projectionMatrix = DirectX::XMMatrixPerspectiveFovLH(
         DirectX::XMConvertToRadians(45.0f),
@@ -394,7 +394,7 @@ void CameraApplication::Render()
 
     _deviceContext->DrawIndexed();
 
-    RenderUi();
+    //RenderUi();
     _swapChain->Present(1, 0);
 }