From c235d9e54345e8072e7cfc0f1813c49a5a36cc38 Mon Sep 17 00:00:00 2001 From: RickaPrincy Date: Mon, 18 May 2026 16:32:51 +0300 Subject: [PATCH 1/3] wip: migrate imgui + nfd to vcpkg --- .gitmodules | 6 - CMakeLists.txt | 3 +- external/imgui | 1 - external/nfd-extended | 1 - sources/lib/CMakeLists.txt | 24 +- .../core/imgui/backends/imgui_impl_sdl2.cpp | 934 ++++++++++++++++++ .../lib/core/imgui/backends/imgui_impl_sdl2.h | 57 ++ sources/lib/core/imgui/imgui_wrapper.cpp | 5 +- vcpkg.json | 19 +- 9 files changed, 1017 insertions(+), 33 deletions(-) delete mode 160000 external/imgui delete mode 160000 external/nfd-extended create mode 100644 sources/lib/core/imgui/backends/imgui_impl_sdl2.cpp create mode 100644 sources/lib/core/imgui/backends/imgui_impl_sdl2.h diff --git a/.gitmodules b/.gitmodules index 0833848..81dbdff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ [submodule "external/msdf-atlas-gen"] path = external/msdf-atlas-gen url = https://github.com/Chlumsky/msdf-atlas-gen.git -[submodule "external/imgui"] - path = external/imgui - url = https://github.com/ocornut/imgui.git -[submodule "external/nfd-extended"] - path = external/nfd-extended - url = https://github.com/btzy/nativefiledialog-extended.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c2ae66e..76eb56e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # SDL2 +find_package(imgui CONFIG REQUIRED) +find_package(nfd CONFIG REQUIRED) find_package(glm CONFIG REQUIRED) find_package(SDL2 CONFIG REQUIRED) find_package(SDL2_image CONFIG REQUIRED) @@ -67,7 +69,6 @@ if (SDLK_IS_MAIN_PROJECT) @ONLY) endif () -add_subdirectory(external/nfd-extended) add_subdirectory(external/msdf-atlas-gen) add_subdirectory(sources) add_subdirectory(examples) diff --git a/external/imgui b/external/imgui deleted file mode 160000 index 5166bec..0000000 --- a/external/imgui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5166bec5d8293021d7396ab1d623aabe329b0d0a diff --git a/external/nfd-extended b/external/nfd-extended deleted file mode 160000 index fc168e8..0000000 --- a/external/nfd-extended +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fc168e8605bfa51aaec22ab0c4e46b9de665a437 diff --git a/sources/lib/CMakeLists.txt b/sources/lib/CMakeLists.txt index 7f8d55b..aaddf05 100644 --- a/sources/lib/CMakeLists.txt +++ b/sources/lib/CMakeLists.txt @@ -1,12 +1,7 @@ -set(IMGUI_DIR ${SDLK_SOURCE_DIR}/external/imgui) +set(IMGUI_DIR ${SDLK_SOURCE_DIR}/sources/lib/core/imgui) set(IMGUI_SOURCES - ${IMGUI_DIR}/imgui.cpp - ${IMGUI_DIR}/imgui_draw.cpp - ${IMGUI_DIR}/imgui_tables.cpp - ${IMGUI_DIR}/imgui_widgets.cpp - # backends (SDL2 + OPENGL3) - ${IMGUI_DIR}/backends/imgui_impl_sdl2.cpp - ${IMGUI_DIR}/backends/imgui_impl_opengl3.cpp + # backends (SDL2 + OPENGL3) + ${IMGUI_DIR}/backends/imgui_impl_sdl2.cpp ) set(EXTRA_SOURCES extra/nfd_wrapper.cpp) @@ -66,17 +61,14 @@ target_link_libraries(${SDLK_LIB_NAME} $,SDL2::SDL2,SDL2::SDL2-static> ) -target_link_libraries(${SDLK_LIB_NAME} PUBLIC glm::glm-header-only) - -target_link_libraries(${SDLK_LIB_NAME} PUBLIC $,SDL2_image::SDL2_image,SDL2_image::SDL2_image-static>) - +target_link_libraries(${SDLK_LIB_NAME} PRIVATE nfd::nfd) target_link_libraries(${SDLK_LIB_NAME} PRIVATE Freetype::Freetype) +target_link_libraries(${SDLK_LIB_NAME} PUBLIC imgui::imgui) +target_link_libraries(${SDLK_LIB_NAME} PUBLIC glm::glm-header-only) +target_link_libraries(${SDLK_LIB_NAME} PUBLIC nlohmann_json::nlohmann_json) target_link_libraries(${SDLK_LIB_NAME} PUBLIC msdf-atlas-gen::msdf-atlas-gen) - -target_link_libraries(${SDLK_LIB_NAME} PRIVATE nfd) - -target_link_libraries(${SDLK_LIB_NAME} PRIVATE nlohmann_json::nlohmann_json) +target_link_libraries(${SDLK_LIB_NAME} PUBLIC $,SDL2_image::SDL2_image,SDL2_image::SDL2_image-static>) # set properties set_target_properties( diff --git a/sources/lib/core/imgui/backends/imgui_impl_sdl2.cpp b/sources/lib/core/imgui/backends/imgui_impl_sdl2.cpp new file mode 100644 index 0000000..3809f47 --- /dev/null +++ b/sources/lib/core/imgui/backends/imgui_impl_sdl2.cpp @@ -0,0 +1,934 @@ +// dear imgui: Platform Backend for SDL2 +// This needs to be used along with a Renderer (e.g. DirectX11, OpenGL3, Vulkan..) +// (Info: SDL2 is a cross-platform general purpose library for handling windows, inputs, graphics context creation, etc.) +// (Prefer SDL 2.0.5+ for full feature support.) + +// Implemented features: +// [X] Platform: Clipboard support. +// [X] Platform: Mouse support. Can discriminate Mouse/TouchScreen. +// [X] Platform: Keyboard support. Since 1.87 we are using the io.AddKeyEvent() function. Pass ImGuiKey values to all key functions e.g. ImGui::IsKeyPressed(ImGuiKey_Space). [Legacy SDL_SCANCODE_* values are obsolete since 1.87 and not supported since 1.91.5] +// [X] Platform: Gamepad support. +// [X] Platform: Mouse cursor shape and visibility (ImGuiBackendFlags_HasMouseCursors). Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'. +// [X] Platform: Basic IME support. App needs to call 'SDL_SetHint(SDL_HINT_IME_SHOW_UI, "1");' before SDL_CreateWindow()!. + +// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. +// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need. +// Learn about Dear ImGui: +// - FAQ https://dearimgui.com/faq +// - Getting Started https://dearimgui.com/getting-started +// - Documentation https://dearimgui.com/docs (same as your local docs/ folder). +// - Introduction, links and more at the top of imgui.cpp + +// CHANGELOG +// (minor and older changes stripped away, please see git history for details) +// 2026-04-16: Made ImGui_ImplSDL2_GetContentScaleForWindow(), ImGui_ImplSDL2_GetContentScaleForDisplay() helpers return a minimum of 1.0f, as some Linux setup seems to report <1.0f value and this breaks scaling border size. (#9369) +// 2026-02-13: Inputs: systems other than X11 are back to starting mouse capture on mouse down (reverts 2025-02-26 change). Only X11 requires waiting for a drag by default (not ideal, but a better default for X11 users). Added ImGui_ImplSDL2_SetMouseCaptureMode() for X11 debugger users. (#3650, #6410, #9235) +// 2026-01-15: Changed GetClipboardText() handler to return nullptr on error aka clipboard contents is not text. Consistent with other backends. (#9168) +// 2025-09-24: Skip using the SDL_GetGlobalMouseState() state when one of our window is hovered, as the SDL_MOUSEMOTION data is reliable. Fix macOS notch mouse coordinates issue in fullscreen mode + better perf on X11. (#7919, #7786) +// 2025-09-18: Call platform_io.ClearPlatformHandlers() on shutdown. +// 2025-09-15: Content Scales are always reported as 1.0 on Wayland. (#8921) +// 2025-07-08: Made ImGui_ImplSDL2_GetContentScaleForWindow(), ImGui_ImplSDL2_GetContentScaleForDisplay() helpers return 1.0f on Emscripten and Android platforms, matching macOS logic. (#8742, #8733) +// 2025-06-11: Added ImGui_ImplSDL2_GetContentScaleForWindow(SDL_Window* window) and ImGui_ImplSDL2_GetContentScaleForDisplay(int display_index) helper to facilitate making DPI-aware apps. +// 2025-04-09: Don't attempt to call SDL_CaptureMouse() on drivers where we don't call SDL_GetGlobalMouseState(). (#8561) +// 2025-03-21: Fill gamepad inputs and set ImGuiBackendFlags_HasGamepad regardless of ImGuiConfigFlags_NavEnableGamepad being set. +// 2025-03-10: When dealing with OEM keys, use scancodes instead of translated keycodes to choose ImGuiKey values. (#7136, #7201, #7206, #7306, #7670, #7672, #8468) +// 2025-02-26: Only start SDL_CaptureMouse() when mouse is being dragged, to mitigate issues with e.g. Linux debuggers not claiming capture back. (#6410, #3650) +// 2025-02-24: Avoid calling SDL_GetGlobalMouseState() when mouse is in relative mode. +// 2025-02-18: Added ImGuiMouseCursor_Wait and ImGuiMouseCursor_Progress mouse cursor support. +// 2025-02-10: Using SDL_OpenURL() in platform_io.Platform_OpenInShellFn handler. +// 2025-01-20: Made ImGui_ImplSDL2_SetGamepadMode(ImGui_ImplSDL2_GamepadMode_Manual) accept an empty array. +// 2024-10-24: Emscripten: from SDL 2.30.9, SDL_EVENT_MOUSE_WHEEL event doesn't require dividing by 100.0f. +// 2024-09-09: use SDL_Vulkan_GetDrawableSize() when available. (#7967, #3190) +// 2024-08-22: moved some OS/backend related function pointers from ImGuiIO to ImGuiPlatformIO: +// - io.GetClipboardTextFn -> platform_io.Platform_GetClipboardTextFn +// - io.SetClipboardTextFn -> platform_io.Platform_SetClipboardTextFn +// - io.PlatformOpenInShellFn -> platform_io.Platform_OpenInShellFn +// - io.PlatformSetImeDataFn -> platform_io.Platform_SetImeDataFn +// 2024-08-19: Storing SDL's Uint32 WindowID inside ImGuiViewport::PlatformHandle instead of SDL_Window*. +// 2024-08-19: ImGui_ImplSDL2_ProcessEvent() now ignores events intended for other SDL windows. (#7853) +// 2024-07-02: Emscripten: Added io.PlatformOpenInShellFn() handler for Emscripten versions. +// 2024-07-02: Update for io.SetPlatformImeDataFn() -> io.PlatformSetImeDataFn() renaming in main library. +// 2024-02-14: Inputs: Handle gamepad disconnection. Added ImGui_ImplSDL2_SetGamepadMode(). +// 2023-10-05: Inputs: Added support for extra ImGuiKey values: F13 to F24 function keys, app back/forward keys. +// 2023-04-06: Inputs: Avoid calling SDL_StartTextInput()/SDL_StopTextInput() as they don't only pertain to IME. It's unclear exactly what their relation is to IME. (#6306) +// 2023-04-04: Inputs: Added support for io.AddMouseSourceEvent() to discriminate ImGuiMouseSource_Mouse/ImGuiMouseSource_TouchScreen. (#2702) +// 2023-02-23: Accept SDL_GetPerformanceCounter() not returning a monotonically increasing value. (#6189, #6114, #3644) +// 2023-02-07: Implement IME handler (io.SetPlatformImeDataFn will call SDL_SetTextInputRect()/SDL_StartTextInput()). +// 2023-02-07: *BREAKING CHANGE* Renamed this backend file from imgui_impl_sdl.cpp/.h to imgui_impl_sdl2.cpp/.h in prevision for the future release of SDL3. +// 2023-02-02: Avoid calling SDL_SetCursor() when cursor has not changed, as the function is surprisingly costly on Mac with latest SDL (may be fixed in next SDL version). +// 2023-02-02: Added support for SDL 2.0.18+ preciseX/preciseY mouse wheel data for smooth scrolling + Scaling X value on Emscripten (bug?). (#4019, #6096) +// 2023-02-02: Removed SDL_MOUSEWHEEL value clamping, as values seem correct in latest Emscripten. (#4019) +// 2023-02-01: Flipping SDL_MOUSEWHEEL 'wheel.x' value to match other backends and offer consistent horizontal scrolling direction. (#4019, #6096, #1463) +// 2022-10-11: Using 'nullptr' instead of 'NULL' as per our switch to C++11. +// 2022-09-26: Inputs: Disable SDL 2.0.22 new "auto capture" (SDL_HINT_MOUSE_AUTO_CAPTURE) which prevents drag and drop across windows for multi-viewport support + don't capture when drag and dropping. (#5710) +// 2022-09-26: Inputs: Renamed ImGuiKey_ModXXX introduced in 1.87 to ImGuiMod_XXX (old names still supported). +// 2022-03-22: Inputs: Fix mouse position issues when dragging outside of boundaries. SDL_CaptureMouse() erroneously still gives out LEAVE events when hovering OS decorations. +// 2022-03-22: Inputs: Added support for extra mouse buttons (SDL_BUTTON_X1/SDL_BUTTON_X2). +// 2022-02-04: Added SDL_Renderer* parameter to ImGui_ImplSDL2_InitForSDLRenderer(), so we can use SDL_GetRendererOutputSize() instead of SDL_GL_GetDrawableSize() when bound to a SDL_Renderer. +// 2022-01-26: Inputs: replaced short-lived io.AddKeyModsEvent() (added two weeks ago) with io.AddKeyEvent() using ImGuiKey_ModXXX flags. Sorry for the confusion. +// 2021-01-20: Inputs: calling new io.AddKeyAnalogEvent() for gamepad support, instead of writing directly to io.NavInputs[]. +// 2022-01-17: Inputs: calling new io.AddMousePosEvent(), io.AddMouseButtonEvent(), io.AddMouseWheelEvent() API (1.87+). +// 2022-01-17: Inputs: always update key mods next and before key event (not in NewFrame) to fix input queue with very low framerates. +// 2022-01-12: Update mouse inputs using SDL_MOUSEMOTION/SDL_WINDOWEVENT_LEAVE + fallback to provide it when focused but not hovered/captured. More standard and will allow us to pass it to future input queue API. +// 2022-01-12: Maintain our own copy of MouseButtonsDown mask instead of using ImGui::IsAnyMouseDown() which will be obsoleted. +// 2022-01-10: Inputs: calling new io.AddKeyEvent(), io.AddKeyModsEvent() + io.SetKeyEventNativeData() API (1.87+). Support for full ImGuiKey range. +// 2021-08-17: Calling io.AddFocusEvent() on SDL_WINDOWEVENT_FOCUS_GAINED/SDL_WINDOWEVENT_FOCUS_LOST. +// 2021-07-29: Inputs: MousePos is correctly reported when the host platform window is hovered but not focused (using SDL_GetMouseFocus() + SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, requires SDL 2.0.5+) +// 2021-06-29: *BREAKING CHANGE* Removed 'SDL_Window* window' parameter to ImGui_ImplSDL2_NewFrame() which was unnecessary. +// 2021-06-29: Reorganized backend to pull data from a single structure to facilitate usage with multiple-contexts (all g_XXXX access changed to bd->XXXX). +// 2021-03-22: Rework global mouse pos availability check listing supported platforms explicitly, effectively fixing mouse access on Raspberry Pi. (#2837, #3950) +// 2020-05-25: Misc: Report a zero display-size when window is minimized, to be consistent with other backends. +// 2020-02-20: Inputs: Fixed mapping for ImGuiKey_KeyPadEnter (using SDL_SCANCODE_KP_ENTER instead of SDL_SCANCODE_RETURN2). +// 2019-12-17: Inputs: On Wayland, use SDL_GetMouseState (because there is no global mouse state). +// 2019-12-05: Inputs: Added support for ImGuiMouseCursor_NotAllowed mouse cursor. +// 2019-07-21: Inputs: Added mapping for ImGuiKey_KeyPadEnter. +// 2019-04-23: Inputs: Added support for SDL_GameController (if ImGuiConfigFlags_NavEnableGamepad is set by user application). +// 2019-03-12: Misc: Preserve DisplayFramebufferScale when main window is minimized. +// 2018-12-21: Inputs: Workaround for Android/iOS which don't seem to handle focus related calls. +// 2018-11-30: Misc: Setting up io.BackendPlatformName so it can be displayed in the About Window. +// 2018-11-14: Changed the signature of ImGui_ImplSDL2_ProcessEvent() to take a 'const SDL_Event*'. +// 2018-08-01: Inputs: Workaround for Emscripten which doesn't seem to handle focus related calls. +// 2018-06-29: Inputs: Added support for the ImGuiMouseCursor_Hand cursor. +// 2018-06-08: Misc: Extracted imgui_impl_sdl.cpp/.h away from the old combined SDL2+OpenGL/Vulkan examples. +// 2018-06-08: Misc: ImGui_ImplSDL2_InitForOpenGL() now takes a SDL_GLContext parameter. +// 2018-05-09: Misc: Fixed clipboard paste memory leak (we didn't call SDL_FreeMemory on the data returned by SDL_GetClipboardText). +// 2018-03-20: Misc: Setup io.BackendFlags ImGuiBackendFlags_HasMouseCursors flag + honor ImGuiConfigFlags_NoMouseCursorChange flag. +// 2018-02-16: Inputs: Added support for mouse cursors, honoring ImGui::GetMouseCursor() value. +// 2018-02-06: Misc: Removed call to ImGui::Shutdown() which is not available from 1.60 WIP, user needs to call CreateContext/DestroyContext themselves. +// 2018-02-06: Inputs: Added mapping for ImGuiKey_Space. +// 2018-02-05: Misc: Using SDL_GetPerformanceCounter() instead of SDL_GetTicks() to be able to handle very high framerate (1000+ FPS). +// 2018-02-05: Inputs: Keyboard mapping is using scancodes everywhere instead of a confusing mixture of keycodes and scancodes. +// 2018-01-20: Inputs: Added Horizontal Mouse Wheel support. +// 2018-01-19: Inputs: When available (SDL 2.0.4+) using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. Otherwise (SDL 2.0.3 and before) testing for SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS. +// 2018-01-18: Inputs: Added mapping for ImGuiKey_Insert. +// 2017-08-25: Inputs: MousePos set to -FLT_MAX,-FLT_MAX when mouse is unavailable/missing (instead of -1,-1). +// 2016-10-15: Misc: Added a void* user_data parameter to Clipboard function handlers. + +#include "imgui.h" +#ifndef IMGUI_DISABLE +#include "imgui_impl_sdl2.h" + +// Clang warnings with -Weverything +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast +#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision +#endif + +// SDL +#include +#include +#include // for snprintf() +#ifdef __APPLE__ +#include +#endif +#ifdef __EMSCRIPTEN__ +#include +#endif +#undef Status // X11 headers are leaking this. + +#if SDL_VERSION_ATLEAST(2,0,4) && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) && !(defined(__APPLE__) && TARGET_OS_IOS) && !defined(__amigaos4__) +#define SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE 1 +#else +#define SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE 0 +#endif +#define SDL_HAS_PER_MONITOR_DPI SDL_VERSION_ATLEAST(2,0,4) +#define SDL_HAS_VULKAN SDL_VERSION_ATLEAST(2,0,6) +#define SDL_HAS_OPEN_URL SDL_VERSION_ATLEAST(2,0,14) +#if SDL_HAS_VULKAN +#include +#endif + +// SDL Data +struct ImGui_ImplSDL2_Data +{ + SDL_Window* Window; + Uint32 WindowID; // Stored in ImGuiViewport::PlatformHandle. Use SDL_GetWindowFromID() to get SDL_Window* from Uint32 WindowID. + SDL_Renderer* Renderer; + Uint64 Time; + char* ClipboardTextData; + char BackendPlatformName[48]; + + // Mouse handling + Uint32 MouseWindowID; + int MouseButtonsDown; + SDL_Cursor* MouseCursors[ImGuiMouseCursor_COUNT]; + SDL_Cursor* MouseLastCursor; + int MouseLastLeaveFrame; + bool MouseCanUseGlobalState; + ImGui_ImplSDL2_MouseCaptureMode MouseCaptureMode; + + // Gamepad handling + ImVector Gamepads; + ImGui_ImplSDL2_GamepadMode GamepadMode; + bool WantUpdateGamepadsList; + + ImGui_ImplSDL2_Data() { memset((void*)this, 0, sizeof(*this)); } +}; + +// Backend data stored in io.BackendPlatformUserData to allow support for multiple Dear ImGui contexts +// It is STRONGLY preferred that you use docking branch with multi-viewports (== single Dear ImGui context + multiple windows) instead of multiple Dear ImGui contexts. +// FIXME: multi-context support is not well tested and probably dysfunctional in this backend. +// FIXME: some shared resources (mouse cursor shape, gamepad) are mishandled when using multi-context. +static ImGui_ImplSDL2_Data* ImGui_ImplSDL2_GetBackendData() +{ + return ImGui::GetCurrentContext() ? (ImGui_ImplSDL2_Data*)ImGui::GetIO().BackendPlatformUserData : nullptr; +} + +// Functions +static const char* ImGui_ImplSDL2_GetClipboardText(ImGuiContext*) +{ + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + if (bd->ClipboardTextData) + SDL_free(bd->ClipboardTextData); + if (SDL_HasClipboardText()) + bd->ClipboardTextData = SDL_GetClipboardText(); + else + bd->ClipboardTextData = nullptr; + return bd->ClipboardTextData; +} + +static void ImGui_ImplSDL2_SetClipboardText(ImGuiContext*, const char* text) +{ + SDL_SetClipboardText(text); +} + +// Note: native IME will only display if user calls SDL_SetHint(SDL_HINT_IME_SHOW_UI, "1") _before_ SDL_CreateWindow(). +static void ImGui_ImplSDL2_PlatformSetImeData(ImGuiContext*, ImGuiViewport*, ImGuiPlatformImeData* data) +{ + if (data->WantVisible) + { + SDL_Rect r; + r.x = (int)data->InputPos.x; + r.y = (int)data->InputPos.y; + r.w = 1; + r.h = (int)data->InputLineHeight; + SDL_SetTextInputRect(&r); + } +} + +// Not static to allow third-party code to use that if they want to (but undocumented) +ImGuiKey ImGui_ImplSDL2_KeyEventToImGuiKey(SDL_Keycode keycode, SDL_Scancode scancode); +ImGuiKey ImGui_ImplSDL2_KeyEventToImGuiKey(SDL_Keycode keycode, SDL_Scancode scancode) +{ + switch (keycode) + { + case SDLK_TAB: return ImGuiKey_Tab; + case SDLK_LEFT: return ImGuiKey_LeftArrow; + case SDLK_RIGHT: return ImGuiKey_RightArrow; + case SDLK_UP: return ImGuiKey_UpArrow; + case SDLK_DOWN: return ImGuiKey_DownArrow; + case SDLK_PAGEUP: return ImGuiKey_PageUp; + case SDLK_PAGEDOWN: return ImGuiKey_PageDown; + case SDLK_HOME: return ImGuiKey_Home; + case SDLK_END: return ImGuiKey_End; + case SDLK_INSERT: return ImGuiKey_Insert; + case SDLK_DELETE: return ImGuiKey_Delete; + case SDLK_BACKSPACE: return ImGuiKey_Backspace; + case SDLK_SPACE: return ImGuiKey_Space; + case SDLK_RETURN: return ImGuiKey_Enter; + case SDLK_ESCAPE: return ImGuiKey_Escape; + //case SDLK_QUOTE: return ImGuiKey_Apostrophe; + case SDLK_COMMA: return ImGuiKey_Comma; + //case SDLK_MINUS: return ImGuiKey_Minus; + case SDLK_PERIOD: return ImGuiKey_Period; + //case SDLK_SLASH: return ImGuiKey_Slash; + case SDLK_SEMICOLON: return ImGuiKey_Semicolon; + //case SDLK_EQUALS: return ImGuiKey_Equal; + //case SDLK_LEFTBRACKET: return ImGuiKey_LeftBracket; + //case SDLK_BACKSLASH: return ImGuiKey_Backslash; + //case SDLK_RIGHTBRACKET: return ImGuiKey_RightBracket; + //case SDLK_BACKQUOTE: return ImGuiKey_GraveAccent; + case SDLK_CAPSLOCK: return ImGuiKey_CapsLock; + case SDLK_SCROLLLOCK: return ImGuiKey_ScrollLock; + case SDLK_NUMLOCKCLEAR: return ImGuiKey_NumLock; + case SDLK_PRINTSCREEN: return ImGuiKey_PrintScreen; + case SDLK_PAUSE: return ImGuiKey_Pause; + case SDLK_KP_0: return ImGuiKey_Keypad0; + case SDLK_KP_1: return ImGuiKey_Keypad1; + case SDLK_KP_2: return ImGuiKey_Keypad2; + case SDLK_KP_3: return ImGuiKey_Keypad3; + case SDLK_KP_4: return ImGuiKey_Keypad4; + case SDLK_KP_5: return ImGuiKey_Keypad5; + case SDLK_KP_6: return ImGuiKey_Keypad6; + case SDLK_KP_7: return ImGuiKey_Keypad7; + case SDLK_KP_8: return ImGuiKey_Keypad8; + case SDLK_KP_9: return ImGuiKey_Keypad9; + case SDLK_KP_PERIOD: return ImGuiKey_KeypadDecimal; + case SDLK_KP_DIVIDE: return ImGuiKey_KeypadDivide; + case SDLK_KP_MULTIPLY: return ImGuiKey_KeypadMultiply; + case SDLK_KP_MINUS: return ImGuiKey_KeypadSubtract; + case SDLK_KP_PLUS: return ImGuiKey_KeypadAdd; + case SDLK_KP_ENTER: return ImGuiKey_KeypadEnter; + case SDLK_KP_EQUALS: return ImGuiKey_KeypadEqual; + case SDLK_LCTRL: return ImGuiKey_LeftCtrl; + case SDLK_LSHIFT: return ImGuiKey_LeftShift; + case SDLK_LALT: return ImGuiKey_LeftAlt; + case SDLK_LGUI: return ImGuiKey_LeftSuper; + case SDLK_RCTRL: return ImGuiKey_RightCtrl; + case SDLK_RSHIFT: return ImGuiKey_RightShift; + case SDLK_RALT: return ImGuiKey_RightAlt; + case SDLK_RGUI: return ImGuiKey_RightSuper; + case SDLK_APPLICATION: return ImGuiKey_Menu; + case SDLK_0: return ImGuiKey_0; + case SDLK_1: return ImGuiKey_1; + case SDLK_2: return ImGuiKey_2; + case SDLK_3: return ImGuiKey_3; + case SDLK_4: return ImGuiKey_4; + case SDLK_5: return ImGuiKey_5; + case SDLK_6: return ImGuiKey_6; + case SDLK_7: return ImGuiKey_7; + case SDLK_8: return ImGuiKey_8; + case SDLK_9: return ImGuiKey_9; + case SDLK_a: return ImGuiKey_A; + case SDLK_b: return ImGuiKey_B; + case SDLK_c: return ImGuiKey_C; + case SDLK_d: return ImGuiKey_D; + case SDLK_e: return ImGuiKey_E; + case SDLK_f: return ImGuiKey_F; + case SDLK_g: return ImGuiKey_G; + case SDLK_h: return ImGuiKey_H; + case SDLK_i: return ImGuiKey_I; + case SDLK_j: return ImGuiKey_J; + case SDLK_k: return ImGuiKey_K; + case SDLK_l: return ImGuiKey_L; + case SDLK_m: return ImGuiKey_M; + case SDLK_n: return ImGuiKey_N; + case SDLK_o: return ImGuiKey_O; + case SDLK_p: return ImGuiKey_P; + case SDLK_q: return ImGuiKey_Q; + case SDLK_r: return ImGuiKey_R; + case SDLK_s: return ImGuiKey_S; + case SDLK_t: return ImGuiKey_T; + case SDLK_u: return ImGuiKey_U; + case SDLK_v: return ImGuiKey_V; + case SDLK_w: return ImGuiKey_W; + case SDLK_x: return ImGuiKey_X; + case SDLK_y: return ImGuiKey_Y; + case SDLK_z: return ImGuiKey_Z; + case SDLK_F1: return ImGuiKey_F1; + case SDLK_F2: return ImGuiKey_F2; + case SDLK_F3: return ImGuiKey_F3; + case SDLK_F4: return ImGuiKey_F4; + case SDLK_F5: return ImGuiKey_F5; + case SDLK_F6: return ImGuiKey_F6; + case SDLK_F7: return ImGuiKey_F7; + case SDLK_F8: return ImGuiKey_F8; + case SDLK_F9: return ImGuiKey_F9; + case SDLK_F10: return ImGuiKey_F10; + case SDLK_F11: return ImGuiKey_F11; + case SDLK_F12: return ImGuiKey_F12; + case SDLK_F13: return ImGuiKey_F13; + case SDLK_F14: return ImGuiKey_F14; + case SDLK_F15: return ImGuiKey_F15; + case SDLK_F16: return ImGuiKey_F16; + case SDLK_F17: return ImGuiKey_F17; + case SDLK_F18: return ImGuiKey_F18; + case SDLK_F19: return ImGuiKey_F19; + case SDLK_F20: return ImGuiKey_F20; + case SDLK_F21: return ImGuiKey_F21; + case SDLK_F22: return ImGuiKey_F22; + case SDLK_F23: return ImGuiKey_F23; + case SDLK_F24: return ImGuiKey_F24; + case SDLK_AC_BACK: return ImGuiKey_AppBack; + case SDLK_AC_FORWARD: return ImGuiKey_AppForward; + default: break; + } + + // Fallback to scancode + switch (scancode) + { + case SDL_SCANCODE_GRAVE: return ImGuiKey_GraveAccent; + case SDL_SCANCODE_MINUS: return ImGuiKey_Minus; + case SDL_SCANCODE_EQUALS: return ImGuiKey_Equal; + case SDL_SCANCODE_LEFTBRACKET: return ImGuiKey_LeftBracket; + case SDL_SCANCODE_RIGHTBRACKET: return ImGuiKey_RightBracket; + case SDL_SCANCODE_NONUSBACKSLASH: return ImGuiKey_Oem102; + case SDL_SCANCODE_BACKSLASH: return ImGuiKey_Backslash; + case SDL_SCANCODE_SEMICOLON: return ImGuiKey_Semicolon; + case SDL_SCANCODE_APOSTROPHE: return ImGuiKey_Apostrophe; + case SDL_SCANCODE_COMMA: return ImGuiKey_Comma; + case SDL_SCANCODE_PERIOD: return ImGuiKey_Period; + case SDL_SCANCODE_SLASH: return ImGuiKey_Slash; + default: break; + } + return ImGuiKey_None; +} + +static void ImGui_ImplSDL2_UpdateKeyModifiers(SDL_Keymod sdl_key_mods) +{ + ImGuiIO& io = ImGui::GetIO(); + io.AddKeyEvent(ImGuiMod_Ctrl, (sdl_key_mods & KMOD_CTRL) != 0); + io.AddKeyEvent(ImGuiMod_Shift, (sdl_key_mods & KMOD_SHIFT) != 0); + io.AddKeyEvent(ImGuiMod_Alt, (sdl_key_mods & KMOD_ALT) != 0); + io.AddKeyEvent(ImGuiMod_Super, (sdl_key_mods & KMOD_GUI) != 0); +} + +static ImGuiViewport* ImGui_ImplSDL2_GetViewportForWindowID(Uint32 window_id) +{ + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + return (window_id == bd->WindowID) ? ImGui::GetMainViewport() : nullptr; +} + +// You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs. +// - When io.WantCaptureMouse is true, do not dispatch mouse input data to your main application, or clear/overwrite your copy of the mouse data. +// - When io.WantCaptureKeyboard is true, do not dispatch keyboard input data to your main application, or clear/overwrite your copy of the keyboard data. +// Generally you may always pass all inputs to dear imgui, and hide them from your application based on those two flags. +bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event) +{ + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplSDL2_Init()?"); + ImGuiIO& io = ImGui::GetIO(); + + switch (event->type) + { + case SDL_MOUSEMOTION: + { + if (ImGui_ImplSDL2_GetViewportForWindowID(event->motion.windowID) == nullptr) + return false; + ImVec2 mouse_pos((float)event->motion.x, (float)event->motion.y); + io.AddMouseSourceEvent(event->motion.which == SDL_TOUCH_MOUSEID ? ImGuiMouseSource_TouchScreen : ImGuiMouseSource_Mouse); + io.AddMousePosEvent(mouse_pos.x, mouse_pos.y); + return true; + } + case SDL_MOUSEWHEEL: + { + if (ImGui_ImplSDL2_GetViewportForWindowID(event->wheel.windowID) == nullptr) + return false; + //IMGUI_DEBUG_LOG("wheel %.2f %.2f, precise %.2f %.2f\n", (float)event->wheel.x, (float)event->wheel.y, event->wheel.preciseX, event->wheel.preciseY); +#if SDL_VERSION_ATLEAST(2,0,18) // If this fails to compile on Emscripten: update to latest Emscripten! + float wheel_x = -event->wheel.preciseX; + float wheel_y = event->wheel.preciseY; +#else + float wheel_x = -(float)event->wheel.x; + float wheel_y = (float)event->wheel.y; +#endif +#if defined(__EMSCRIPTEN__) && !SDL_VERSION_ATLEAST(2,31,0) + wheel_x /= 100.0f; +#endif + io.AddMouseSourceEvent(event->wheel.which == SDL_TOUCH_MOUSEID ? ImGuiMouseSource_TouchScreen : ImGuiMouseSource_Mouse); + io.AddMouseWheelEvent(wheel_x, wheel_y); + return true; + } + case SDL_MOUSEBUTTONDOWN: + case SDL_MOUSEBUTTONUP: + { + if (ImGui_ImplSDL2_GetViewportForWindowID(event->button.windowID) == nullptr) + return false; + int mouse_button = -1; + if (event->button.button == SDL_BUTTON_LEFT) { mouse_button = 0; } + if (event->button.button == SDL_BUTTON_RIGHT) { mouse_button = 1; } + if (event->button.button == SDL_BUTTON_MIDDLE) { mouse_button = 2; } + if (event->button.button == SDL_BUTTON_X1) { mouse_button = 3; } + if (event->button.button == SDL_BUTTON_X2) { mouse_button = 4; } + if (mouse_button == -1) + break; + io.AddMouseSourceEvent(event->button.which == SDL_TOUCH_MOUSEID ? ImGuiMouseSource_TouchScreen : ImGuiMouseSource_Mouse); + io.AddMouseButtonEvent(mouse_button, (event->type == SDL_MOUSEBUTTONDOWN)); + bd->MouseButtonsDown = (event->type == SDL_MOUSEBUTTONDOWN) ? (bd->MouseButtonsDown | (1 << mouse_button)) : (bd->MouseButtonsDown & ~(1 << mouse_button)); + return true; + } + case SDL_TEXTINPUT: + { + if (ImGui_ImplSDL2_GetViewportForWindowID(event->text.windowID) == nullptr) + return false; + io.AddInputCharactersUTF8(event->text.text); + return true; + } + case SDL_KEYDOWN: + case SDL_KEYUP: + { + if (ImGui_ImplSDL2_GetViewportForWindowID(event->key.windowID) == nullptr) + return false; + ImGui_ImplSDL2_UpdateKeyModifiers((SDL_Keymod)event->key.keysym.mod); + //IMGUI_DEBUG_LOG("SDL_KEY_%s : key=%d ('%s'), scancode=%d ('%s'), mod=%X\n", + // (event->type == SDL_KEYDOWN) ? "DOWN" : "UP ", event->key.keysym.sym, SDL_GetKeyName(event->key.keysym.sym), event->key.keysym.scancode, SDL_GetScancodeName(event->key.keysym.scancode), event->key.keysym.mod); + ImGuiKey key = ImGui_ImplSDL2_KeyEventToImGuiKey(event->key.keysym.sym, event->key.keysym.scancode); + io.AddKeyEvent(key, (event->type == SDL_KEYDOWN)); + io.SetKeyEventNativeData(key, (int)event->key.keysym.sym, (int)event->key.keysym.scancode, (int)event->key.keysym.scancode); // To support legacy indexing (<1.87 user code). Legacy backend uses SDLK_*** as indices to IsKeyXXX() functions. + return true; + } + case SDL_WINDOWEVENT: + { + if (ImGui_ImplSDL2_GetViewportForWindowID(event->window.windowID) == nullptr) + return false; + // - When capturing mouse, SDL will send a bunch of conflicting LEAVE/ENTER event on every mouse move, but the final ENTER tends to be right. + // - However we won't get a correct LEAVE event for a captured window. + // - In some cases, when detaching a window from main viewport SDL may send SDL_WINDOWEVENT_ENTER one frame too late, + // causing SDL_WINDOWEVENT_LEAVE on previous frame to interrupt drag operation by clear mouse position. This is why + // we delay process the SDL_WINDOWEVENT_LEAVE events by one frame. See issue #5012 for details. + Uint8 window_event = event->window.event; + if (window_event == SDL_WINDOWEVENT_ENTER) + { + bd->MouseWindowID = event->window.windowID; + bd->MouseLastLeaveFrame = 0; + } + if (window_event == SDL_WINDOWEVENT_LEAVE) + bd->MouseLastLeaveFrame = ImGui::GetFrameCount() + 1; + if (window_event == SDL_WINDOWEVENT_FOCUS_GAINED) + io.AddFocusEvent(true); + if (window_event == SDL_WINDOWEVENT_FOCUS_LOST) + io.AddFocusEvent(false); + return true; + } + case SDL_CONTROLLERDEVICEADDED: + case SDL_CONTROLLERDEVICEREMOVED: + { + bd->WantUpdateGamepadsList = true; + return true; + } + default: + break; + } + return false; +} + +#ifdef __EMSCRIPTEN__ +EM_JS(void, ImGui_ImplSDL2_EmscriptenOpenURL, (char const* url), { url = url ? UTF8ToString(url) : null; if (url) window.open(url, '_blank'); }); +#endif + +static bool ImGui_ImplSDL2_Init(SDL_Window* window, SDL_Renderer* renderer, void* sdl_gl_context) +{ + ImGuiIO& io = ImGui::GetIO(); + IMGUI_CHECKVERSION(); + IM_ASSERT(io.BackendPlatformUserData == nullptr && "Already initialized a platform backend!"); + //SDL_SetHint(SDL_HINT_EVENT_LOGGING, "2"); + + // Obtain compiled and runtime versions + SDL_version ver_compiled; + SDL_version ver_runtime; + SDL_VERSION(&ver_compiled); + SDL_GetVersion(&ver_runtime); + + // Setup backend capabilities flags + ImGui_ImplSDL2_Data* bd = IM_NEW(ImGui_ImplSDL2_Data)(); + snprintf(bd->BackendPlatformName, sizeof(bd->BackendPlatformName), "imgui_impl_sdl2 (%u.%u.%u, %u.%u.%u)", + ver_compiled.major, ver_compiled.minor, ver_compiled.patch, ver_runtime.major, ver_runtime.minor, ver_runtime.patch); + io.BackendPlatformUserData = (void*)bd; + io.BackendPlatformName = bd->BackendPlatformName; + io.BackendFlags |= ImGuiBackendFlags_HasMouseCursors; // We can honor GetMouseCursor() values (optional) + io.BackendFlags |= ImGuiBackendFlags_HasSetMousePos; // We can honor io.WantSetMousePos requests (optional, rarely used) + + bd->Window = window; + bd->WindowID = SDL_GetWindowID(window); + bd->Renderer = renderer; + + // Check and store if we are on a SDL backend that supports SDL_GetGlobalMouseState() and SDL_CaptureMouse() + // ("wayland" and "rpi" don't support it, but we chose to use a white-list instead of a black-list) + bd->MouseCanUseGlobalState = false; + bd->MouseCaptureMode = ImGui_ImplSDL2_MouseCaptureMode_Disabled; +#if SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE + const char* sdl_backend = SDL_GetCurrentVideoDriver(); + const char* capture_and_global_state_whitelist[] = { "windows", "cocoa", "x11", "DIVE", "VMAN" }; + for (const char* item : capture_and_global_state_whitelist) + if (strncmp(sdl_backend, item, strlen(item)) == 0) + { + bd->MouseCanUseGlobalState = true; + bd->MouseCaptureMode = (strcmp(item, "x11") == 0) ? ImGui_ImplSDL2_MouseCaptureMode_EnabledAfterDrag : ImGui_ImplSDL2_MouseCaptureMode_Enabled; + } +#endif + + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + platform_io.Platform_SetClipboardTextFn = ImGui_ImplSDL2_SetClipboardText; + platform_io.Platform_GetClipboardTextFn = ImGui_ImplSDL2_GetClipboardText; + platform_io.Platform_ClipboardUserData = nullptr; + platform_io.Platform_SetImeDataFn = ImGui_ImplSDL2_PlatformSetImeData; +#ifdef __EMSCRIPTEN__ + platform_io.Platform_OpenInShellFn = [](ImGuiContext*, const char* url) { ImGui_ImplSDL2_EmscriptenOpenURL(url); return true; }; +#elif SDL_HAS_OPEN_URL + platform_io.Platform_OpenInShellFn = [](ImGuiContext*, const char* url) { return SDL_OpenURL(url) == 0; }; +#endif + + // Gamepad handling + bd->GamepadMode = ImGui_ImplSDL2_GamepadMode_AutoFirst; + bd->WantUpdateGamepadsList = true; + + // Load mouse cursors + bd->MouseCursors[ImGuiMouseCursor_Arrow] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW); + bd->MouseCursors[ImGuiMouseCursor_TextInput] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM); + bd->MouseCursors[ImGuiMouseCursor_ResizeAll] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEALL); + bd->MouseCursors[ImGuiMouseCursor_ResizeNS] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS); + bd->MouseCursors[ImGuiMouseCursor_ResizeEW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE); + bd->MouseCursors[ImGuiMouseCursor_ResizeNESW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENESW); + bd->MouseCursors[ImGuiMouseCursor_ResizeNWSE] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENWSE); + bd->MouseCursors[ImGuiMouseCursor_Hand] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND); + bd->MouseCursors[ImGuiMouseCursor_Wait] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_WAIT); + bd->MouseCursors[ImGuiMouseCursor_Progress] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_WAITARROW); + bd->MouseCursors[ImGuiMouseCursor_NotAllowed] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_NO); + + // Set platform dependent data in viewport + // Our mouse update function expect PlatformHandle to be filled for the main viewport + ImGuiViewport* main_viewport = ImGui::GetMainViewport(); + main_viewport->PlatformHandle = (void*)(intptr_t)bd->WindowID; + main_viewport->PlatformHandleRaw = nullptr; + SDL_SysWMinfo info; + SDL_VERSION(&info.version); + if (SDL_GetWindowWMInfo(window, &info)) + { +#if defined(SDL_VIDEO_DRIVER_WINDOWS) + main_viewport->PlatformHandleRaw = (void*)info.info.win.window; +#elif defined(__APPLE__) && defined(SDL_VIDEO_DRIVER_COCOA) + main_viewport->PlatformHandleRaw = (void*)info.info.cocoa.window; +#endif + } + + // From 2.0.5: Set SDL hint to receive mouse click events on window focus, otherwise SDL doesn't emit the event. + // Without this, when clicking to gain focus, our widgets wouldn't activate even though they showed as hovered. + // (This is unfortunately a global SDL setting, so enabling it might have a side-effect on your application. + // It is unlikely to make a difference, but if your app absolutely needs to ignore the initial on-focus click: + // you can ignore SDL_MOUSEBUTTONDOWN events coming right after a SDL_WINDOWEVENT_FOCUS_GAINED) +#ifdef SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH + SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1"); +#endif + + // From 2.0.18: Enable native IME. + // IMPORTANT: This is used at the time of SDL_CreateWindow() so this will only affects secondary windows, if any. + // For the main window to be affected, your application needs to call this manually before calling SDL_CreateWindow(). +#ifdef SDL_HINT_IME_SHOW_UI + SDL_SetHint(SDL_HINT_IME_SHOW_UI, "1"); +#endif + + // From 2.0.22: Disable auto-capture, this is preventing drag and drop across multiple windows (see #5710) +#ifdef SDL_HINT_MOUSE_AUTO_CAPTURE + SDL_SetHint(SDL_HINT_MOUSE_AUTO_CAPTURE, "0"); +#endif + + (void)sdl_gl_context; // Unused in 'master' branch. + return true; +} + +bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window, void* sdl_gl_context) +{ + return ImGui_ImplSDL2_Init(window, nullptr, sdl_gl_context); +} + +bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window) +{ +#if !SDL_HAS_VULKAN + IM_ASSERT(0 && "Unsupported"); +#endif + return ImGui_ImplSDL2_Init(window, nullptr, nullptr); +} + +bool ImGui_ImplSDL2_InitForD3D(SDL_Window* window) +{ +#if !defined(_WIN32) + IM_ASSERT(0 && "Unsupported"); +#endif + return ImGui_ImplSDL2_Init(window, nullptr, nullptr); +} + +bool ImGui_ImplSDL2_InitForMetal(SDL_Window* window) +{ + return ImGui_ImplSDL2_Init(window, nullptr, nullptr); +} + +bool ImGui_ImplSDL2_InitForSDLRenderer(SDL_Window* window, SDL_Renderer* renderer) +{ + return ImGui_ImplSDL2_Init(window, renderer, nullptr); +} + +bool ImGui_ImplSDL2_InitForOther(SDL_Window* window) +{ + return ImGui_ImplSDL2_Init(window, nullptr, nullptr); +} + +static void ImGui_ImplSDL2_CloseGamepads(); + +void ImGui_ImplSDL2_Shutdown() +{ + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + IM_ASSERT(bd != nullptr && "No platform backend to shutdown, or already shutdown?"); + ImGuiIO& io = ImGui::GetIO(); + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + + if (bd->ClipboardTextData) + SDL_free(bd->ClipboardTextData); + for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++) + SDL_FreeCursor(bd->MouseCursors[cursor_n]); + ImGui_ImplSDL2_CloseGamepads(); + + io.BackendPlatformName = nullptr; + io.BackendPlatformUserData = nullptr; + io.BackendFlags &= ~(ImGuiBackendFlags_HasMouseCursors | ImGuiBackendFlags_HasSetMousePos | ImGuiBackendFlags_HasGamepad); + platform_io.ClearPlatformHandlers(); + IM_DELETE(bd); +} + +void ImGui_ImplSDL2_SetMouseCaptureMode(ImGui_ImplSDL2_MouseCaptureMode mode) +{ + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + if (mode == ImGui_ImplSDL2_MouseCaptureMode_Disabled && bd->MouseCaptureMode != ImGui_ImplSDL2_MouseCaptureMode_Disabled) + SDL_CaptureMouse(SDL_FALSE); + bd->MouseCaptureMode = mode; +} + +static void ImGui_ImplSDL2_UpdateMouseData() +{ + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + ImGuiIO& io = ImGui::GetIO(); + + // We forward mouse input when hovered or captured (via SDL_MOUSEMOTION) or when focused (below) +#if SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE + // - SDL_CaptureMouse() let the OS know e.g. that our drags can extend outside of parent boundaries (we want updated position) and shouldn't trigger other operations outside. + // - Debuggers under Linux tends to leave captured mouse on break, which may be very inconvenient, so to mitigate the issue on X11 we we wait until mouse has moved to begin capture. + if (bd->MouseCaptureMode == ImGui_ImplSDL2_MouseCaptureMode_Enabled) + { + SDL_CaptureMouse((bd->MouseButtonsDown != 0) ? SDL_TRUE : SDL_FALSE); + } + else if (bd->MouseCaptureMode == ImGui_ImplSDL2_MouseCaptureMode_EnabledAfterDrag) + { + bool want_capture = false; + for (int button_n = 0; button_n < ImGuiMouseButton_COUNT && !want_capture; button_n++) + if (ImGui::IsMouseDragging(button_n, 1.0f)) + want_capture = true; + SDL_CaptureMouse(want_capture ? SDL_TRUE : SDL_FALSE); + } + + SDL_Window* focused_window = SDL_GetKeyboardFocus(); + const bool is_app_focused = (bd->Window == focused_window); +#else + SDL_Window* focused_window = bd->Window; + const bool is_app_focused = (SDL_GetWindowFlags(bd->Window) & SDL_WINDOW_INPUT_FOCUS) != 0; // SDL 2.0.3 and non-windowed systems: single-viewport only +#endif + if (is_app_focused) + { + // (Optional) Set OS mouse position from Dear ImGui if requested (rarely used, only when io.ConfigNavMoveSetMousePos is enabled by user) + if (io.WantSetMousePos) + SDL_WarpMouseInWindow(bd->Window, (int)io.MousePos.x, (int)io.MousePos.y); + + // (Optional) Fallback to provide unclamped mouse position when focused but not hovered (SDL_MOUSEMOTION already provides this when hovered or captured) + // Note that SDL_GetGlobalMouseState() is in theory slow on X11, but this only runs on rather specific cases. If a problem we may provide a way to opt-out this feature. + SDL_Window* hovered_window = SDL_GetMouseFocus(); + const bool is_relative_mouse_mode = SDL_GetRelativeMouseMode() != 0; + if (hovered_window == nullptr && bd->MouseCanUseGlobalState && bd->MouseButtonsDown == 0 && !is_relative_mouse_mode) + { + // Single-viewport mode: mouse position in client window coordinates (io.MousePos is (0,0) when the mouse is on the upper-left corner of the app window) + int mouse_x, mouse_y; + int window_x, window_y; + SDL_GetGlobalMouseState(&mouse_x, &mouse_y); + SDL_GetWindowPosition(focused_window, &window_x, &window_y); + mouse_x -= window_x; + mouse_y -= window_y; + io.AddMousePosEvent((float)mouse_x, (float)mouse_y); + } + } +} + +static void ImGui_ImplSDL2_UpdateMouseCursor() +{ + ImGuiIO& io = ImGui::GetIO(); + if (io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange) + return; + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + + ImGuiMouseCursor imgui_cursor = ImGui::GetMouseCursor(); + if (io.MouseDrawCursor || imgui_cursor == ImGuiMouseCursor_None) + { + // Hide OS mouse cursor if imgui is drawing it or if it wants no cursor + SDL_ShowCursor(SDL_FALSE); + } + else + { + // Show OS mouse cursor + SDL_Cursor* expected_cursor = bd->MouseCursors[imgui_cursor] ? bd->MouseCursors[imgui_cursor] : bd->MouseCursors[ImGuiMouseCursor_Arrow]; + if (bd->MouseLastCursor != expected_cursor) + { + SDL_SetCursor(expected_cursor); // SDL function doesn't have an early out (see #6113) + bd->MouseLastCursor = expected_cursor; + } + SDL_ShowCursor(SDL_TRUE); + } +} + +// - On Windows the process needs to be marked DPI-aware!! SDL2 doesn't do it by default. You can call ::SetProcessDPIAware() or call ImGui_ImplWin32_EnableDpiAwareness() from Win32 backend. +// - Apple platforms use FramebufferScale so we always return 1.0f. +// - Some accessibility applications are declaring virtual monitors with a DPI of 0.0f, see #7902. We preserve this value for caller to handle. +float ImGui_ImplSDL2_GetContentScaleForWindow(SDL_Window* window) +{ + return ImGui_ImplSDL2_GetContentScaleForDisplay(SDL_GetWindowDisplayIndex(window)); +} + +// SDL_GetDisplayDPI() seems rather unreliable on Linux. +float ImGui_ImplSDL2_GetContentScaleForDisplay(int display_index) +{ + const char* sdl_driver = SDL_GetCurrentVideoDriver(); + if (sdl_driver && strcmp(sdl_driver, "wayland") == 0) + return 1.0f; +#if SDL_HAS_PER_MONITOR_DPI +#if !defined(__APPLE__) && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) + float dpi = 0.0f; + if (SDL_GetDisplayDPI(display_index, &dpi, nullptr, nullptr) == 0) + { + if (dpi < 96.0f) + dpi = 96.0f; + return dpi / 96.0f; + } +#endif +#endif + IM_UNUSED(display_index); + return 1.0f; +} + +static void ImGui_ImplSDL2_CloseGamepads() +{ + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + if (bd->GamepadMode != ImGui_ImplSDL2_GamepadMode_Manual) + for (SDL_GameController* gamepad : bd->Gamepads) + SDL_GameControllerClose(gamepad); + bd->Gamepads.resize(0); +} + +void ImGui_ImplSDL2_SetGamepadMode(ImGui_ImplSDL2_GamepadMode mode, struct _SDL_GameController** manual_gamepads_array, int manual_gamepads_count) +{ + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + ImGui_ImplSDL2_CloseGamepads(); + if (mode == ImGui_ImplSDL2_GamepadMode_Manual) + { + IM_ASSERT(manual_gamepads_array != nullptr || manual_gamepads_count <= 0); + for (int n = 0; n < manual_gamepads_count; n++) + bd->Gamepads.push_back(manual_gamepads_array[n]); + } + else + { + IM_ASSERT(manual_gamepads_array == nullptr && manual_gamepads_count <= 0); + bd->WantUpdateGamepadsList = true; + } + bd->GamepadMode = mode; +} + +static void ImGui_ImplSDL2_UpdateGamepadButton(ImGui_ImplSDL2_Data* bd, ImGuiIO& io, ImGuiKey key, SDL_GameControllerButton button_no) +{ + bool merged_value = false; + for (SDL_GameController* gamepad : bd->Gamepads) + merged_value |= SDL_GameControllerGetButton(gamepad, button_no) != 0; + io.AddKeyEvent(key, merged_value); +} + +static inline float Saturate(float v) { return v < 0.0f ? 0.0f : v > 1.0f ? 1.0f : v; } +static void ImGui_ImplSDL2_UpdateGamepadAnalog(ImGui_ImplSDL2_Data* bd, ImGuiIO& io, ImGuiKey key, SDL_GameControllerAxis axis_no, float v0, float v1) +{ + float merged_value = 0.0f; + for (SDL_GameController* gamepad : bd->Gamepads) + { + float vn = Saturate((float)(SDL_GameControllerGetAxis(gamepad, axis_no) - v0) / (float)(v1 - v0)); + if (merged_value < vn) + merged_value = vn; + } + io.AddKeyAnalogEvent(key, merged_value > 0.1f, merged_value); +} + +static void ImGui_ImplSDL2_UpdateGamepads() +{ + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + ImGuiIO& io = ImGui::GetIO(); + + // Update list of controller(s) to use + if (bd->WantUpdateGamepadsList && bd->GamepadMode != ImGui_ImplSDL2_GamepadMode_Manual) + { + ImGui_ImplSDL2_CloseGamepads(); + int joystick_count = SDL_NumJoysticks(); + for (int n = 0; n < joystick_count; n++) + if (SDL_IsGameController(n)) + if (SDL_GameController* gamepad = SDL_GameControllerOpen(n)) + { + bd->Gamepads.push_back(gamepad); + if (bd->GamepadMode == ImGui_ImplSDL2_GamepadMode_AutoFirst) + break; + } + bd->WantUpdateGamepadsList = false; + } + + io.BackendFlags &= ~ImGuiBackendFlags_HasGamepad; + if (bd->Gamepads.Size == 0) + return; + io.BackendFlags |= ImGuiBackendFlags_HasGamepad; + + // Update gamepad inputs + const int thumb_dead_zone = 8000; // SDL_gamecontroller.h suggests using this value. + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadStart, SDL_CONTROLLER_BUTTON_START); + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadBack, SDL_CONTROLLER_BUTTON_BACK); + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadFaceLeft, SDL_CONTROLLER_BUTTON_X); // Xbox X, PS Square + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadFaceRight, SDL_CONTROLLER_BUTTON_B); // Xbox B, PS Circle + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadFaceUp, SDL_CONTROLLER_BUTTON_Y); // Xbox Y, PS Triangle + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadFaceDown, SDL_CONTROLLER_BUTTON_A); // Xbox A, PS Cross + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadDpadLeft, SDL_CONTROLLER_BUTTON_DPAD_LEFT); + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadDpadRight, SDL_CONTROLLER_BUTTON_DPAD_RIGHT); + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadDpadUp, SDL_CONTROLLER_BUTTON_DPAD_UP); + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadDpadDown, SDL_CONTROLLER_BUTTON_DPAD_DOWN); + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadL1, SDL_CONTROLLER_BUTTON_LEFTSHOULDER); + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadR1, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER); + ImGui_ImplSDL2_UpdateGamepadAnalog(bd, io, ImGuiKey_GamepadL2, SDL_CONTROLLER_AXIS_TRIGGERLEFT, 0.0f, 32767); + ImGui_ImplSDL2_UpdateGamepadAnalog(bd, io, ImGuiKey_GamepadR2, SDL_CONTROLLER_AXIS_TRIGGERRIGHT, 0.0f, 32767); + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadL3, SDL_CONTROLLER_BUTTON_LEFTSTICK); + ImGui_ImplSDL2_UpdateGamepadButton(bd, io, ImGuiKey_GamepadR3, SDL_CONTROLLER_BUTTON_RIGHTSTICK); + ImGui_ImplSDL2_UpdateGamepadAnalog(bd, io, ImGuiKey_GamepadLStickLeft, SDL_CONTROLLER_AXIS_LEFTX, -thumb_dead_zone, -32768); + ImGui_ImplSDL2_UpdateGamepadAnalog(bd, io, ImGuiKey_GamepadLStickRight, SDL_CONTROLLER_AXIS_LEFTX, +thumb_dead_zone, +32767); + ImGui_ImplSDL2_UpdateGamepadAnalog(bd, io, ImGuiKey_GamepadLStickUp, SDL_CONTROLLER_AXIS_LEFTY, -thumb_dead_zone, -32768); + ImGui_ImplSDL2_UpdateGamepadAnalog(bd, io, ImGuiKey_GamepadLStickDown, SDL_CONTROLLER_AXIS_LEFTY, +thumb_dead_zone, +32767); + ImGui_ImplSDL2_UpdateGamepadAnalog(bd, io, ImGuiKey_GamepadRStickLeft, SDL_CONTROLLER_AXIS_RIGHTX, -thumb_dead_zone, -32768); + ImGui_ImplSDL2_UpdateGamepadAnalog(bd, io, ImGuiKey_GamepadRStickRight, SDL_CONTROLLER_AXIS_RIGHTX, +thumb_dead_zone, +32767); + ImGui_ImplSDL2_UpdateGamepadAnalog(bd, io, ImGuiKey_GamepadRStickUp, SDL_CONTROLLER_AXIS_RIGHTY, -thumb_dead_zone, -32768); + ImGui_ImplSDL2_UpdateGamepadAnalog(bd, io, ImGuiKey_GamepadRStickDown, SDL_CONTROLLER_AXIS_RIGHTY, +thumb_dead_zone, +32767); +} + +static void ImGui_ImplSDL2_GetWindowSizeAndFramebufferScale(SDL_Window* window, SDL_Renderer* renderer, ImVec2* out_size, ImVec2* out_framebuffer_scale) +{ + int w, h; + int display_w, display_h; + SDL_GetWindowSize(window, &w, &h); + if (SDL_GetWindowFlags(window) & SDL_WINDOW_MINIMIZED) + w = h = 0; + if (renderer != nullptr) + SDL_GetRendererOutputSize(renderer, &display_w, &display_h); +#if SDL_HAS_VULKAN + else if (SDL_GetWindowFlags(window) & SDL_WINDOW_VULKAN) + SDL_Vulkan_GetDrawableSize(window, &display_w, &display_h); +#endif + else + SDL_GL_GetDrawableSize(window, &display_w, &display_h); + if (out_size != nullptr) + *out_size = ImVec2((float)w, (float)h); + if (out_framebuffer_scale != nullptr) + *out_framebuffer_scale = (w > 0 && h > 0) ? ImVec2((float)display_w / (float)w, (float)display_h / (float)h) : ImVec2(1.0f, 1.0f); +} + +void ImGui_ImplSDL2_NewFrame() +{ + ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData(); + IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplSDL2_Init()?"); + ImGuiIO& io = ImGui::GetIO(); + + // Setup main viewport size (every frame to accommodate for window resizing) + ImGui_ImplSDL2_GetWindowSizeAndFramebufferScale(bd->Window, bd->Renderer, &io.DisplaySize, &io.DisplayFramebufferScale); + + // Setup time step (we don't use SDL_GetTicks() because it is using millisecond resolution) + // (Accept SDL_GetPerformanceCounter() not returning a monotonically increasing value. Happens in VMs and Emscripten, see #6189, #6114, #3644) + static Uint64 frequency = SDL_GetPerformanceFrequency(); + Uint64 current_time = SDL_GetPerformanceCounter(); + if (current_time <= bd->Time) + current_time = bd->Time + 1; + io.DeltaTime = bd->Time > 0 ? (float)((double)(current_time - bd->Time) / (double)frequency) : (float)(1.0f / 60.0f); + bd->Time = current_time; + + if (bd->MouseLastLeaveFrame && bd->MouseLastLeaveFrame >= ImGui::GetFrameCount() && bd->MouseButtonsDown == 0) + { + bd->MouseWindowID = 0; + bd->MouseLastLeaveFrame = 0; + io.AddMousePosEvent(-FLT_MAX, -FLT_MAX); + } + + ImGui_ImplSDL2_UpdateMouseData(); + ImGui_ImplSDL2_UpdateMouseCursor(); + + // Update game controllers (if enabled and available) + ImGui_ImplSDL2_UpdateGamepads(); +} + +//----------------------------------------------------------------------------- + +#if defined(__clang__) +#pragma clang diagnostic pop +#endif + +#endif // #ifndef IMGUI_DISABLE \ No newline at end of file diff --git a/sources/lib/core/imgui/backends/imgui_impl_sdl2.h b/sources/lib/core/imgui/backends/imgui_impl_sdl2.h new file mode 100644 index 0000000..0a33c06 --- /dev/null +++ b/sources/lib/core/imgui/backends/imgui_impl_sdl2.h @@ -0,0 +1,57 @@ +// dear imgui: Platform Backend for SDL2 +// This needs to be used along with a Renderer (e.g. DirectX11, OpenGL3, Vulkan..) +// (Info: SDL2 is a cross-platform general purpose library for handling windows, inputs, graphics context creation, etc.) + +// Implemented features: +// [X] Platform: Clipboard support. +// [X] Platform: Mouse support. Can discriminate Mouse/TouchScreen. +// [X] Platform: Keyboard support. Since 1.87 we are using the io.AddKeyEvent() function. Pass ImGuiKey values to all key functions e.g. ImGui::IsKeyPressed(ImGuiKey_Space). [Legacy SDL_SCANCODE_* values are obsolete since 1.87 and not supported since 1.91.5] +// [X] Platform: Gamepad support. +// [X] Platform: Mouse cursor shape and visibility (ImGuiBackendFlags_HasMouseCursors). Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'. +// [X] Platform: Basic IME support. App needs to call 'SDL_SetHint(SDL_HINT_IME_SHOW_UI, "1");' before SDL_CreateWindow()!. + +// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. +// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need. +// Learn about Dear ImGui: +// - FAQ https://dearimgui.com/faq +// - Getting Started https://dearimgui.com/getting-started +// - Documentation https://dearimgui.com/docs (same as your local docs/ folder). +// - Introduction, links and more at the top of imgui.cpp + +#pragma once +#include "imgui.h" // IMGUI_IMPL_API +#ifndef IMGUI_DISABLE + +struct SDL_Window; +struct SDL_Renderer; +struct _SDL_GameController; +typedef union SDL_Event SDL_Event; + +// Follow "Getting Started" link and check examples/ folder to learn about using backends! +IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window, void* sdl_gl_context); +IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window); +IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForD3D(SDL_Window* window); +IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForMetal(SDL_Window* window); +IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForSDLRenderer(SDL_Window* window, SDL_Renderer* renderer); +IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForOther(SDL_Window* window); +IMGUI_IMPL_API void ImGui_ImplSDL2_Shutdown(); +IMGUI_IMPL_API void ImGui_ImplSDL2_NewFrame(); +IMGUI_IMPL_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event); + +// DPI-related helpers (optional) +IMGUI_IMPL_API float ImGui_ImplSDL2_GetContentScaleForWindow(SDL_Window* window); +IMGUI_IMPL_API float ImGui_ImplSDL2_GetContentScaleForDisplay(int display_index); + +// Gamepad selection automatically starts in AutoFirst mode, picking first available SDL_Gamepad. You may override this. +// When using manual mode, caller is responsible for opening/closing gamepad. +enum ImGui_ImplSDL2_GamepadMode { ImGui_ImplSDL2_GamepadMode_AutoFirst, ImGui_ImplSDL2_GamepadMode_AutoAll, ImGui_ImplSDL2_GamepadMode_Manual }; +IMGUI_IMPL_API void ImGui_ImplSDL2_SetGamepadMode(ImGui_ImplSDL2_GamepadMode mode, struct _SDL_GameController** manual_gamepads_array = nullptr, int manual_gamepads_count = -1); + +// (Advanced, for X11 users) Override Mouse Capture mode. Mouse capture allows receiving updated mouse position after clicking inside our window and dragging outside it. +// Having this 'Enabled' is in theory always better. But, on X11 if you crash/break to debugger while capture is active you may temporarily lose access to your mouse. +// The best solution is to setup your debugger to automatically release capture, e.g. 'setxkbmap -option grab:break_actions && xdotool key XF86Ungrab' or via a GDB script. See #3650. +// But you may independently decide on X11, when a debugger is attached, to set this value to ImGui_ImplSDL2_MouseCaptureMode_Disabled. +enum ImGui_ImplSDL2_MouseCaptureMode { ImGui_ImplSDL2_MouseCaptureMode_Enabled, ImGui_ImplSDL2_MouseCaptureMode_EnabledAfterDrag, ImGui_ImplSDL2_MouseCaptureMode_Disabled }; +IMGUI_IMPL_API void ImGui_ImplSDL2_SetMouseCaptureMode(ImGui_ImplSDL2_MouseCaptureMode mode); + +#endif // #ifndef IMGUI_DISABLE \ No newline at end of file diff --git a/sources/lib/core/imgui/imgui_wrapper.cpp b/sources/lib/core/imgui/imgui_wrapper.cpp index 0c3f182..c02da17 100644 --- a/sources/lib/core/imgui/imgui_wrapper.cpp +++ b/sources/lib/core/imgui/imgui_wrapper.cpp @@ -4,10 +4,11 @@ #include "imgui_wrapper.hpp" -#include -#include +#include #include +#include "./backends/imgui_impl_sdl2.h" + namespace sdlk { imgui_wrapper::imgui_wrapper(SDL_Window *window, diff --git a/vcpkg.json b/vcpkg.json index 6a5932f..df8d27c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,13 +1,20 @@ { - "name" : "sdlk", - "version" : "0.0.5", - "builtin-baseline": "6ecbbbdf31cba47aafa7cf6189b1e73e10ac61f8", - "dependencies" : [ + "name": "sdlk", + "version": "0.0.5", + "builtin-baseline": "2b65c20fc66eda893aa15a15a453c3cf09500b19", + "dependencies": [ "sdl2", "glm", "earcut-hpp", "sdl2-image", "freetype", - "nlohmann-json" + "nlohmann-json", + "nativefiledialog-extended", + { + "name": "imgui", + "features": [ + "opengl3-binding" + ] + } ] -} \ No newline at end of file +} From 99b05d650381da9b6f9049887692459c91b0c087 Mon Sep 17 00:00:00 2001 From: RickaPrincy Date: Mon, 18 May 2026 21:56:47 +0300 Subject: [PATCH 2/3] wip: build: msdf-atlas-gen install --- CMakePresets.json | 2 + cmake/sdlkConfig.cmake.in | 15 +- cmake/sdlk_resources.cmake | 38 --- examples/CMakeLists.txt | 4 +- examples/main.cpp | 10 +- .../core/components/2d/fonts/msdf_font.hpp | 101 ++------ .../core/components/2d/shape/text_shape.hpp | 4 +- sources/lib/CMakeLists.txt | 10 +- .../2d/fonts/free_type_handle_wrapper.cpp | 2 +- .../2d/fonts/free_type_handle_wrapper.hpp | 2 +- .../core/components/2d/fonts/msdf_font.cpp | 223 ++---------------- .../components/2d/fonts/msdf_font_impl.cpp | 211 +++++++++++++++++ .../components/2d/fonts/msdf_font_impl.hpp | 86 +++++++ .../core/components/2d/shape/text_shape.cpp | 16 +- 14 files changed, 374 insertions(+), 350 deletions(-) delete mode 100644 cmake/sdlk_resources.cmake create mode 100644 sources/lib/core/components/2d/fonts/msdf_font_impl.cpp create mode 100644 sources/lib/core/components/2d/fonts/msdf_font_impl.hpp diff --git a/CMakePresets.json b/CMakePresets.json index 11ceeb6..f05784a 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -6,6 +6,8 @@ "generator": "Ninja", "binaryDir": "${sourceDir}/build/${presetName}", "cacheVariables": { + "MSDF_ATLAS_BUILD_STANDALONE": "OFF", + "MSDF_ATLAS_INSTALL": "ON", "MSDF_ATLAS_USE_SKIA": "OFF", "MSDF_ATLAS_USE_VCPKG": "ON", "CMAKE_TOOLCHAIN_FILE": "/home/ricka/Apk/vcpkg/scripts/buildsystems/vcpkg.cmake" diff --git a/cmake/sdlkConfig.cmake.in b/cmake/sdlkConfig.cmake.in index 9f98502..d21bfe2 100644 --- a/cmake/sdlkConfig.cmake.in +++ b/cmake/sdlkConfig.cmake.in @@ -1,8 +1,13 @@ @PACKAGE_INIT@ -include("${CMAKE_CURRENT_LIST_DIR}/@SDLK_LIB_NAME@Targets.cmake") +include(CMakeFindDependencyMacro) -if(EXISTS "@CMAKE_SOURCE_DIR@/resources") - file(COPY "@CMAKE_SOURCE_DIR@/resources" - DESTINATION "${CMAKE_BINARY_DIR}/bin") -endif() +find_dependency(glm CONFIG) +find_dependency(SDL2 CONFIG) +find_dependency(imgui CONFIG) +find_dependency(SDL2_image CONFIG) +find_dependency(nlohmann_json CONFIG) + +include("${CMAKE_CURRENT_LIST_DIR}/sdlkTargets.cmake") + +check_required_components(sdlk) \ No newline at end of file diff --git a/cmake/sdlk_resources.cmake b/cmake/sdlk_resources.cmake deleted file mode 100644 index e571aef..0000000 --- a/cmake/sdlk_resources.cmake +++ /dev/null @@ -1,38 +0,0 @@ -function(set_sdlk_resources TARGET) - set(options) - set(oneValueArgs DESTINATION) - set(multiValueArgs FILES DIRECTORIES) - - cmake_parse_arguments(SDLK - "${options}" - "${oneValueArgs}" - "${multiValueArgs}" - ${ARGN} - ) - - if (NOT SDLK_DESTINATION) - set(SDLK_DESTINATION "resources") - endif() - - foreach(file ${SDLK_FILES}) - add_custom_command(TARGET ${TARGET} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${file} - $/${SDLK_DESTINATION}/user/${file} - ) - endforeach() - - foreach(dir ${SDLK_DIRECTORIES}) - add_custom_command(TARGET ${TARGET} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${dir} - $/${SDLK_DESTINATION}/user/${dir} - ) - endforeach() - - add_custom_command(TARGET ${TARGET} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${SDLK_ENGINE_RESOURCE_DIR} - $/${SDLK_DESTINATION}/engine - ) -endfunction() \ No newline at end of file diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 48298e6..be7c554 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,6 +1,4 @@ -add_executable(example main.cpp - ../include/sdlk/core/imgui/imgui_drawer_utils.hpp - ../include/sdlk/extra/nfd_wrapper.hpp) +add_executable(example main.cpp) target_include_directories(example PRIVATE ${SDLK_SOURCE_DIR}/include) diff --git a/examples/main.cpp b/examples/main.cpp index 377c695..d13c846 100644 --- a/examples/main.cpp +++ b/examples/main.cpp @@ -16,14 +16,14 @@ auto rectangle_with_vertex_color() -> std::shared_ptr; auto main(const int argc, char** argv) -> int { - app rc_engine("RC_Engine", 1200, 800); + auto rc_engine = app::make("RC_Engine", 1200, 800); - rc_engine.add_view("home", home()); + rc_engine->add_view("home", home()); - rc_engine.add_event_listener( + rc_engine->add_event_listener( event_type::key_up, [&](const SDL_Event& event) { std::cout << "Clicked \n"; }); - return rc_engine.run("home", argc, argv); + return rc_engine->run("home", argc, argv); } auto home() -> std::shared_ptr @@ -38,7 +38,7 @@ auto home() -> std::shared_ptr auto text_hello_world() -> std::shared_ptr { - auto font = msdf_font::make("./resources/assets/fonts/arial.ttf"); + auto font = sdlk2d::msdf_font::make("./resources/assets/fonts/arial.ttf"); return std::make_shared(U"Hello World helloé", sdlk2d::text_style{ .m_size = 20.0f, .m_fg_color = color::white() }, font); diff --git a/include/sdlk/core/components/2d/fonts/msdf_font.hpp b/include/sdlk/core/components/2d/fonts/msdf_font.hpp index d8ddb14..1116ae9 100644 --- a/include/sdlk/core/components/2d/fonts/msdf_font.hpp +++ b/include/sdlk/core/components/2d/fonts/msdf_font.hpp @@ -1,92 +1,37 @@ // -// Created by ricka on 2026-01-18. +// Created by ricka on 2026-05-18. // #pragma once -#include - #include -#include -#include - -#define MIN_SIDE 256 +#include -namespace sdlk +namespace sdlk2d { - using namespace msdf_atlas; - - using charset = Charset; - using font_geometry = FontGeometry; - using font_metrics = msdfgen::FontMetrics; - using glyph_geometry = GlyphGeometry; - using font_handle = msdfgen::FontHandle; - - using bitmap = msdfgen::Bitmap; - using bitmap_ref = msdfgen::BitmapRef; - using bitmap_const_ref = msdfgen::BitmapConstRef; - using msdf_dynamic_atlas = - DynamicAtlas>>; - - struct msdf_font_conf - { - const float m_pixel_range = 2; - const float m_glyph_scale = 32.0; - const float m_miter_limit = 1.0; - const float m_max_corner_angle = 3.0; - }; - - struct glyph_storage - { - font_handle *m_font_handle{}; - std::vector m_data{}; - font_geometry m_font_geometry{ &m_data }; - std::unordered_map m_glyphs{}; - - [[nodiscard]] auto size() const -> size_t; - [[nodiscard]] auto is_loaded(const char32_t &character) const -> bool; - [[nodiscard]] auto slice(size_t start_index) -> glyph_geometry *; - [[nodiscard]] auto get(const char32_t &character) - -> std::optional>; - - auto invalidate_glyphs_map() -> void; - auto load(const charset &charset) -> void; - - ~glyph_storage(); - }; - - class msdf_font final - { - msdf_font_conf m_conf{}; - bitmap_const_ref m_bitmap{}; - msdf_dynamic_atlas m_atlas{ 256 }; - - bool m_texture_initialized{ false }; - std::shared_ptr m_texture{}; - - glyph_storage m_glyph_storage{ nullptr }; - - auto update_texture(msdf_dynamic_atlas::ChangeFlags flags) -> void; - auto add_to_atlas(size_t start_index) -> msdf_dynamic_atlas::ChangeFlags; + class msdf_font_impl; - public: - explicit msdf_font(const std::string &font_path, msdf_font_conf &&conf = {}); + struct msdf_font_conf + { + const float m_pixel_range = 2; + const float m_glyph_scale = 32.0; + const float m_miter_limit = 1.0; + const float m_max_corner_angle = 3.0; + }; - static auto make(const std::string &font_path) -> std::shared_ptr; + class msdf_font + { + msdf_font_conf m_conf; + std::shared_ptr m_impl; - [[nodiscard]] auto get(const char32_t &c) - -> std::optional>; + public: + explicit msdf_font(const std::string &path, msdf_font_conf conf = {}); - [[nodiscard]] auto get_conf() const -> msdf_font_conf; - [[nodiscard]] auto get_bitmap() const -> bitmap_const_ref; - [[nodiscard]] auto is_loaded(const char32_t &c) const -> bool; - [[nodiscard]] auto get_texture() const -> std::shared_ptr; - [[nodiscard]] auto get_metrics() const -> font_metrics; + [[nodiscard]] auto get_impl() const -> std::shared_ptr; - auto load(const Charset &charset) -> void; - auto load(const char32_t &character) -> void; - auto load(const std::u32string &text) -> void; + [[nodiscard]] static auto make(const std::string &path, msdf_font_conf conf = {}) -> std::shared_ptr; - ~msdf_font() = default; - }; -} // namespace sdlk + msdf_font() = delete; + ~msdf_font() = default; + }; +} diff --git a/include/sdlk/core/components/2d/shape/text_shape.hpp b/include/sdlk/core/components/2d/shape/text_shape.hpp index a02175d..c84a7c6 100644 --- a/include/sdlk/core/components/2d/shape/text_shape.hpp +++ b/include/sdlk/core/components/2d/shape/text_shape.hpp @@ -25,14 +25,14 @@ namespace sdlk2d protected: text_style m_style{}; std::u32string m_text{}; - std::shared_ptr m_font{}; + std::shared_ptr m_font{}; auto update_vertices() -> void; public: explicit text_shape(std::u32string text, const text_style &text_style, - const std::shared_ptr &font); + const std::shared_ptr &font); auto render(const std::shared_ptr &program) -> void override; }; diff --git a/sources/lib/CMakeLists.txt b/sources/lib/CMakeLists.txt index aaddf05..b2cbc1c 100644 --- a/sources/lib/CMakeLists.txt +++ b/sources/lib/CMakeLists.txt @@ -25,6 +25,7 @@ set(LIB_SOURCES core/components/2d/shape/rectangle_shape.cpp core/components/2d/fonts/free_type_handle_wrapper.cpp core/components/2d/fonts/msdf_font.cpp + core/components/2d/fonts/msdf_font_impl.cpp core/components/2d/shape/text_shape.cpp core/app.cpp core/converter.cpp @@ -63,11 +64,11 @@ target_link_libraries(${SDLK_LIB_NAME} target_link_libraries(${SDLK_LIB_NAME} PRIVATE nfd::nfd) target_link_libraries(${SDLK_LIB_NAME} PRIVATE Freetype::Freetype) +target_link_libraries(${SDLK_LIB_NAME} PRIVATE msdf-atlas-gen::msdf-atlas-gen) target_link_libraries(${SDLK_LIB_NAME} PUBLIC imgui::imgui) target_link_libraries(${SDLK_LIB_NAME} PUBLIC glm::glm-header-only) target_link_libraries(${SDLK_LIB_NAME} PUBLIC nlohmann_json::nlohmann_json) -target_link_libraries(${SDLK_LIB_NAME} PUBLIC msdf-atlas-gen::msdf-atlas-gen) target_link_libraries(${SDLK_LIB_NAME} PUBLIC $,SDL2_image::SDL2_image,SDL2_image::SDL2_image-static>) # set properties @@ -79,7 +80,7 @@ set_target_properties( VERSION ${SDLK_LIB_VERSION}) # lib install configuration -if (SDLK_LIB_INSTALL) +#if (SDLK_LIB_INSTALL) include(CMakePackageConfigHelpers) write_basic_package_version_file( ${CMAKE_BINARY_DIR}/cmake/${SDLK_LIB_NAME}Version.cmake @@ -87,8 +88,7 @@ if (SDLK_LIB_INSTALL) COMPATIBILITY SameMajorVersion) include(GNUInstallDirs) - install(DIRECTORY ${SDLK_SOURCE_DIR}/include/${SDLK_LIB_NAME} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(DIRECTORY ${SDLK_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install( TARGETS ${SDLK_LIB_NAME} @@ -119,4 +119,4 @@ if (SDLK_LIB_INSTALL) ${CMAKE_BINARY_DIR}/cmake/${SDLK_LIB_NAME}Version.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${SDLK_LIB_NAME}) -endif () +#endif () diff --git a/sources/lib/core/components/2d/fonts/free_type_handle_wrapper.cpp b/sources/lib/core/components/2d/fonts/free_type_handle_wrapper.cpp index b8a3516..3e6ae61 100644 --- a/sources/lib/core/components/2d/fonts/free_type_handle_wrapper.cpp +++ b/sources/lib/core/components/2d/fonts/free_type_handle_wrapper.cpp @@ -7,7 +7,7 @@ #include #include -namespace sdlk +namespace sdlk2d { static auto free_type_handle_wrapper_instance = std::make_shared(); diff --git a/sources/lib/core/components/2d/fonts/free_type_handle_wrapper.hpp b/sources/lib/core/components/2d/fonts/free_type_handle_wrapper.hpp index 4d065f3..065b759 100644 --- a/sources/lib/core/components/2d/fonts/free_type_handle_wrapper.hpp +++ b/sources/lib/core/components/2d/fonts/free_type_handle_wrapper.hpp @@ -7,7 +7,7 @@ #include -namespace sdlk +namespace sdlk2d { class free_type_handle_wrapper final { diff --git a/sources/lib/core/components/2d/fonts/msdf_font.cpp b/sources/lib/core/components/2d/fonts/msdf_font.cpp index f932f42..b1c24f9 100644 --- a/sources/lib/core/components/2d/fonts/msdf_font.cpp +++ b/sources/lib/core/components/2d/fonts/msdf_font.cpp @@ -1,211 +1,24 @@ // -// Created by ricka on 2026-01-18. +// Created by ricka on 2026-05-18. // #include -#include +#include "./msdf_font_impl.hpp" -#include "free_type_handle_wrapper.hpp" - -namespace sdlk +namespace sdlk2d { - glyph_storage::~glyph_storage() - { - msdfgen::destroyFont(this->m_font_handle); - } - - auto glyph_storage::size() const -> size_t - { - return this->m_data.size(); - } - - auto glyph_storage::slice(const size_t start_index) -> glyph_geometry * - { - return &this->m_data[start_index]; - } - - auto glyph_storage::get(const char32_t &character) - -> std::optional> - { - if (this->is_loaded(character)) - { - return *this->m_glyphs[character]; - } - - return std::nullopt; - } - - auto glyph_storage::is_loaded(const char32_t &character) const -> bool - { - const auto &it = this->m_glyphs.find(character); - return it != this->m_glyphs.end(); - } - - auto glyph_storage::load(const Charset &charset) -> void - { - this->m_font_geometry.loadCharset(this->m_font_handle, 1.0, charset); - } - - auto glyph_storage::invalidate_glyphs_map() -> void - { - this->m_glyphs.clear(); - this->m_glyphs.reserve(this->m_data.size()); - - for (auto &glyph : this->m_data) - { - this->m_glyphs.emplace(glyph.getCodepoint(), &glyph); - } - } - - msdf_font::msdf_font(const std::string &font_path, msdf_font_conf &&conf) : m_conf(conf) - { - this->m_glyph_storage.m_font_handle = - msdfgen::loadFont(free_type_handle_wrapper::instance()->raw(), font_path.c_str()); - - if (!this->m_glyph_storage.m_font_handle) - { - throw std::runtime_error("Could not load font " + font_path); - } - - this->m_texture = std::make_shared(); - glGenTextures(1, &this->m_texture->get_id()); - - this->m_texture->bind(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - - this->load(Charset::ASCII); - } - - auto msdf_font::load(const std::u32string &text) -> void - { - Charset charset{}; - for (const auto &c : text) - { - if (!this->is_loaded(c)) - { - charset.add(c); - } - } - - if (charset.empty()) - { - return; - } - - return this->load(charset); - } - - auto msdf_font::load(const char32_t &character) -> void - { - Charset charset{}; - charset.add(character); - return this->load(charset); - } - - auto msdf_font::load(const Charset &charset) -> void - { - const size_t old_size = this->m_glyph_storage.size(); - - this->m_glyph_storage.load(charset); - - this->add_to_atlas(old_size); - - this->m_glyph_storage.invalidate_glyphs_map(); - } - - auto msdf_font::is_loaded(const char32_t &c) const -> bool - { - return this->m_glyph_storage.is_loaded(c); - } - - auto msdf_font::get(const char32_t &c) - -> std::optional> - { - return this->m_glyph_storage.get(c); - } - - auto msdf_font::add_to_atlas(const size_t start_index) -> msdf_dynamic_atlas::ChangeFlags - { - const auto storage_size = this->m_glyph_storage.size(); - const auto new_storage_size = storage_size - start_index; - for (size_t i = start_index; i < storage_size; ++i) - { - this->m_glyph_storage.m_data[i].edgeColoring( - &msdfgen::edgeColoringInkTrap, m_conf.m_max_corner_angle, 0); - this->m_glyph_storage.m_data[i].wrapBox(m_conf.m_glyph_scale, - m_conf.m_pixel_range / m_conf.m_glyph_scale, - m_conf.m_miter_limit); - } - - const auto data = this->m_atlas.add( - this->m_glyph_storage.slice(start_index), static_cast(new_storage_size), false); - - this->update_texture(data); - - return data; - } - - auto msdf_font::get_bitmap() const -> bitmap_const_ref - { - return this->m_bitmap; - } - - auto msdf_font::update_texture(msdf_dynamic_atlas::ChangeFlags flags) -> void - { - this->m_texture->bind(); - this->m_bitmap = bitmap_const_ref{ this->m_atlas.atlasGenerator().atlasStorage() }; - - const bool need_full_upload = - !m_texture_initialized || flags & msdf_dynamic_atlas::ChangeFlag::RESIZED; - - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - if (need_full_upload) - { - glTexImage2D(GL_TEXTURE_2D, - 0, - GL_RGB8, - m_bitmap.width, - m_bitmap.height, - 0, - GL_RGB, - GL_UNSIGNED_BYTE, - m_bitmap.pixels); - m_texture_initialized = true; - } - else - { - glTexSubImage2D(GL_TEXTURE_2D, - 0, - 0, - 0, - m_bitmap.width, - m_bitmap.height, - GL_RGB, - GL_UNSIGNED_BYTE, - m_bitmap.pixels); - } - } - - auto msdf_font::get_texture() const -> std::shared_ptr - { - return this->m_texture; - } - - auto msdf_font::get_conf() const -> msdf_font_conf - { - return this->m_conf; - } - - auto msdf_font::get_metrics() const -> font_metrics - { - return this->m_glyph_storage.m_font_geometry.getMetrics(); - } - - auto msdf_font::make(const std::string &font_path) -> std::shared_ptr - { - return std::make_shared(font_path); - } -} // namespace sdlk \ No newline at end of file + msdf_font::msdf_font(const std::string &path, const msdf_font_conf conf) + { + this->m_impl = std::make_shared(path, conf); + } + + auto msdf_font::get_impl() const -> std::shared_ptr + { + return this->m_impl; + } + + auto msdf_font::make(const std::string &path, msdf_font_conf conf) -> std::shared_ptr + { + return std::make_shared(path, conf); + } +} diff --git a/sources/lib/core/components/2d/fonts/msdf_font_impl.cpp b/sources/lib/core/components/2d/fonts/msdf_font_impl.cpp new file mode 100644 index 0000000..b40b660 --- /dev/null +++ b/sources/lib/core/components/2d/fonts/msdf_font_impl.cpp @@ -0,0 +1,211 @@ +// +// Created by ricka on 2026-01-18. +// + +#include + +#include "msdf_font_impl.hpp" +#include "free_type_handle_wrapper.hpp" + +namespace sdlk2d +{ + glyph_storage::~glyph_storage() + { + msdfgen::destroyFont(this->m_font_handle); + } + + auto glyph_storage::size() const -> size_t + { + return this->m_data.size(); + } + + auto glyph_storage::slice(const size_t start_index) -> glyph_geometry * + { + return &this->m_data[start_index]; + } + + auto glyph_storage::get(const char32_t &character) + -> std::optional> + { + if (this->is_loaded(character)) + { + return *this->m_glyphs[character]; + } + + return std::nullopt; + } + + auto glyph_storage::is_loaded(const char32_t &character) const -> bool + { + const auto &it = this->m_glyphs.find(character); + return it != this->m_glyphs.end(); + } + + auto glyph_storage::load(const Charset &charset) -> void + { + this->m_font_geometry.loadCharset(this->m_font_handle, 1.0, charset); + } + + auto glyph_storage::invalidate_glyphs_map() -> void + { + this->m_glyphs.clear(); + this->m_glyphs.reserve(this->m_data.size()); + + for (auto &glyph : this->m_data) + { + this->m_glyphs.emplace(glyph.getCodepoint(), &glyph); + } + } + + msdf_font_impl::msdf_font_impl(const std::string &font_path, const msdf_font_conf conf) : m_conf(conf) + { + this->m_glyph_storage.m_font_handle = + msdfgen::loadFont(free_type_handle_wrapper::instance()->raw(), font_path.c_str()); + + if (!this->m_glyph_storage.m_font_handle) + { + throw std::runtime_error("Could not load font " + font_path); + } + + this->m_texture = std::make_shared(); + glGenTextures(1, &this->m_texture->get_id()); + + this->m_texture->bind(); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + + this->load(Charset::ASCII); + } + + auto msdf_font_impl::load(const std::u32string &text) -> void + { + Charset charset{}; + for (const auto &c : text) + { + if (!this->is_loaded(c)) + { + charset.add(c); + } + } + + if (charset.empty()) + { + return; + } + + return this->load(charset); + } + + auto msdf_font_impl::load(const char32_t &character) -> void + { + Charset charset{}; + charset.add(character); + return this->load(charset); + } + + auto msdf_font_impl::load(const Charset &charset) -> void + { + const size_t old_size = this->m_glyph_storage.size(); + + this->m_glyph_storage.load(charset); + + this->add_to_atlas(old_size); + + this->m_glyph_storage.invalidate_glyphs_map(); + } + + auto msdf_font_impl::is_loaded(const char32_t &c) const -> bool + { + return this->m_glyph_storage.is_loaded(c); + } + + auto msdf_font_impl::get(const char32_t &c) + -> std::optional> + { + return this->m_glyph_storage.get(c); + } + + auto msdf_font_impl::add_to_atlas(const size_t start_index) -> msdf_dynamic_atlas::ChangeFlags + { + const auto storage_size = this->m_glyph_storage.size(); + const auto new_storage_size = storage_size - start_index; + for (size_t i = start_index; i < storage_size; ++i) + { + this->m_glyph_storage.m_data[i].edgeColoring( + &msdfgen::edgeColoringInkTrap, m_conf.m_max_corner_angle, 0); + this->m_glyph_storage.m_data[i].wrapBox(m_conf.m_glyph_scale, + m_conf.m_pixel_range / m_conf.m_glyph_scale, + m_conf.m_miter_limit); + } + + const auto data = this->m_atlas.add( + this->m_glyph_storage.slice(start_index), static_cast(new_storage_size), false); + + this->update_texture(data); + + return data; + } + + auto msdf_font_impl::get_bitmap() const -> bitmap_const_ref + { + return this->m_bitmap; + } + + auto msdf_font_impl::update_texture(const msdf_dynamic_atlas::ChangeFlags flags) -> void + { + this->m_texture->bind(); + this->m_bitmap = bitmap_const_ref{ this->m_atlas.atlasGenerator().atlasStorage() }; + + const bool need_full_upload = + !m_texture_initialized || flags & msdf_dynamic_atlas::ChangeFlag::RESIZED; + + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + if (need_full_upload) + { + glTexImage2D(GL_TEXTURE_2D, + 0, + GL_RGB8, + m_bitmap.width, + m_bitmap.height, + 0, + GL_RGB, + GL_UNSIGNED_BYTE, + m_bitmap.pixels); + m_texture_initialized = true; + } + else + { + glTexSubImage2D(GL_TEXTURE_2D, + 0, + 0, + 0, + m_bitmap.width, + m_bitmap.height, + GL_RGB, + GL_UNSIGNED_BYTE, + m_bitmap.pixels); + } + } + + auto msdf_font_impl::get_texture() const -> std::shared_ptr + { + return this->m_texture; + } + + auto msdf_font_impl::get_conf() const -> msdf_font_conf + { + return this->m_conf; + } + + auto msdf_font_impl::get_metrics() const -> font_metrics + { + return this->m_glyph_storage.m_font_geometry.getMetrics(); + } + + auto msdf_font_impl::make(const std::string &font_path) -> std::shared_ptr + { + return std::make_shared(font_path); + } +} // namespace sdlk \ No newline at end of file diff --git a/sources/lib/core/components/2d/fonts/msdf_font_impl.hpp b/sources/lib/core/components/2d/fonts/msdf_font_impl.hpp new file mode 100644 index 0000000..1659345 --- /dev/null +++ b/sources/lib/core/components/2d/fonts/msdf_font_impl.hpp @@ -0,0 +1,86 @@ +// +// Created by ricka on 2026-01-18. +// + +#pragma once + +#include + +#include +#include +#include +#include + +#define MIN_SIDE 256 + + +namespace sdlk2d +{ + using namespace msdf_atlas; + + using charset = Charset; + using font_geometry = FontGeometry; + using font_metrics = msdfgen::FontMetrics; + using glyph_geometry = GlyphGeometry; + using font_handle = msdfgen::FontHandle; + + using bitmap = msdfgen::Bitmap; + using bitmap_ref = msdfgen::BitmapRef; + using bitmap_const_ref = msdfgen::BitmapConstRef; + using msdf_dynamic_atlas = + DynamicAtlas>>; + + struct glyph_storage + { + font_handle *m_font_handle{}; + std::vector m_data{}; + font_geometry m_font_geometry{ &m_data }; + std::unordered_map m_glyphs{}; + + [[nodiscard]] auto size() const -> size_t; + [[nodiscard]] auto is_loaded(const char32_t &character) const -> bool; + [[nodiscard]] auto slice(size_t start_index) -> glyph_geometry *; + [[nodiscard]] auto get(const char32_t &character) + -> std::optional>; + + auto invalidate_glyphs_map() -> void; + auto load(const charset &charset) -> void; + + ~glyph_storage(); + }; + + class msdf_font_impl final + { + msdf_font_conf m_conf{}; + bitmap_const_ref m_bitmap{}; + msdf_dynamic_atlas m_atlas{ 256 }; + + bool m_texture_initialized{ false }; + std::shared_ptr m_texture{}; + + glyph_storage m_glyph_storage{ nullptr }; + + auto update_texture(msdf_dynamic_atlas::ChangeFlags flags) -> void; + auto add_to_atlas(size_t start_index) -> msdf_dynamic_atlas::ChangeFlags; + + public: + explicit msdf_font_impl(const std::string &font_path, msdf_font_conf conf = {}); + + static auto make(const std::string &font_path) -> std::shared_ptr; + + [[nodiscard]] auto get(const char32_t &c) + -> std::optional>; + + [[nodiscard]] auto get_conf() const -> msdf_font_conf; + [[nodiscard]] auto get_bitmap() const -> bitmap_const_ref; + [[nodiscard]] auto is_loaded(const char32_t &c) const -> bool; + [[nodiscard]] auto get_texture() const -> std::shared_ptr; + [[nodiscard]] auto get_metrics() const -> font_metrics; + + auto load(const Charset &charset) -> void; + auto load(const char32_t &character) -> void; + auto load(const std::u32string &text) -> void; + + ~msdf_font_impl() = default; + }; +} // namespace sdlk diff --git a/sources/lib/core/components/2d/shape/text_shape.cpp b/sources/lib/core/components/2d/shape/text_shape.cpp index 5deb630..10f957d 100644 --- a/sources/lib/core/components/2d/shape/text_shape.cpp +++ b/sources/lib/core/components/2d/shape/text_shape.cpp @@ -10,11 +10,13 @@ #include #include +#include "../fonts/msdf_font_impl.hpp" + namespace sdlk2d { text_shape::text_shape(std::u32string text, const text_style &text_style, - const std::shared_ptr &font) + const std::shared_ptr &font) : m_style(text_style), m_text(std::move(text)), m_font(font) @@ -47,7 +49,7 @@ namespace sdlk2d vbo->unbind(); vao->unbind(); - this->m_font->load(this->m_text); + this->m_font->get_impl()->load(this->m_text); this->update_vertices(); } @@ -60,11 +62,11 @@ namespace sdlk2d uniform->set("u_text_rendering", true); uniform->set("u_use_vertex_color", false); - uniform->set("u_px_range", this->m_font->get_conf().m_pixel_range); + uniform->set("u_px_range", this->m_font->get_impl()->get_conf().m_pixel_range); uniform->set("u_color", this->m_style.m_fg_color.ndc()); uniform->set("u_bg_color", this->m_style.m_bg_color.ndc()); - this->m_font->get_texture()->bind(); + this->m_font->get_impl()->get_texture()->bind(); uniform->set("u_texture", 0); glDrawArrays(GL_TRIANGLES, 0, static_cast(m_vertices.size())); @@ -75,13 +77,13 @@ namespace sdlk2d this->m_geometry->get_vao()->bind(); this->m_vertices.clear(); - const auto font_metrics = this->m_font->get_metrics(); + const auto font_metrics = this->m_font->get_impl()->get_metrics(); const auto scale = this->m_style.m_size / static_cast(font_metrics.emSize); glm::vec2 pen{ 0.0f, static_cast(font_metrics.ascenderY) * scale }; for (const char32_t &c : this->m_text) { - const auto &opt_glyph = this->m_font->get(c); + const auto &opt_glyph = this->m_font->get_impl()->get(c); if (!opt_glyph.has_value()) continue; @@ -103,7 +105,7 @@ namespace sdlk2d float x1 = pen.x + static_cast(pr) * scale; float y1 = pen.y - static_cast(pb) * scale; - const auto &atlas = this->m_font->get_bitmap(); + const auto &atlas = this->m_font->get_impl()->get_bitmap(); float u0 = static_cast(ul) / static_cast(atlas.width); float v0 = static_cast(ut) / static_cast(atlas.height); float u1 = static_cast(ur) / static_cast(atlas.width); From 20ae1c12d511e44e14cc70927da61bd065e9a257 Mon Sep 17 00:00:00 2001 From: RickaPrincy Date: Wed, 20 May 2026 18:13:09 +0300 Subject: [PATCH 3/3] feat: create new project & load new project using templi --- CMakeLists.txt | 3 +- sources/engine/CMakeLists.txt | 8 ++ sources/engine/conf/sdlk_engine_conf.cpp | 15 ++- sources/engine/conf/sdlk_engine_conf.hpp | 4 +- sources/engine/types/project.cpp | 32 +++++- sources/engine/types/project.hpp | 3 + sources/engine/utils/utils.cpp | 30 ++++++ sources/engine/utils/utils.hpp | 14 +++ sources/engine/views/home/components.hpp | 10 +- .../engine/views/home/draw_create_project.cpp | 101 ++++++++++++++++++ .../engine/views/home/draw_home_options.cpp | 53 +++++++++ .../engine/views/home/get_last_projects.cpp | 22 ++++ sources/engine/views/home/home.cpp | 74 ++----------- .../engine/views/home/trigger_new_project.cpp | 41 +++++++ .../views/home/trigger_open_project.cpp | 21 ++++ .../views/project_editor/project_editor.cpp | 13 ++- 16 files changed, 372 insertions(+), 72 deletions(-) create mode 100644 sources/engine/utils/utils.cpp create mode 100644 sources/engine/utils/utils.hpp create mode 100644 sources/engine/views/home/draw_create_project.cpp create mode 100644 sources/engine/views/home/draw_home_options.cpp create mode 100644 sources/engine/views/home/get_last_projects.cpp create mode 100644 sources/engine/views/home/trigger_new_project.cpp create mode 100644 sources/engine/views/home/trigger_open_project.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 76eb56e..729a102 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -# SDL2 +find_package(imgui CONFIG REQUIRED) find_package(imgui CONFIG REQUIRED) find_package(nfd CONFIG REQUIRED) find_package(glm CONFIG REQUIRED) @@ -16,6 +16,7 @@ find_package(SDL2_image CONFIG REQUIRED) find_package(nlohmann_json CONFIG REQUIRED) find_path(EARCUT_HPP_INCLUDE_DIRS "mapbox/earcut.hpp") find_package(Freetype REQUIRED) +find_package(Templi CONFIG REQUIRED) # 4.1.31 set(SDLK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(SDLK_IS_MAIN_PROJECT OFF) diff --git a/sources/engine/CMakeLists.txt b/sources/engine/CMakeLists.txt index d4da990..8e76334 100644 --- a/sources/engine/CMakeLists.txt +++ b/sources/engine/CMakeLists.txt @@ -7,7 +7,13 @@ set(SDLK_ENGINE_SOURCES views/home/draw_project_card.cpp conf/sdlk_engine_conf.cpp utils/os.cpp + utils/utils.cpp views/project_editor/project_editor.cpp + views/home/trigger_open_project.cpp + views/home/trigger_new_project.cpp + views/home/get_last_projects.cpp + views/home/draw_home_options.cpp + views/home/draw_create_project.cpp ) add_executable(${SDLK_ENGINE_NAME} ${SDLK_ENGINE_SOURCES}) @@ -22,6 +28,8 @@ target_include_directories(${SDLK_ENGINE_NAME} PRIVATE ${SDLK_SOURCE_DIR}/includ target_link_libraries(${SDLK_ENGINE_NAME} PRIVATE ${SDLK_LIB_NAME}) +target_link_libraries(${SDLK_ENGINE_NAME} PRIVATE Templi) + set_target_properties(${SDLK_ENGINE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") if (SDLK_ENGINE_INSTALL) diff --git a/sources/engine/conf/sdlk_engine_conf.cpp b/sources/engine/conf/sdlk_engine_conf.cpp index 03588b7..7578b89 100644 --- a/sources/engine/conf/sdlk_engine_conf.cpp +++ b/sources/engine/conf/sdlk_engine_conf.cpp @@ -13,6 +13,7 @@ #define SDLK_CONF_DIRECTORY ".sdlk-engine" #define SDLK_CONF_FILE "sdlk-engine.conf.json" +#define SDLK_TEMPLATE_DIRECTORY "template-release" using json = nlohmann::json; @@ -20,10 +21,22 @@ sdlk_engine_conf::sdlk_engine_conf(std::string version, const std::vector std::filesystem::path +{ + const auto home_path = std::filesystem::path(os::get_home_dir()); + return home_path / SDLK_CONF_DIRECTORY; +} + auto sdlk_engine_conf::get_file_path() -> std::filesystem::path { const auto home_path = std::filesystem::path(os::get_home_dir()); - return std::filesystem::path(home_path / SDLK_CONF_DIRECTORY) / SDLK_CONF_FILE; + return get_config_path() / SDLK_CONF_FILE; +} + +auto sdlk_engine_conf::get_template_path() -> std::filesystem::path +{ + const auto home_path = std::filesystem::path(os::get_home_dir()); + return get_config_path() / SDLK_TEMPLATE_DIRECTORY; } auto sdlk_engine_conf::is_valid(const std::filesystem::path& file_conf_path) -> bool diff --git a/sources/engine/conf/sdlk_engine_conf.hpp b/sources/engine/conf/sdlk_engine_conf.hpp index 5bd456a..2625e0e 100644 --- a/sources/engine/conf/sdlk_engine_conf.hpp +++ b/sources/engine/conf/sdlk_engine_conf.hpp @@ -16,13 +16,15 @@ class sdlk_engine_conf public: static constexpr size_t MAX_RECENTS = 6; + [[nodiscard]] static auto get_template_path() -> std::filesystem::path; + [[nodiscard]] static auto get_config_path() -> std::filesystem::path; [[nodiscard]] static auto get_file_path() -> std::filesystem::path; [[nodiscard]] static auto load_or_init() -> sdlk_engine_conf*; auto save() const -> void; auto add_recent_project(const std::string& path) -> void; - auto get_last_project_paths() const -> std::vector; + [[nodiscard]] auto get_last_project_paths() const -> std::vector; [[nodiscard]] static auto is_valid(const std::filesystem::path &file_conf_path) -> bool; sdlk_engine_conf(std::string version, const std::vector &last_projects); diff --git a/sources/engine/types/project.cpp b/sources/engine/types/project.cpp index 31ee1b5..fbae400 100644 --- a/sources/engine/types/project.cpp +++ b/sources/engine/types/project.cpp @@ -8,8 +8,9 @@ #include #include #include -#include "../utils/json_reader.hpp" #include + +#include "../utils/json_reader.hpp" #include "../conf/sdlk_engine_conf.hpp" #define SDLK_PROJECT_FILE_CONF_NAME "sdlk_engine.json" @@ -25,6 +26,10 @@ namespace sdlk this->m_name = project_conf["name"]; } + project::project(std::string path, std::string name) + : m_name(std::move(name)), m_path(std::move(path)) + {} + auto project::open() const -> void { const auto engine = app::get(); @@ -45,4 +50,29 @@ namespace sdlk { return this->m_path; } + + auto project::save() const -> void + { + if (this->m_path.empty()) + { + throw std::runtime_error("Cannot save project: empty path"); + } + + const std::filesystem::path project_dir(this->m_path); + if (!std::filesystem::exists(project_dir)) + { + throw std::runtime_error("Cannot save project: directory does not exist"); + } + + json project_conf; + project_conf["name"] = this->m_name; + + const auto file_path = project_dir / SDLK_PROJECT_FILE_CONF_NAME; + std::ofstream file(file_path); + if (!file.is_open()) + { + throw std::runtime_error("Cannot open project file for saving"); + } + file << project_conf.dump(2); + } } // namespace sdlk \ No newline at end of file diff --git a/sources/engine/types/project.hpp b/sources/engine/types/project.hpp index a38209b..d3c4b3b 100644 --- a/sources/engine/types/project.hpp +++ b/sources/engine/types/project.hpp @@ -15,8 +15,11 @@ namespace sdlk public: explicit project(std::string path); + explicit project(std::string path, std::string name); auto open() const -> void; + auto save() const -> void; + [[nodiscard]] auto get_name() -> std::string; [[nodiscard]] auto get_path() -> std::string; diff --git a/sources/engine/utils/utils.cpp b/sources/engine/utils/utils.cpp new file mode 100644 index 0000000..d3ad647 --- /dev/null +++ b/sources/engine/utils/utils.cpp @@ -0,0 +1,30 @@ +// +// Created by ricka on 2026-05-20. +// + +#include "utils.hpp" + +auto utils::sanitize(const std::string &name, const int max_length) -> std::string +{ + std::string result; + result.reserve(name.size()); + + for (const char c : name) + { + if (std::isalnum(static_cast(c))) + { + result += static_cast(static_cast(c)); + } + else if (c == ' ' || c == '-' || c == '_') + { + result += '_'; + } + } + + if (result.size() > static_cast(max_length)) + { + result = result.substr(0, max_length); + } + + return result; +} diff --git a/sources/engine/utils/utils.hpp b/sources/engine/utils/utils.hpp new file mode 100644 index 0000000..8a4b601 --- /dev/null +++ b/sources/engine/utils/utils.hpp @@ -0,0 +1,14 @@ +// +// Created by ricka on 2026-05-20. +// + +#pragma once +#include + +class utils +{ +public: + utils() = delete; + + [[nodiscard]] static auto sanitize(const std::string& name, int max_length = 20) -> std::string; +}; diff --git a/sources/engine/views/home/components.hpp b/sources/engine/views/home/components.hpp index 0f955bf..8523fbf 100644 --- a/sources/engine/views/home/components.hpp +++ b/sources/engine/views/home/components.hpp @@ -5,11 +5,17 @@ #pragma once #include +#include #include "../../types/project.hpp" -# namespace sdlk { - auto draw_project_card(const std::shared_ptr& project) -> void; + auto trigger_open_project() -> void; + auto trigger_new_project(const std::string &path, const std::string &name) -> void; + [[nodiscard]] auto get_last_projects() -> std::vector>; + + auto draw_home_options(float content_width, bool &is_creating_new_project) -> void; + auto draw_create_project(float content_width, bool &is_creating_new_project) -> void; + auto draw_project_card(const std::shared_ptr& project) -> void; } diff --git a/sources/engine/views/home/draw_create_project.cpp b/sources/engine/views/home/draw_create_project.cpp new file mode 100644 index 0000000..80467bd --- /dev/null +++ b/sources/engine/views/home/draw_create_project.cpp @@ -0,0 +1,101 @@ +// +// Created by ricka on 2026-05-20. +// + +#include +#include +#include +#include +#include +#include + +#include "components.hpp" + +namespace sdlk +{ + static auto is_valid_project_name(const std::string& name) -> bool + { + static const std::regex pattern("^[a-zA-Z0-9_-]{3,32}$"); + return std::regex_match(name, pattern); + } + + auto draw_create_project(const float content_width, bool& is_creating_new_project) -> void + { + static std::string project_name; + static std::filesystem::path selected_folder; + + const bool name_valid = is_valid_project_name(project_name); + const bool folder_valid = !selected_folder.empty(); + const bool can_create = name_valid && folder_valid; + + ImGui::Spacing(); + ImGui::Text("Create New Project"); + ImGui::Separator(); + ImGui::Spacing(); + + ImGui::Text("Project name"); + char buffer[128] = {}; + std::snprintf(buffer, sizeof(buffer), "%s", project_name.c_str()); + ImGui::PushItemWidth(content_width); + if (ImGui::InputText("##project_name", buffer, sizeof(buffer))) + { + project_name = buffer; + } + ImGui::PopItemWidth(); + + if (!project_name.empty() && !name_valid) + { + ImGui::TextColored(ImVec4(1, 0.4f, 0.2f, 1), + "Invalid name (3-32 chars, a-z A-Z 0-9 _ -)"); + } + + ImGui::Spacing(); + ImGui::Text("Location"); + if (ImGui::Button("Choose folder", ImVec2(content_width, 0))) + { + if (const auto res = nfd_wrapper::instance()->open_folder_dialog(); res.m_type == nfd_open_dialog_result::type::success) + { + selected_folder = res.m_path.value(); + } + } + + ImGui::TextDisabled("%s", + selected_folder.empty() + ? "No folder selected" + : selected_folder.string().c_str()); + + ImGui::Spacing(); + ImGui::Separator(); + ImGui::Spacing(); + + const float btn_width = (content_width - 10.0f) * 0.5f; + if (!can_create) + { + ImGui::BeginDisabled(); + } + + if (ImGui::Button("Create", ImVec2(btn_width, 0))) + { + trigger_new_project(selected_folder, project_name); + project_name.clear(); + selected_folder.clear(); + is_creating_new_project = false; + } + + if (!can_create) + { + ImGui::EndDisabled(); + } + + ImGui::SameLine(); + if (ImGui::Button("Cancel", ImVec2(btn_width, 0))) + { + project_name.clear(); + selected_folder.clear(); + is_creating_new_project = false; + } + + ImGui::Spacing(); + ImGui::TextDisabled("Allowed: 3-32 chars, letters, numbers, _ and -"); + } +} diff --git a/sources/engine/views/home/draw_home_options.cpp b/sources/engine/views/home/draw_home_options.cpp new file mode 100644 index 0000000..0c3f495 --- /dev/null +++ b/sources/engine/views/home/draw_home_options.cpp @@ -0,0 +1,53 @@ +// +// Created by ricka on 2026-05-20. +// + +#include +#include +#include "components.hpp" + +namespace sdlk +{ + auto draw_home_options(const float content_width, bool &is_creating_new_project) -> void + { + static auto projects = get_last_projects(); + + if (ImGui::Button("Create a new Project", ImVec2(content_width, 0))) + { + is_creating_new_project = true; + return; + } + + imgui_drawer_utils::spacing(); + if (ImGui::Button("Open a Project", ImVec2(content_width, 0))) + { + trigger_open_project(); + } + + imgui_drawer_utils::spacing(); + ImGui::Separator(); + imgui_drawer_utils::spacing(); + + ImGui::Text("Last Projects"); + imgui_drawer_utils::spacing(); + + constexpr float padding = 8.0f; + constexpr float card_size = 140.0f; + const float available_width = content_width; + int times_per_row = static_cast(available_width / (card_size + padding)); + + if (times_per_row < 1) + { + times_per_row = 1; + } + + for (int i = 0; i < projects.size(); ++i) + { + if (i != 0 && i % times_per_row != 0) + { + ImGui::SameLine(0, padding); + } + draw_project_card(projects[i]); + } + } +} \ No newline at end of file diff --git a/sources/engine/views/home/get_last_projects.cpp b/sources/engine/views/home/get_last_projects.cpp new file mode 100644 index 0000000..23beed1 --- /dev/null +++ b/sources/engine/views/home/get_last_projects.cpp @@ -0,0 +1,22 @@ +// +// Created by ricka on 2026-05-20. +// + +#include "components.hpp" +#include "../../conf/sdlk_engine_conf.hpp" + +namespace sdlk +{ + auto get_last_projects() -> std::vector> + { + std::vector> projects{}; + projects.reserve(sdlk_engine_conf::MAX_RECENTS); + + const auto last_project_paths = sdlk_engine_conf::load_or_init()->get_last_project_paths(); + for (const auto& path : last_project_paths) + { + projects.emplace_back(std::make_shared(path)); + } + return projects; + } +} diff --git a/sources/engine/views/home/home.cpp b/sources/engine/views/home/home.cpp index 0c5d1e7..d7ad0e0 100644 --- a/sources/engine/views/home/home.cpp +++ b/sources/engine/views/home/home.cpp @@ -4,20 +4,16 @@ #include +#include #include #include #include #include "components.hpp" -#include "../view.hpp" -#include "../../types/project.hpp" -#include "../../conf/sdlk_engine_conf.hpp" namespace sdlk { static auto draw_home_content() -> void; - static auto open_existing_project() -> void; - static auto get_last_projects() -> std::vector>; auto home() -> std::shared_ptr { @@ -42,6 +38,7 @@ namespace sdlk }, [] { + static bool is_creating_new_project = false; ImGui::Begin("Welcome to SDLK Game Creator", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | @@ -52,67 +49,16 @@ namespace sdlk imgui_drawer_utils::image(logo, ImVec2{ content_width, 300.0F }); imgui_drawer_utils::spacing(2); - ImGui::Button("Create a new Project", ImVec2(content_width, 0)); - - imgui_drawer_utils::spacing(); - - if (ImGui::Button("Open a Project", ImVec2(content_width, 0))) - { - open_existing_project(); - } - - imgui_drawer_utils::spacing(); - ImGui::Separator(); - imgui_drawer_utils::spacing(); - - ImGui::Text("Last Projects"); - imgui_drawer_utils::spacing(); - - constexpr float padding = 8.0f; - constexpr float card_size = 140.0f; - const float available_width = content_width; - int times_per_row = static_cast(available_width / (card_size + padding)); - - if (times_per_row < 1) - { - times_per_row = 1; - } - - for (int i = 0; i < projects.size(); ++i) - { - if (i != 0 && i % times_per_row != 0) - { - ImGui::SameLine(0, padding); - } - draw_project_card(projects[i]); - } + if (is_creating_new_project) + { + draw_create_project(content_width, is_creating_new_project); + } + else + { + draw_home_options(content_width, is_creating_new_project); + } ImGui::End(); }); } - - auto open_existing_project() -> void - { - if (const auto response = nfd_wrapper::instance()->open_folder_dialog(); - response.m_type == nfd_open_dialog_result::type::success) - { - auto path = response.m_path; - const auto to_open = std::make_shared(path.value()); - - to_open->open(); - } - } - - auto get_last_projects() -> std::vector> - { - std::vector> projects{}; - - projects.reserve(sdlk_engine_conf::MAX_RECENTS); - const auto last_project_paths = sdlk_engine_conf::load_or_init()->get_last_project_paths(); - for (const auto& path : last_project_paths) - { - projects.emplace_back(std::make_shared(path)); - } - return projects; - } } // namespace sdlk \ No newline at end of file diff --git a/sources/engine/views/home/trigger_new_project.cpp b/sources/engine/views/home/trigger_new_project.cpp new file mode 100644 index 0000000..d8eed1f --- /dev/null +++ b/sources/engine/views/home/trigger_new_project.cpp @@ -0,0 +1,41 @@ +// +// Created by ricka on 2026-05-20. +// + +#include +#include + +#include "../../conf/sdlk_engine_conf.hpp" +#include "../../types/project.hpp" +#include "../../utils/utils.hpp" + +#define GAME_NAME_PLACEHOLDER_NAME "GAME_NAME" + +namespace sdlk +{ + auto trigger_new_project(const std::string &path, const std::string &name) -> void + { + auto game_name = utils::sanitize(name); + const auto output_path = std::filesystem::path(path) / game_name; + const auto template_path = sdlk_engine_conf::get_template_path(); + + Templi::generate_with_templi_config( + template_path, + output_path, + [game_name](const Templi::Placeholder &placeholder) + { + if (placeholder.m_name == std::string(GAME_NAME_PLACEHOLDER_NAME)) + { + return game_name; + } + throw std::runtime_error("Placeholder not found: " + placeholder.m_name); + }); + + const auto created = std::make_shared(output_path.string(), game_name); + created->save(); + + sdlk_engine_conf::load_or_init()->add_recent_project(created->get_path()); + + created->open(); + } +} diff --git a/sources/engine/views/home/trigger_open_project.cpp b/sources/engine/views/home/trigger_open_project.cpp new file mode 100644 index 0000000..31c1748 --- /dev/null +++ b/sources/engine/views/home/trigger_open_project.cpp @@ -0,0 +1,21 @@ +// +// Created by ricka on 2026-05-20. +// + +#include +#include "../../types/project.hpp" + +namespace sdlk +{ + auto trigger_open_project() -> void + { + if (const auto response = nfd_wrapper::instance()->open_folder_dialog(); + response.m_type == nfd_open_dialog_result::type::success) + { + auto path = response.m_path; + const auto to_open = std::make_shared(path.value()); + + to_open->open(); + } + } +} diff --git a/sources/engine/views/project_editor/project_editor.cpp b/sources/engine/views/project_editor/project_editor.cpp index 410aa42..4f5f10c 100644 --- a/sources/engine/views/project_editor/project_editor.cpp +++ b/sources/engine/views/project_editor/project_editor.cpp @@ -5,14 +5,23 @@ #include "../view.hpp" #include #include +#include +#include + +#include "sdlk/core/components/2d/fonts/msdf_font.hpp" +#include "sdlk/core/components/2d/shape/text_shape.hpp" static auto draw_project_content(std::weak_ptr parent_view) -> std::function; auto sdlk::project_editor() -> std::shared_ptr { auto project_view = std::make_shared(); - auto content_drawer = draw_project_content(project_view); - project_view->add_child(imgui_renderable::make(std::move(content_drawer))); + const auto content_drawer = draw_project_content(project_view); + + project_view->add_child(imgui_renderable::make(content_drawer)); + project_view->add_event_listener(event_type::key_down, [](const auto& event) { + std::cout << "Key down" << std::endl; + }); return project_view; }