fixed input devices

Author: JeanPhilippeKernel

Tetragrama/EditorWindow.cpp

@@ -4,6 +4,7 @@
 #include <ZEngine/Engine.h>
 #include <ZEngine/Event/EngineClosedEvent.h>
 #include <ZEngine/Logging/LoggerDefinition.h>
+#include <ZEngine/Windows/Inputs/IDevice.h>
 #include <ZEngine/Windows/Inputs/KeyCode.h>
 
 #ifdef _WIN32
@@ -154,6 +155,11 @@ namespace Tetragrama
 
         ZENGINE_CORE_INFO("Windows layers initialized")
 
+        // Initialize Devices (Keyboard, Mouse)
+        ZEngine::Windows::Inputs::IDevice::Initialize(arena);
+
+        ZENGINE_CORE_INFO("Device initialized")
+
         glfwSetWindowUserPointer(m_native_window, &m_property);
 
         glfwSetFramebufferSizeCallback(m_native_window, EditorWindow::__OnGlfwFrameBufferSizeChanged);

ZEngine/ZEngine/Windows/Inputs/IDevice.cpp

@@ -3,5 +3,6 @@
 
 namespace ZEngine::Windows::Inputs
 {
-    std::map<std::string, IDevice> IDevice::m_devices;
-}
+    std::map<const char*, ZRawPtr(IDevice)> IDevice::Devices = {};
+    Core::Memory::ArenaAllocator*           IDevice::Arena   = nullptr;
+} // namespace ZEngine::Windows::Inputs

ZEngine/ZEngine/Windows/Inputs/IDevice.h

@@ -1,33 +1,41 @@
 #pragma once
+#include <Core/Memory/Allocator.h>
 #include <CoreWindow.h>
 #include <KeyCode.h>
 #include <algorithm>
 #include <map>
-#include <memory>
-#include <string>
 #include <type_traits>
 
 namespace ZEngine::Windows::Inputs
 {
 
     struct IDevice
     {
+        IDevice(const char* name = "abstract_device") : m_name(name) {}
         virtual ~IDevice() = default;
+        const char*                                    m_name;
+        static Core::Memory::ArenaAllocator*           Arena;
+        static std::map<const char*, ZRawPtr(IDevice)> Devices;
+
+        static void                                    Initialize(Core::Memory::ArenaAllocator* arena)
+        {
+            Arena = arena;
+        }
 
         template <typename T, typename = std::enable_if_t<std::is_base_of_v<IDevice, T>>>
         static const T* As() noexcept
         {
             const std::type_info& type = typeid(T);
-            auto                  it   = m_devices.find(std::string(type.name()));
+            auto                  it   = Devices.find(type.name());
 
-            if (it != std::end(m_devices))
+            if (it != std::end(Devices))
             {
-                return reinterpret_cast<T*>(&it->second);
+                return reinterpret_cast<T*>(it->second);
             }
 
-            IDevice device = T();
-            auto    pair   = m_devices.emplace(std::make_pair(std::string(type.name()), device));
-            return reinterpret_cast<T*>(&(pair.first->second));
+            IDevice* device = ZPushStructCtor(Arena, T);
+            auto     pair   = Devices.emplace(std::make_pair(type.name(), device));
+            return reinterpret_cast<T*>(pair.first->second);
         }
 
         virtual bool IsKeyPressed(ZENGINE_KEYCODE key, Windows::CoreWindow* const window) const
@@ -40,14 +48,9 @@ namespace ZEngine::Windows::Inputs
             return false;
         }
 
-        virtual std::string_view GetName() const
+        virtual const char* GetName() const
         {
             return m_name;
         }
-
-    protected:
-        IDevice(std::string_view name = "abstract_device") : m_name(name) {}
-        static std::map<std::string, IDevice> m_devices;
-        std::string                           m_name;
     };
 } // namespace ZEngine::Windows::Inputs