From 72496226d8edadd15149758cc5b7c8ce4bdb6e27 Mon Sep 17 00:00:00 2001 From: illyum Date: Mon, 9 Sep 2024 02:59:58 -0600 Subject: [PATCH] fix: resolve build errors caused by Windows macro conflict and TransformComponent access issues --- src/Logger.cpp | 20 ++++++++++---------- src/Logger.h | 12 ++++++------ src/components/transform_component.h | 1 + 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/Logger.cpp b/src/Logger.cpp index 23bdf40..d584421 100644 --- a/src/Logger.cpp +++ b/src/Logger.cpp @@ -37,23 +37,23 @@ void Logger::Log(LogLevel level, const std::string& message, const std::string& } void Logger::LogInfo(const std::string& message, const std::string& scope) { - Log(LogLevel::INFO, message, scope); + Log(LogLevel::INFOL, message, scope); } void Logger::LogDebug(const std::string& message, const std::string& scope) { - Log(LogLevel::DEBUG, message, scope); + Log(LogLevel::DEBUGL, message, scope); } void Logger::LogWarning(const std::string& message, const std::string& scope) { - Log(LogLevel::WARNING, message, scope); + Log(LogLevel::WARNINGL, message, scope); } void Logger::LogError(const std::string& message, const std::string& scope) { - Log(LogLevel::ERROR, message, scope); + Log(LogLevel::ERRORL, message, scope); } void Logger::LogCritical(const std::string& message, const std::string& scope) { - Log(LogLevel::CRITICAL, message, scope); + Log(LogLevel::CRITICALL, message, scope); } void Logger::DumpLogs(const std::string& dumpFileName) { @@ -91,11 +91,11 @@ std::string Logger::GetTimestamp() { std::string Logger::LogLevelToString(LogLevel level) { switch (level) { - case LogLevel::DEBUG: return "DEBUG"; - case LogLevel::INFO: return "INFO"; - case LogLevel::WARNING: return "WARNING"; - case LogLevel::ERROR: return "ERROR"; - case LogLevel::CRITICAL: return "CRITICAL"; + case LogLevel::DEBUGL: return "DEBUG"; + case LogLevel::INFOL: return "INFO"; + case LogLevel::WARNINGL: return "WARNING"; + case LogLevel::ERRORL: return "ERROR"; + case LogLevel::CRITICALL: return "CRITICAL"; default: return "UNKNOWN"; } } diff --git a/src/Logger.h b/src/Logger.h index 1e840e0..a77cdd5 100644 --- a/src/Logger.h +++ b/src/Logger.h @@ -8,11 +8,11 @@ #include enum class LogLevel { - DEBUG = 0, - INFO = 10, - WARNING = 20, - ERROR = 30, - CRITICAL = 40 + DEBUGL = 0, + INFOL = 10, + WARNINGL = 20, + ERRORL = 30, + CRITICALL = 40 }; class Logger { @@ -25,7 +25,7 @@ public: Logger(const Logger&) = delete; Logger& operator=(const Logger&) = delete; - void Initialize(const std::string &logFile = "", LogLevel consoleLevel = LogLevel::DEBUG, LogLevel fileLevel = LogLevel::DEBUG); + void Initialize(const std::string &logFile = "", LogLevel consoleLevel = LogLevel::DEBUGL, LogLevel fileLevel = LogLevel::DEBUGL); void Log(LogLevel level, const std::string &message, const std::string &scope = ""); void LogDebug(const std::string& message, const std::string& scope = ""); void LogInfo(const std::string& message, const std::string& scope = ""); diff --git a/src/components/transform_component.h b/src/components/transform_component.h index 435657b..cb1c531 100644 --- a/src/components/transform_component.h +++ b/src/components/transform_component.h @@ -2,6 +2,7 @@ class TransformComponent { +public: float x = 0.0f; float y = 0.0f; float scaleX = 1.0f;