Kajetan Johannes Hammerle před 3 roky
rodič
revize
5bc332248a
4 změnil soubory, kde provedl 34 přidání a 33 odebrání
  1. 10 0
      Main.cpp
  2. 1 1
      meson.build
  3. 1 1
      utils/Logger.cpp
  4. 22 31
      utils/Logger.h

+ 10 - 0
Main.cpp

@@ -27,6 +27,7 @@
 #include "tests/UniquePointerTests.h"
 #include "tests/UtilsTests.h"
 #include "tests/VectorTests.h"
+#include "utils/Logger.h"
 
 int main(int argAmount, char** args) {
     if(argAmount < 2) {
@@ -81,5 +82,14 @@ int main(int argAmount, char** args) {
     Game game;
     w.run(game, 10'000'000);
 
+    LOG_ERROR("HI");
+    LOG_ERROR(StringBuffer<50>(" dfgdf hi"));
+    LOG_WARNING("HI");
+    LOG_WARNING(StringBuffer<50>(" dfgdf hi"));
+    LOG_INFO("HI");
+    LOG_INFO(StringBuffer<50>(" dfgdf hi"));
+    LOG_DEBUG("HI");
+    LOG_DEBUG(StringBuffer<50>(" dfgdf hi"));
+
     return 0;
 }

+ 1 - 1
meson.build

@@ -79,4 +79,4 @@ libgamingcore_dep = declare_dependency(include_directories : inc, link_with : li
 executable('tests', 
     sources: src_tests,
     dependencies : libgamingcore_dep,
-    cpp_args: args)
+    cpp_args: args + ['-DLOG_LEVEL=4'])

+ 1 - 1
utils/Logger.cpp

@@ -1,3 +1,3 @@
 #include "utils/Logger.h"
 
-Logger::Level Logger::level = Logger::ERROR;
+Logger::Level Logger::level = Logger::DEBUG;

+ 22 - 31
utils/Logger.h

@@ -1,56 +1,47 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include "utils/StringBuffer.h"
+#include <iostream>
 
 namespace Logger {
     enum Level { NONE, ERROR, WARNING, INFO, DEBUG };
-
     extern Level level;
+}
 
-    template<int N>
-    void error(const StringBuffer<N>& s) {
 #if LOG_LEVEL >= 1
-        if(level >= ERROR) {
-            std::cout << "\33[1;31m[ERROR] " << s << "\33[39;49m\n";
-        }
+#define LOG_ERROR(text)                                                        \
+    if(Logger::level >= Logger::Level::ERROR) {                                \
+        std::cout << "\33[1;31m[ERROR] " << (text) << "\33[39;49m\n";          \
+    }
 #else
-        (void)s;
+#define LOG_ERROR(text)
 #endif
-    }
 
-    template<int N>
-    void warn(const StringBuffer<N>& s) {
 #if LOG_LEVEL >= 2
-        if(level >= WARNING) {
-            std::cout << "\33[1;33m[WARNING] " << s << "\33[39;49m\n";
-        }
+#define LOG_WARNING(text)                                                      \
+    if(Logger::level >= Logger::Level::WARNING) {                              \
+        std::cout << "\33[1;33m[WARNING] " << (text) << "\33[39;49m\n";        \
+    }
 #else
-        (void)s;
+#define LOG_WARNING(text)
 #endif
-    }
 
-    template<int N>
-    void info(const StringBuffer<N>& s) {
 #if LOG_LEVEL >= 3
-        if(level >= INFO) {
-            std::cout << "\33[1;37m[INFO] " << s << "\33[39;49m\n";
-        }
+#define LOG_INFO(text)                                                         \
+    if(Logger::level >= Logger::Level::INFO) {                                 \
+        std::cout << "\33[1;37m[INFO] " << (text) << "\33[39;49m\n";           \
+    }
 #else
-        (void)s;
+#define LOG_INFO(text)
 #endif
-    }
 
-    template<int N>
-    void debug(const StringBuffer<N>& s) {
 #if LOG_LEVEL >= 4
-        if(level >= DEBUG) {
-            std::cout << "\33[1;32m[DEBUG] " << s << "\33[39;49m\n";
-        }
+#define LOG_DEBUG(text)                                                        \
+    if(Logger::level >= Logger::Level::DEBUG) {                                \
+        std::cout << "\33[1;32m[DEBUG] " << (text) << "\33[39;49m\n";          \
+    }
 #else
-        (void)s;
+#define LOG_DEBUG(text)
 #endif
-    }
-}
 
 #endif