Skip to content

Commit ee7adf3

Browse files
committed
-Dev: final touches on logger
1 parent 3ac9169 commit ee7adf3

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

include/engine/graphics/utilities/bootstrap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ inline static VKAPI_ATTR VkBool32 VKAPI_CALL debugCallback(VkDebugUtilsMessageSe
2929
const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData,
3030
void* pUserData) {
3131

32-
LOG_DEBUG("(Validation Layer) " + std::string(pCallbackData->pMessage));
32+
LOG_DEBUG(Logger::format_with_tag("[Validation Layer]", "\033[34m", pCallbackData->pMessage));
3333

3434
return VK_FALSE;
3535
}

src/graphics/shaderpass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ ShaderSource::compile_shader(const std::string src, const std::string shaderName
9393
shaderc::SpvCompilationResult result = compiler.CompileGlslToSpv(src, kind, shaderName.c_str(), options);
9494
if (result.GetCompilationStatus() != shaderc_compilation_status_success)
9595
{
96-
LOG_ERROR("Error compiling module - " + std::string(result.GetErrorMessage()));
96+
Logger::log(LogLevel::Error, Logger::format_with_tag("[Shader]", "\033[35m", "Compile Error - " + result.GetErrorMessage()));
9797
}
9898

9999
std::vector<uint32_t> spirv = {result.cbegin(), result.cend()};

tests/skin/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
int main(int argc, char* argv[])
55
{
6-
Logger::init(LogLevel::Debug, "skinTest.log");
6+
Logger::init(LogLevel::Info, "skinTest.log");
77
Application app;
88
try
99
{

thirdparty/logger/include/logger.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818

1919
enum class LogLevel
2020
{
21-
Debug = 0,
22-
Info = 1,
23-
Warn = 2,
24-
Error = 3,
25-
None = 4
21+
Info = 0,
22+
Warn = 1,
23+
Error = 2,
24+
None = 3
2625
};
2726

2827
class Logger
2928
{
3029
public:
31-
static void init(LogLevel level = LogLevel::Debug, const std::string& file = "") {
30+
static void init(LogLevel level = LogLevel::Info, const std::string& file = "") {
3231
instance().logLevel = level;
3332
if (!file.empty())
3433
{
@@ -88,8 +87,14 @@ class Logger
8887
}
8988
}
9089

90+
static std::string format_with_tag(const std::string& tag, const char* color, const std::string& message) {
91+
std::ostringstream oss;
92+
oss << color << tag << reset_color() << " " << message;
93+
return oss.str();
94+
}
95+
9196
private:
92-
LogLevel logLevel = LogLevel::Debug;
97+
LogLevel logLevel = LogLevel::Info;
9398
std::ofstream logFile;
9499
std::mutex mtx;
95100

@@ -109,8 +114,6 @@ class Logger
109114
static const char* level_to_string(LogLevel level) {
110115
switch (level)
111116
{
112-
case LogLevel::Debug:
113-
return "DEBUG";
114117
case LogLevel::Info:
115118
return "INFO";
116119
case LogLevel::Warn:
@@ -125,10 +128,8 @@ class Logger
125128
static const char* level_color(LogLevel level) {
126129
switch (level)
127130
{
128-
case LogLevel::Debug:
129-
return "\033[36m"; // Cyan
130131
case LogLevel::Info:
131-
return "\033[32m"; // Green
132+
return "\033[36m"; // Cyan
132133
case LogLevel::Warn:
133134
return "\033[33m"; // Yellow
134135
case LogLevel::Error:
@@ -141,9 +142,10 @@ class Logger
141142
static const char* reset_color() {
142143
return "\033[0m";
143144
}
145+
146+
144147
};
145148

146-
#define LOG_DEBUG(msg) Logger::log(LogLevel::Debug, msg)
147-
#define LOG_INFO(msg) Logger::log(LogLevel::Info, msg)
149+
#define LOG_DEBUG(msg) Logger::log(LogLevel::Info, msg)
148150
#define LOG_WARN(msg) Logger::log_with_context(LogLevel::Warn, msg, __FILE__, __LINE__, __func__)
149151
#define LOG_ERROR(msg) Logger::log_with_context(LogLevel::Error, msg, __FILE__, __LINE__, __func__)

0 commit comments

Comments
 (0)