diff --git a/external/imgui/CMakeLists.txt b/external/imgui/CMakeLists.txt index ebeb86f1..77c00742 100644 --- a/external/imgui/CMakeLists.txt +++ b/external/imgui/CMakeLists.txt @@ -17,4 +17,5 @@ add_library(imgui imgui/backends/imgui_impl_vulkan.h imgui/backends/imgui_impl_vulkan.cpp) -target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIRS} imgui imgui/backends) \ No newline at end of file +target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIRS} imgui imgui/backends) +#target_compile_definitions(imgui PRIVATE VK_NO_PROTOTYPES) \ No newline at end of file diff --git a/external/parallel-rdp/ParallelRDPWrapper.hpp b/external/parallel-rdp/ParallelRDPWrapper.hpp index a8eab8bb..86f4f747 100644 --- a/external/parallel-rdp/ParallelRDPWrapper.hpp +++ b/external/parallel-rdp/ParallelRDPWrapper.hpp @@ -1,4 +1,5 @@ #pragma once +#define VULKAN_DEBUG #include #include #include diff --git a/src/frontend/imgui/Window.cpp b/src/frontend/imgui/Window.cpp index a220b4d0..c0ef4c10 100644 --- a/src/frontend/imgui/Window.cpp +++ b/src/frontend/imgui/Window.cpp @@ -22,7 +22,7 @@ void Window::InitSDL() { "natsukashii", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, - 1280, 720, + 800, 600, SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI ); @@ -155,6 +155,7 @@ void Window::InitImgui() { //io.Fonts->AddFontFromFileTTF("../../misc/fonts/ProggyTiny.ttf", 10.0f); //ImFont* font = io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, NULL, io.Fonts->GetGlyphRangesJapanese()); //IM_ASSERT(font != NULL); + io.Fonts->AddFontDefault(); // Upload Fonts {