Skip to content

Commit

Permalink
chore: Updated submodule dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mfep committed Jun 14, 2024
1 parent cd97d9e commit c036bff
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion external/imgui
Submodule imgui updated 171 files
2 changes: 1 addition & 1 deletion external/imnodes
2 changes: 1 addition & 1 deletion external/libspng
2 changes: 1 addition & 1 deletion external/portable-file-dialogs
2 changes: 1 addition & 1 deletion external/rtmidi
Submodule rtmidi updated 103 files
4 changes: 2 additions & 2 deletions src/ResourceLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <vector>

CMRC_DECLARE(midiconn_resources);
bool ImGui_ImplSDLRenderer_CreateFontsTexture();
bool ImGui_ImplSDLRenderer2_CreateFontsTexture();

namespace mc
{
Expand Down Expand Up @@ -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
10 changes: 5 additions & 5 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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();

Expand All @@ -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();
Expand Down

0 comments on commit c036bff

Please sign in to comment.