Add WindowUserPointer for glfw callbacks

Author: capnkenny

include/NovelRT/UI/DearImGui/GlfwVulkan/UI.DearImGui.GlfwVulkan.h

@@ -17,6 +17,7 @@ namespace NovelRT::UI::DearImGui::GlfwVulkan
 #include "../../../Graphics/Graphics.h"
 #include "../../../Graphics/Vulkan/Graphics.Vulkan.h"
 #include "../../../Windowing/Glfw/Windowing.Glfw.h"
+#include "../../../Input/Glfw/Input.Glfw.h"
 #include "../../../PluginManagement/PluginManagement.h"
 #include "../UI.DearImGui.h"
 #include <imgui_impl_glfw.h>

include/NovelRT/Windowing/Glfw/GlfwWindowingDevice.h

@@ -15,6 +15,7 @@ namespace NovelRT::Windowing::Glfw
     private:
         std::unique_ptr<GLFWwindow, decltype(&glfwDestroyWindow)> _window;
         std::string _currentTitle;
+        Windowing::WindowUserPointer _pointers;
 
     public:
         GlfwWindowingDevice() noexcept;
@@ -53,6 +54,11 @@ namespace NovelRT::Windowing::Glfw
             glfwSetWindowTitle(_window.get(), _currentTitle.c_str());
         }
 
+        [[nodiscard]] inline Windowing::WindowUserPointer GetUserPointerMap() const noexcept
+        {
+            return _pointers;
+        }
+
         void ProcessAllMessages() final;
         ~GlfwWindowingDevice() final;
     };

include/NovelRT/Windowing/WindowUserPointer.h

@@ -0,0 +1,23 @@
+// Copyright © Matt Jones and Contributors. Licensed under the MIT Licence (MIT). See LICENCE.md in the repository root
+// for more information.
+
+#ifndef NOVELRT_WINDOWING_WINDOWUSERPOINTER_H
+#define NOVELRT_WINDOWING_WINDOWUSERPOINTER_H
+
+namespace NovelRT::Windowing
+{
+    class WindowUserPointer
+    {
+    private:
+        std::map<std::string, void*> _userPointerMap;
+
+    public:
+        WindowUserPointer() noexcept;
+        void AppendUserPointer(std::string key, void* value);
+        void RemoveUserPointer(std::string key);
+        void* GetUserPointer(std::string key);
+
+    };
+}
+
+#endif // NOVELRT_WINDOWING_WINDOWUSERPOINTER_H

include/NovelRT/Windowing/Windowing.h

@@ -10,6 +10,7 @@
 namespace NovelRT::Windowing
 {
     class IWindowingDevice;
+    class WindowUserPointer;
 }
 
 // Windowing dependencies
@@ -19,5 +20,6 @@ namespace NovelRT::Windowing
 
 // Windowing types
 #include "IWindowingDevice.h"
+#include "WindowUserPointer.h"
 
 #endif // NOVELRT_WINDOWING_H

src/NovelRT/CMakeLists.txt

@@ -83,6 +83,8 @@ set(CORE_SOURCES
 
   Utilities/Misc.cpp
 
+  Windowing/WindowUserPointer.cpp
+
   Windowing/Glfw/GlfwWindowingDevice.cpp
   Windowing/Glfw/GlfwWindowingPluginProvider.cpp
 )

src/NovelRT/Input/Glfw/GlfwInputDevice.cpp

@@ -32,6 +32,9 @@ namespace NovelRT::Input::Glfw
         _mappedActions = std::vector<InputAction>();
         _window = reinterpret_cast<GLFWwindow*>(window);
 
+        auto pointerMap = reinterpret_cast<NovelRT::Windowing::WindowUserPointer*>(glfwGetWindowUserPointer(_window));
+        pointerMap->AppendUserPointer("input", this);
+
         // Map GLFW keys to NovelKeys
         _availableKeys.emplace("LeftMouseButton", NovelKey("LeftMouseButton", GLFW_MOUSE_BUTTON_LEFT));
         _availableKeys.emplace("RightMouseButton", NovelKey("RightMouseButton", GLFW_MOUSE_BUTTON_RIGHT));
@@ -167,6 +170,7 @@ namespace NovelRT::Input::Glfw
         int width = 0;
         int height = 0;
         glfwGetWindowSize(_window, &width, &height);
+
         _logger.logInfo("GLFW input system initialised: window at {} x {}", width, height);
     }
 

src/NovelRT/UI/DearImGui/GlfwVulkan/GlfwVulkanUIProvider.cpp

@@ -58,15 +58,26 @@ namespace NovelRT::UI::DearImGui::GlfwVulkan
             (NovelRT::Utilities::Misc::getExecutableDirPath() / "Resources" / "Fonts" / "Raleway-Regular.ttf").string();
         io.Fonts->AddFontFromFileTTF(defaultFont.c_str(), 36.0f);
         io.ConfigFlags |= ImGuiConfigFlags_NoMouse;
-
-        // if(_editorMode)
-        // {
-        //     _logger.logDebugLine("Enabling viewport / editor mode for UI support.");
-        //     io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
-        // }
+        GLFWwindow* glfwWindow = reinterpret_cast<GLFWwindow*>(windowingDevice->GetHandle());
 
         // GLFW Specific Init
-        ImGui_ImplGlfw_InitForVulkan(reinterpret_cast<GLFWwindow*>(windowingDevice->GetHandle()), true);
+        ImGui_ImplGlfw_InitForVulkan(glfwWindow, false);
+
+        //Setup callbacks
+        //Cursor Position Callback
+        glfwSetCursorPosCallback(glfwWindow, [](GLFWwindow* window, double x, double y)
+        {
+            if(glfwGetInputMode(window, GLFW_CURSOR) == GLFW_CURSOR_DISABLED)
+            {
+                return;
+            }
+
+            ImGuiIO& io = ImGui::GetIO();
+            io.AddMousePosEvent(static_cast<float>(x), static_cast<float>(y));
+        });
+
+        //Setup input
+        auto inputProvider = reinterpret_cast<NovelRT::Input::Glfw::GlfwInputDevice*>(reinterpret_cast<Windowing::WindowUserPointer*>(glfwWindow)->GetUserPointer("input"));
 
         // Vulkan Specific Init
         _initInfo.Instance = vulkanProvider->GetVulkanInstance();
@@ -144,7 +155,7 @@ namespace NovelRT::UI::DearImGui::GlfwVulkan
         {
             x->Render(this->shared_from_this(), _windowSize);
         }
-        
+
         for (auto&& button : _buttons)
         {
             button->Render(shared_from_this(), _windowSize);

src/NovelRT/Windowing/Glfw/GlfwWindowingDevice.cpp

@@ -5,7 +5,7 @@
 
 namespace NovelRT::Windowing::Glfw
 {
-    GlfwWindowingDevice::GlfwWindowingDevice() noexcept : _window(nullptr, nullptr)
+    GlfwWindowingDevice::GlfwWindowingDevice() noexcept : _window(nullptr, nullptr), _pointers()
     {
     }
 
@@ -54,10 +54,13 @@ namespace NovelRT::Windowing::Glfw
 #endif
 
         glfwSetWindowAttrib(window, GLFW_RESIZABLE, windowMode == NovelRT::Windowing::WindowMode::Windowed);
-        glfwSetWindowUserPointer(window, this);
+
+        _pointers.AppendUserPointer("windowing", this);
+        glfwSetWindowUserPointer(window, &_pointers);
 
         glfwSetWindowSizeCallback(window, [](auto window, auto width, auto height) {
-            auto thisDevice = reinterpret_cast<GlfwWindowingDevice*>(glfwGetWindowUserPointer(window));
+            auto pointerMap = reinterpret_cast<Windowing::WindowUserPointer*>(glfwGetWindowUserPointer(window));
+            auto thisDevice = reinterpret_cast<GlfwWindowingDevice*>(pointerMap->GetUserPointer("windowing"));
             auto countFfs = thisDevice->SizeChanged.getHandlerCount();
             unused(countFfs);
             thisDevice->SizeChanged(Maths::GeoVector2F(static_cast<float>(width), static_cast<float>(height)));

src/NovelRT/Windowing/WindowUserPointer.cpp

@@ -0,0 +1,34 @@
+// Copyright © Matt Jones and Contributors. Licensed under the MIT Licence (MIT). See LICENCE.md in the repository root
+// for more information.
+
+#include "NovelRT/Windowing/Windowing.h"
+
+namespace NovelRT::Windowing
+{
+    WindowUserPointer::WindowUserPointer() noexcept
+        : _userPointerMap(std::map<std::string, void*>())
+    {
+    }
+
+    void WindowUserPointer::AppendUserPointer(std::string key, void* value)
+    {
+        if(value == nullptr)
+        {
+
+        }
+
+        unused(value);
+        unused(key);
+    }
+
+    void WindowUserPointer::RemoveUserPointer(std::string key)
+    {
+        unused(key);
+    }
+
+    void* WindowUserPointer::GetUserPointer(std::string key)
+    {
+        unused(key);
+        return nullptr;
+    }
+}