From a8f85556124e0c06ef07a7ab7b576d8f5c9e9bdf Mon Sep 17 00:00:00 2001 From: Jayden Grubb Date: Fri, 14 Mar 2025 20:41:03 +1000 Subject: [PATCH] Add NOVA_FUNC_NAME macro --- engine/include/nova/core/debug.h | 17 ++++++++--------- engine/src/core/debug.cpp | 1 - 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/engine/include/nova/core/debug.h b/engine/include/nova/core/debug.h index 71269a7..a3d3c74 100644 --- a/engine/include/nova/core/debug.h +++ b/engine/include/nova/core/debug.h @@ -11,12 +11,6 @@ #include -#ifdef _MSC_VER - #define NOVA_FUNC_NAME __FUNCTION__ -#else - #define NOVA_FUNC_NAME __PRETTY_FUNCTION__ -#endif - namespace Nova { namespace Internals { NOVA_API void _assert_fail(std::string_view assertion, std::string_view file, std::string_view func, int line); @@ -57,10 +51,15 @@ namespace Nova { #define NOVA_DEBUG(...) ::Nova::Debug::get_logger()->debug(__VA_ARGS__) #define NOVA_TRACE(...) ::Nova::Debug::get_logger()->trace(__VA_ARGS__) -#define NOVA_AUTO_TRACE() NOVA_TRACE("{}()", ::Nova::Internals::_format_func_name(NOVA_FUNC_NAME)) +#ifdef _MSC_VER + #define NOVA_FUNC_NAME ::Nova::Internals::_format_func_name(__FUNCTION__) +#else + #define NOVA_FUNC_NAME ::Nova::Internals::_format_func_name(__PRETTY_FUNCTION__) +#endif + +#define NOVA_AUTO_TRACE() NOVA_TRACE("{}()", NOVA_FUNC_NAME) #define NOVA_ASSERT(expr) \ (static_cast(expr) \ ? static_cast(0) \ - : ::Nova::Internals:: \ - _assert_fail(#expr, __FILE__, ::Nova::Internals::_format_func_name(NOVA_FUNC_NAME), __LINE__)) + : ::Nova::Internals::_assert_fail(#expr, __FILE__, NOVA_FUNC_NAME, __LINE__)) diff --git a/engine/src/core/debug.cpp b/engine/src/core/debug.cpp index 9d8f23c..346774b 100644 --- a/engine/src/core/debug.cpp +++ b/engine/src/core/debug.cpp @@ -13,7 +13,6 @@ std::shared_ptr Debug::get_logger() { static std::shared_ptr s_logger; if (!s_logger) { s_logger = spdlog::stdout_color_mt("NOVA"); - s_logger->set_level(spdlog::level::trace); s_logger->set_pattern("%^[%T] %n: %v%$"); } return s_logger;