Merge pull request #591 from novelrt/feature/input-key-changelog

Revamp Input to reintroduce KeyStateFrameChangeLog

.github/workflows/build-system.yml

@@ -89,6 +89,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       checks: write
+      pull-requests: write
     if: always()
 
     steps:

CMakeLists.txt

@@ -124,6 +124,7 @@ add_subdirectory(thirdparty)
 add_subdirectory(resources)
 add_subdirectory(graphics)
 add_subdirectory(audio)
+add_subdirectory(input)
 add_subdirectory(src)
 
 if(NOVELRT_BUILD_SAMPLES)

include/NovelRT/Ecs/Input/Ecs.Input.h

@@ -8,7 +8,11 @@
 #error NovelRT does not support including types explicitly by default. Please include Ecs.h instead for the Ecs namespace subset.
 #endif
 
-#include "../../Input/Input.h"
+#include <NovelRT/Input/IInputDevice.hpp>
+#include <NovelRT/Input/InputAction.hpp>
+#include <NovelRT/Input/KeyState.hpp>
+#include <NovelRT/Input/KeyStateFrameChangeLog.hpp>
+#include <NovelRT/Input/NovelKey.hpp>
 #include <map>
 
 namespace NovelRT::Ecs::Input

include/NovelRT/Exceptions/Exceptions.h

@@ -1,6 +1,5 @@
-//
-// Created by Matt on 06/01/2021.
-//
+// Copyright © Matt Jones and Contributors. Licensed under the MIT Licence (MIT). See LICENCE.md in the repository root
+// for more information.
 
 #ifndef NOVELRT_EXCEPTIONS_H
 #define NOVELRT_EXCEPTIONS_H
@@ -17,7 +16,6 @@
 #include "NotInitialisedException.h"
 #include "NotSupportedException.h"
 #include "NullPointerException.h"
-#include "OpenGLLinkageFailureException.h"
 #include "OutOfMemoryException.h"
 #include "RuntimeNotFoundException.h"
 #include "TimeoutException.h"

include/NovelRT/NovelRT.h

@@ -114,8 +114,6 @@
   #include <NovelRT/Threading/Threading.h>
   #include <NovelRT/Windowing/Windowing.h>
   #include <NovelRT/Windowing/Glfw/Windowing.Glfw.h>
-  #include <NovelRT/Input/Input.h>
-  #include <NovelRT/Input/Glfw/Input.Glfw.h>
 
   // Plugin Management types
   #include <NovelRT/PluginManagement/PluginManagement.h>

include/NovelRT/PluginManagement/PluginManagement.h

@@ -5,10 +5,10 @@
 #define NOVELRT_PLUGINMANAGEMENT_H
 
 // PluginManagement Dependencies
-#include "../Input/Input.h"
 #include "../ResourceManagement/ResourceManagement.h"
 #include "../Windowing/Windowing.h"
 #include <NovelRT/Graphics/Graphics.hpp>
+#include <NovelRT/Input/IInputDevice.hpp>
 
 /**
  * @brief The NovelRT engine plugin system for loading modules such as Vulkan, GLFW3, OpenAL, and more.

include/NovelRT/Utilities/Misc.h

@@ -43,6 +43,7 @@ namespace NovelRT::Utilities
         static inline const char* CONSOLE_LOG_AUDIO = "Audio";
         static inline const char* CONSOLE_LOG_INPUT = "Input";
         static inline const char* CONSOLE_LOG_WINDOWING = "WindowManager";
+        static inline const char* CONSOLE_LOG_ECS_INPUT = "EcsInputSystem";
 
         template<class T>
 #ifdef NOVELRT_USE_STD_SPAN

include/NovelRT/Windowing/Glfw/GlfwWindowingDevice.h

@@ -12,6 +12,23 @@ namespace NovelRT::Windowing::Glfw
 {
     class GlfwWindowingDevice final : public IWindowingDevice
     {
+    public:
+        struct CursorPositionEventArgs
+        {
+            double x = 0;
+            double y = 0;
+        };
+
+        struct ButtonChangeEventArgs
+        {
+            int32_t key = 0;
+            int32_t action = 0;
+        };
+
+        Utilities::Event<CursorPositionEventArgs> CursorMoved;
+        Utilities::Event<ButtonChangeEventArgs> MouseButtonClicked;
+        Utilities::Event<ButtonChangeEventArgs> KeyboardButtonChanged;
+
     private:
         std::unique_ptr<GLFWwindow, decltype(&glfwDestroyWindow)> _window;
         std::string _currentTitle;

input/CMakeLists.txt

@@ -0,0 +1,67 @@
+add_library(NovelRT-Input STATIC
+  KeyStateFrameChangeLog.cpp
+  NovelKey.cpp
+  Glfw/GlfwInputDevice.cpp
+  Glfw/GlfwInputPluginProvider.cpp
+)
+
+target_sources(NovelRT-Input
+  PUBLIC
+    FILE_SET public_headers
+    TYPE HEADERS
+    BASE_DIRS include
+    FILES
+      include/NovelRT/Input/IInputDevice.hpp
+      include/NovelRT/Input/InputAction.hpp
+      include/NovelRT/Input/KeyState.hpp
+      include/NovelRT/Input/KeyStateFrameChangeLog.hpp
+      include/NovelRT/Input/NovelKey.hpp
+      include/NovelRT/Input/Glfw/GlfwInputDevice.hpp
+      include/NovelRT/Input/Glfw/GlfwInputPluginProvider.hpp
+)
+
+set_target_properties(NovelRT-Input
+  PROPERTIES
+    EXPORT_NAME Input
+    POSITION_INDEPENDENT_CODE ON
+)
+
+target_compile_features(NovelRT-Input
+  PUBLIC
+    cxx_std_17
+)
+
+target_compile_options(NovelRT-Input
+  PRIVATE
+    $<$<CXX_COMPILER_ID:GNU>:-Wall>
+    $<$<CXX_COMPILER_ID:GNU>:-Wabi>
+    $<$<CXX_COMPILER_ID:GNU>:-Werror>
+    $<$<CXX_COMPILER_ID:GNU>:-Wextra>
+    $<$<CXX_COMPILER_ID:GNU>:-Wpedantic>
+    $<$<CXX_COMPILER_ID:GNU>:-pedantic-errors>
+
+    $<$<CXX_COMPILER_ID:Clang>:-Wall>
+    $<$<CXX_COMPILER_ID:Clang>:-Werror>
+    $<$<CXX_COMPILER_ID:Clang>:-Wextra>
+    $<$<CXX_COMPILER_ID:Clang>:-Wpedantic>
+    $<$<CXX_COMPILER_ID:Clang>:-pedantic-errors>
+
+    $<$<CXX_COMPILER_ID:MSVC>:/W4>
+    $<$<CXX_COMPILER_ID:MSVC>:/WX>
+    $<$<CXX_COMPILER_ID:MSVC>:/permissive->
+)
+
+target_include_directories(NovelRT-Input PRIVATE "$<TARGET_PROPERTY:Engine,INCLUDE_DIRECTORIES>")
+target_link_libraries(NovelRT-Input
+  PUBLIC
+    spdlog
+    glfw
+    tbb
+)
+
+install(
+  TARGETS NovelRT-Input
+  EXPORT NovelRTConfig
+  LIBRARY DESTINATION lib
+  FILE_SET public_headers DESTINATION include
+)