Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade deps #28

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Upgrade deps #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d15bdf0
Upgrade dependencies
MartinHelmut Sep 12, 2024
386bc0e
Add extended ImGui debug panels
MartinHelmut Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/core/Core/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ ExitStatus App::Application::run() {
if (ImGui::BeginMenu("View")) {
ImGui::MenuItem("Some Panel", nullptr, &m_show_some_panel);
ImGui::MenuItem("ImGui Demo Panel", nullptr, &m_show_demo_panel);
ImGui::MenuItem("Debug Panel", nullptr, &m_show_debug_panel);
ImGui::MenuItem("Debug Panels", nullptr, &m_show_debug_panel);
ImGui::EndMenu();
}

Expand All @@ -133,7 +133,10 @@ ExitStatus App::Application::run() {

// Debug panel
if (m_show_debug_panel) {
ImGui::Begin("Debug panel", &m_show_debug_panel);
ImGui::ShowMetricsWindow();
ImGui::ShowDebugLogWindow();

ImGui::Begin("App debug panel", &m_show_debug_panel);
ImGui::Text("User config path: %s", user_config_path.c_str());
ImGui::Separator();
ImGui::Text("Font path: %s", font_path.c_str());
Expand Down
3 changes: 1 addition & 2 deletions src/core/Core/Window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ Window::Window(const Settings& settings) {
size.height,
window_flags);

auto renderer_flags{
static_cast<SDL_RendererFlags>(SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED)};
Uint32 renderer_flags{SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED};
m_renderer = SDL_CreateRenderer(m_window, -1, renderer_flags);

if (m_renderer == nullptr) {
Expand Down
6 changes: 3 additions & 3 deletions vendor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ FetchContent_Declare(
FetchContent_Declare(
fmt
GIT_REPOSITORY "https://github.com/fmtlib/fmt.git"
GIT_TAG 11.0.1
GIT_TAG 11.0.2
)

FetchContent_Declare(
imgui
GIT_REPOSITORY "https://github.com/ocornut/imgui.git"
GIT_TAG 527b2c45af2f8964f95826bd16ab7c7ed372ae41 # Branch: docking, date: 02.07.2024, 19:05 GMT+2
GIT_TAG 68aa9a86ec933510073932980a0940742ecc833c # Branch: docking, date: 10.09.2024, 04:29 GMT+2
)

FetchContent_Declare(
SDL2
GIT_REPOSITORY "https://github.com/libsdl-org/SDL.git"
GIT_TAG release-2.30.5
GIT_TAG release-2.30.7
)

FetchContent_Declare(
Expand Down
5 changes: 1 addition & 4 deletions vendor/imgui-setup/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
FetchContent_GetProperties(imgui)
if (NOT imgui_POPULATED)
FetchContent_Populate(imgui)
endif ()
FetchContent_MakeAvailable(imgui)

add_library(imgui
${imgui_SOURCE_DIR}/imgui.cpp ${imgui_SOURCE_DIR}/imgui.h
Expand Down