From a1331db38952df1ff76fc8339f5a3e840a66b5b7 Mon Sep 17 00:00:00 2001
From: Brett <brettmaster1@gmail.com>
Date: Mon, 26 Jun 2023 21:33:42 -0400
Subject: [PATCH] blt logging

---
 include/blt/math/vectors.h |  4 +--
 include/blt/std/logging.h  | 63 ++++++++++++++++++++++++--------------
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/include/blt/math/vectors.h b/include/blt/math/vectors.h
index 528ae32..9646086 100644
--- a/include/blt/math/vectors.h
+++ b/include/blt/math/vectors.h
@@ -26,7 +26,7 @@ namespace blt {
     template<typename T, uint32_t size>
     struct vec {
         private:
-            T elements[size]{};
+            T elements[size];
         public:
             
             vec() {
@@ -48,7 +48,7 @@ namespace blt {
             
             template<typename o_T, uint32_t o_size>
             explicit vec(const vec<o_T, o_size>& copy) {
-                for (uint32_t i = 0; i < o_size; i++)
+                for (uint32_t i = 0; i < std::min(o_size, size); i++)
                     elements[i] = copy[i];
             }
             
diff --git a/include/blt/std/logging.h b/include/blt/std/logging.h
index 3905b98..e333620 100644
--- a/include/blt/std/logging.h
+++ b/include/blt/std/logging.h
@@ -33,31 +33,39 @@ namespace blt::logging {
         const char* m_directory = "./";
         LOG_LEVEL minLevel = BLT_TRACE;
         
-        explicit constexpr LOG_PROPERTIES(bool useColor, bool logToConsole, bool logToFile, const char* directory):
-                m_useColor(useColor), m_logToConsole(logToConsole), m_logToFile(logToFile), m_directory(directory) {}
+        explicit constexpr LOG_PROPERTIES(
+                bool useColor, bool logToConsole, bool logToFile, const char* directory
+        ):
+                m_useColor(useColor), m_logToConsole(logToConsole), m_logToFile(logToFile),
+                m_directory(directory) {}
         
         explicit constexpr LOG_PROPERTIES() = default;
     };
     
     struct logger {
         LOG_LEVEL level;
+        
         void log_internal(const std::string& str) const;
         // evil hack, todo: better way
-        #ifdef BLT_DISABLE_LOGGING
-            void log(const std::string& str) const {
-            
-            }
-        #else
-            void log(const std::string& str) const {
-                log_internal(str);
-            }
-        #endif
-            void flush() const;
-            static void flush_all();
+#ifdef BLT_DISABLE_LOGGING
+        void log(const std::string& str) const {
+        
+        }
+#else
+        
+        void log(const std::string& str) const {
+            log_internal(str);
+        }
+
+#endif
+        
+        void flush() const;
+        
+        static void flush_all();
     };
     
     static logger std_out{BLT_NONE};
-
+    
     static logger trace{BLT_TRACE};
     static logger debug{BLT_DEBUG};
     static logger info{BLT_INFO};
@@ -82,7 +90,11 @@ namespace blt::logging {
     }
     
     void init(LOG_PROPERTIES properties);
-    void log_internal(const std::string& format, LOG_LEVEL level, const char* file, int currentLine, int auto_line, ...);
+    
+    void log_internal(
+            const std::string& format, LOG_LEVEL level, const char* file, int currentLine,
+            int auto_line, ...
+    );
     
     // template voodoo magic (SFINAE, "Substitution Failure Is Not An Error")
     // https://stackoverflow.com/questions/44848011/c-limit-template-type-to-numbers
@@ -98,9 +110,12 @@ namespace blt::logging {
      * @param auto_line put a new line at the end if none exists if true
      */
     template<typename T, typename std::enable_if<std::is_arithmetic<T>::value>::type* = nullptr>
-    inline void log_internal(T t, LOG_LEVEL level, const char* file, int currentLine, int auto_line){
+    inline void log_internal(
+            T t, LOG_LEVEL level, const char* file, int currentLine, int auto_line
+    ) {
         log_internal(std::to_string(t), level, file, currentLine, auto_line);
     }
+    
     /**
      * Will flush all buffers! This might cause issues with threads!
      */
@@ -109,7 +124,7 @@ namespace blt::logging {
     void testLogging();
 }
 
-#ifdef BLT_DISABLE_LOGGING
+#ifndef BLT_ENABLE_LOGGING
     #define BLT_TRACE(format, ...)
     #define BLT_DEBUG(format, ...)
     #define BLT_INFO(format, ...)
@@ -117,12 +132,14 @@ namespace blt::logging {
     #define BLT_ERROR(format, ...)
     #define BLT_FATAL(format, ...)
 #else
-    #define BLT_TRACE(format, ...) log_internal(format, blt::logging::BLT_TRACE, __FILE__, __LINE__, true, ##__VA_ARGS__)
-    #define BLT_DEBUG(format, ...) log_internal(format, blt::logging::BLT_DEBUG, __FILE__, __LINE__, true, ##__VA_ARGS__)
-    #define BLT_INFO(format, ...) log_internal(format, blt::logging::BLT_INFO, __FILE__, __LINE__, true, ##__VA_ARGS__)
-    #define BLT_WARN(format, ...) log_internal(format, blt::logging::BLT_WARN, __FILE__, __LINE__, true, ##__VA_ARGS__)
-    #define BLT_ERROR(format, ...) log_internal(format, blt::logging::BLT_ERROR, __FILE__, __LINE__, true, ##__VA_ARGS__)
-    #define BLT_FATAL(format, ...) log_internal(format, blt::logging::BLT_FATAL, __FILE__, __LINE__, true, ##__VA_ARGS__)
+    #ifndef BLT_DISABLE_LOGGING
+        #define BLT_TRACE(format, ...) log_internal(format, blt::logging::BLT_TRACE, __FILE__, __LINE__, true, ##__VA_ARGS__)
+        #define BLT_DEBUG(format, ...) log_internal(format, blt::logging::BLT_DEBUG, __FILE__, __LINE__, true, ##__VA_ARGS__)
+        #define BLT_INFO(format, ...) log_internal(format, blt::logging::BLT_INFO, __FILE__, __LINE__, true, ##__VA_ARGS__)
+        #define BLT_WARN(format, ...) log_internal(format, blt::logging::BLT_WARN, __FILE__, __LINE__, true, ##__VA_ARGS__)
+        #define BLT_ERROR(format, ...) log_internal(format, blt::logging::BLT_ERROR, __FILE__, __LINE__, true, ##__VA_ARGS__)
+        #define BLT_FATAL(format, ...) log_internal(format, blt::logging::BLT_FATAL, __FILE__, __LINE__, true, ##__VA_ARGS__)
+    #endif
 #endif
 
 #endif //BLT_LOGGING_H