From 8affda125e247ce1797bef1ed1ffa6c0ca1580df Mon Sep 17 00:00:00 2001 From: Jasper Date: Sun, 22 May 2022 22:25:20 +0200 Subject: [PATCH] Log FPS --- .clang-format | 5 ++++- CMakeLists.txt | 15 +++++++++++++-- src/App.cpp | 15 +++++++++++++++ src/widgets.cpp | 1 + 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.clang-format b/.clang-format index eb1167f..5e6b0f7 100644 --- a/.clang-format +++ b/.clang-format @@ -68,7 +68,10 @@ ForEachMacros: - BOOST_FOREACH IncludeBlocks: Regroup IncludeCategories: - - Regex: '^[<"](fmt|SDL2)/' + - Regex: '^[<"]SDL2/' + Priority: 2 + SortPriority: 0 + - Regex: '^[<"](fmt|spdlog)/' Priority: 3 SortPriority: 0 - Regex: "^<" diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ee311f..2c9ebe1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,17 @@ endif() if (NOT DEFINED fmt_INCLUDE_DIR) set(fmt_INCLUDE_DIR ${fmt_SOURCE_DIR}/${FMT_INC_DIR}) endif() -set(BUILD_SHARED_LIBS ${lhotse_orig_BUILD_SHARED_LIBS}) +set(BUILD_SHARED_LIBS ${stw_display_orig_BUILD_SHARED_LIBS}) + +# spdlog +set(CMAKE_POSITION_INDEPENDENT_CODE true) +set(SPDLOG_FMT_EXTERNAL_HO true) +FetchContent_Declare( + spdlog + GIT_REPOSITORY https://github.com/gabime/spdlog.git + GIT_TAG v1.9.2 +) +FetchContent_MakeAvailable(spdlog) # }}} @@ -57,5 +67,6 @@ target_link_libraries( ${SDL2_LIBRARIES} ${SDL2TTF_LIBRARY} ${SDL2IMAGE_LIBRARY} - fmt) + fmt + spdlog::spdlog) add_dependencies(stw-display fmt) \ No newline at end of file diff --git a/src/App.cpp b/src/App.cpp index e9d16ab..82e12d6 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -7,7 +7,11 @@ #include #include #include +#include +#include + #include +#include #include #include @@ -42,9 +46,20 @@ int App::run() { running = true; + uint32_t second_start = SDL_GetTicks(); + unsigned frames = 0; while (running) { + uint32_t now = SDL_GetTicks(); + if (now - second_start > 5000) { + spdlog::info("{} FPS", frames / 5); + second_start = now; + frames = 0; + } + handle_events(); render(); + + frames++; SDL_Delay(1); } diff --git a/src/widgets.cpp b/src/widgets.cpp index 04eb529..5cb5bd6 100644 --- a/src/widgets.cpp +++ b/src/widgets.cpp @@ -5,6 +5,7 @@ #include #include + #include #include