From c036bffb871f519bfd5ecd73ed4ec4690d1740bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C5=91rinc=20Serf=C5=91z=C5=91?= Date: Fri, 14 Jun 2024 10:40:28 +0200 Subject: [PATCH] chore: Updated submodule dependencies --- CMakeLists.txt | 2 +- external/imgui | 2 +- external/imnodes | 2 +- external/libspng | 2 +- external/portable-file-dialogs | 2 +- external/rtmidi | 2 +- src/ResourceLoader.cpp | 4 ++-- src/main.cpp | 10 +++++----- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60e19f0..79b3ce6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ set(sources external/imgui/imgui_tables.cpp external/imgui/imgui_widgets.cpp external/imgui/backends/imgui_impl_sdl2.cpp - external/imgui/backends/imgui_impl_sdlrenderer.cpp + external/imgui/backends/imgui_impl_sdlrenderer2.cpp external/imgui/misc/freetype/imgui_freetype.cpp external/imnodes/imnodes.cpp src/ActivityIndicator.cpp diff --git a/external/imgui b/external/imgui index 458a109..6f7b5d0 160000 --- a/external/imgui +++ b/external/imgui @@ -1 +1 @@ -Subproject commit 458a1090314a965dd37b02c918d83077a0142ad5 +Subproject commit 6f7b5d0ee2fe9948ab871a530888a6dc5c960700 diff --git a/external/imnodes b/external/imnodes index 277fdd7..8563e16 160000 --- a/external/imnodes +++ b/external/imnodes @@ -1 +1 @@ -Subproject commit 277fdd7a912e622a2476981fea14c68abcb6b3c8 +Subproject commit 8563e1655bd9bb1f249e6552cc6274d506ee788b diff --git a/external/libspng b/external/libspng index ea6ca5b..fb76800 160000 --- a/external/libspng +++ b/external/libspng @@ -1 +1 @@ -Subproject commit ea6ca5bc18246a338a40b8ae0a55f77928442e28 +Subproject commit fb768002d4288590083a476af628e51c3f1d47cd diff --git a/external/portable-file-dialogs b/external/portable-file-dialogs index 67e7b09..7f852d8 160000 --- a/external/portable-file-dialogs +++ b/external/portable-file-dialogs @@ -1 +1 @@ -Subproject commit 67e7b0945aac80efa2ec5c72de98b47f7552735c +Subproject commit 7f852d88a480020d7f91957cbcefe514fc95000c diff --git a/external/rtmidi b/external/rtmidi index 806e18f..1e5b499 160000 --- a/external/rtmidi +++ b/external/rtmidi @@ -1 +1 @@ -Subproject commit 806e18f575b68c23b26f9398e1b6866b335b5308 +Subproject commit 1e5b49925aa60065db52de44c366d446a902547b diff --git a/src/ResourceLoader.cpp b/src/ResourceLoader.cpp index df07bee..c25e61b 100644 --- a/src/ResourceLoader.cpp +++ b/src/ResourceLoader.cpp @@ -10,7 +10,7 @@ #include CMRC_DECLARE(midiconn_resources); -bool ImGui_ImplSDLRenderer_CreateFontsTexture(); +bool ImGui_ImplSDLRenderer2_CreateFontsTexture(); namespace mc { @@ -103,7 +103,7 @@ void ResourceLoader::load_fonts(const float scale) icons_ranges); // workaround, otherwise the fonts won't rebuild properly - ImGui_ImplSDLRenderer_CreateFontsTexture(); + ImGui_ImplSDLRenderer2_CreateFontsTexture(); } } // namespace mc diff --git a/src/main.cpp b/src/main.cpp index a96c230..0cab909 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,7 +5,7 @@ #include "SDL2/SDL.h" #include "SDL2/SDL_syswm.h" #include "backends/imgui_impl_sdl2.h" -#include "backends/imgui_impl_sdlrenderer.h" +#include "backends/imgui_impl_sdlrenderer2.h" #include "imgui.h" #include "imnodes.h" #include "spdlog/sinks/rotating_file_sink.h" @@ -80,7 +80,7 @@ MC_MAIN ImNodes::GetIO().EmulateThreeButtonMouse.Modifier = &ImGui::GetIO().KeyCtrl; // Setup Platform/Renderer backends - ImGui_ImplSDLRenderer_Init(renderer); + ImGui_ImplSDLRenderer2_Init(renderer); ImGui_ImplSDL2_InitForSDLRenderer(window, renderer); // Load Fonts @@ -145,7 +145,7 @@ MC_MAIN app.update_outside_frame(); // Start the Dear ImGui frame - ImGui_ImplSDLRenderer_NewFrame(); + ImGui_ImplSDLRenderer2_NewFrame(); ImGui_ImplSDL2_NewFrame(); ImGui::NewFrame(); @@ -162,12 +162,12 @@ MC_MAIN // Rendering ImGui::Render(); SDL_RenderClear(renderer); - ImGui_ImplSDLRenderer_RenderDrawData(ImGui::GetDrawData()); + ImGui_ImplSDLRenderer2_RenderDrawData(ImGui::GetDrawData(), renderer); SDL_RenderPresent(renderer); } } - ImGui_ImplSDLRenderer_Shutdown(); + ImGui_ImplSDLRenderer2_Shutdown(); ImGui_ImplSDL2_Shutdown(); ImNodes::DestroyContext(); ImGui::DestroyContext();