From d8f656d98bf8cc64c9a912048aebb9e478225fba Mon Sep 17 00:00:00 2001 From: light7734 Date: Mon, 7 Jul 2025 15:54:55 +0330 Subject: [PATCH] refactor: extract logger to separate module --- modules/CMakeLists.txt | 2 ++ modules/engine/CMakeLists.txt | 4 +--- modules/engine/include/engine/base/base.hpp | 4 ++-- modules/engine/include/engine/engine.hpp | 2 +- modules/logger/CMakeLists.txt | 2 ++ .../engine/debug => logger/include/logger}/logger.hpp | 1 - modules/{engine/src/debug => logger/src}/logger.cpp | 5 +---- 7 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 modules/logger/CMakeLists.txt rename modules/{engine/include/engine/debug => logger/include/logger}/logger.hpp (99%) rename modules/{engine/src/debug => logger/src}/logger.cpp (66%) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index e04a6b5..2935070 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -1,3 +1,5 @@ +add_subdirectory(./logger) + add_subdirectory(./asset_baker) add_subdirectory(./asset_parser) diff --git a/modules/engine/CMakeLists.txt b/modules/engine/CMakeLists.txt index 70842eb..22206cb 100644 --- a/modules/engine/CMakeLists.txt +++ b/modules/engine/CMakeLists.txt @@ -9,7 +9,6 @@ if(NOT WIN32) core/uuid.cpp debug/exceptions.cpp debug/instrumentor.cpp - debug/logger.cpp graphics/blender.cpp graphics/buffers.cpp graphics/framebuffer.cpp @@ -53,7 +52,6 @@ else() core/uuid.cpp debug/exceptions.cpp debug/instrumentor.cpp - debug/logger.cpp graphics/blender.cpp graphics/buffers.cpp graphics/framebuffer.cpp @@ -102,9 +100,9 @@ endif() target_link_libraries( engine PUBLIC glad + PUBLIC logger PUBLIC opengl::opengl PUBLIC glfw - PUBLIC spdlog::spdlog PUBLIC imgui PUBLIC stb::stb PUBLIC yaml-cpp::yaml-cpp diff --git a/modules/engine/include/engine/base/base.hpp b/modules/engine/include/engine/base/base.hpp index 3190644..eb563a6 100644 --- a/modules/engine/include/engine/base/base.hpp +++ b/modules/engine/include/engine/base/base.hpp @@ -95,7 +95,7 @@ auto linux_only(auto value) { \ if (!(x)) \ { \ - log_crt(__VA_ARGS__); \ + log_crt(__VA_ARGS__); \ lt_debug_trap(); \ throw ::Light::FailedAssertion(__FILE__, __LINE__); \ } \ @@ -122,7 +122,7 @@ constexpr auto bit(auto x) /* debug */ #ifndef LIGHT_LOGGER_H - #include + #include #endif #include diff --git a/modules/engine/include/engine/engine.hpp b/modules/engine/include/engine/engine.hpp index 2fd016e..2658e31 100644 --- a/modules/engine/include/engine/engine.hpp +++ b/modules/engine/include/engine/engine.hpp @@ -8,7 +8,7 @@ #include // debug -#include +#include // events #include diff --git a/modules/logger/CMakeLists.txt b/modules/logger/CMakeLists.txt new file mode 100644 index 0000000..d30eda2 --- /dev/null +++ b/modules/logger/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library_module(logger logger.cpp) +target_link_libraries(logger PUBLIC spdlog::spdlog) diff --git a/modules/engine/include/engine/debug/logger.hpp b/modules/logger/include/logger/logger.hpp similarity index 99% rename from modules/engine/include/engine/debug/logger.hpp rename to modules/logger/include/logger/logger.hpp index 55e5cf4..776de55 100644 --- a/modules/engine/include/engine/debug/logger.hpp +++ b/modules/logger/include/logger/logger.hpp @@ -1,6 +1,5 @@ #pragma once -#include #include #include #include diff --git a/modules/engine/src/debug/logger.cpp b/modules/logger/src/logger.cpp similarity index 66% rename from modules/engine/src/debug/logger.cpp rename to modules/logger/src/logger.cpp index a37ff5f..6fb4607 100644 --- a/modules/engine/src/debug/logger.cpp +++ b/modules/logger/src/logger.cpp @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include Logger::Logger(): spd_logger(spdlog::stdout_color_mt("Logger")) {