From 42362a0a6018d6746b1e16ec44b3ea8efe6b7d25 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Fri, 30 Sep 2022 19:33:57 +0000 Subject: [PATCH 1/9] Add System Info Log Function --- .../LoggingSystem/ERS_LogSystemInfo.cpp | 5 +++++ .../LoggingSystem/ERS_LogSystemInfo.h | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp create mode 100644 Source/Internal/LoggingSystem/ERS_LogSystemInfo.h diff --git a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp new file mode 100644 index 0000000000..3c3e33ad6e --- /dev/null +++ b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp @@ -0,0 +1,5 @@ +//======================================================================// +// This file is part of the BrainGenix-ERS Environment Rendering System // +//======================================================================// + +#include \ No newline at end of file diff --git a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h new file mode 100644 index 0000000000..d0a388d3ac --- /dev/null +++ b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h @@ -0,0 +1,20 @@ +//======================================================================// +// This file is part of the BrainGenix-ERS Environment Rendering System // +//======================================================================// + +#pragma once + +// Standard Libraries (BG convention: use <> instead of "") +#include + +// Third-Party Libraries (BG convention: use <> instead of "") + +// Internal Libraries (BG convention: use <> instead of "") + + + +/** + * @brief Logs the system information as defined during compilation (version, target os, etc.) + * + */ +void LogSystemInfo(); From 3999e7b561a06adecf16264caea53fa7ac7c6ff3 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Fri, 30 Sep 2022 19:34:44 +0000 Subject: [PATCH 2/9] Add System Info Log Function --- Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp | 10 +++++++++- Source/Internal/LoggingSystem/ERS_LogSystemInfo.h | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp index 3c3e33ad6e..e399cefb19 100644 --- a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp +++ b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp @@ -2,4 +2,12 @@ // This file is part of the BrainGenix-ERS Environment Rendering System // //======================================================================// -#include \ No newline at end of file +#include + + + +void ERS_LogSystemInfo(ERS_LoggingSystem* Logger) { + + + +} \ No newline at end of file diff --git a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h index d0a388d3ac..e95c801b2d 100644 --- a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h +++ b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h @@ -10,11 +10,11 @@ // Third-Party Libraries (BG convention: use <> instead of "") // Internal Libraries (BG convention: use <> instead of "") - +#include /** * @brief Logs the system information as defined during compilation (version, target os, etc.) * */ -void LogSystemInfo(); +void ERS_LogSystemInfo(ERS_LoggingSystem* Logger); From 2b8b6a2c378327629e92277a58a92913948e91a0 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Fri, 30 Sep 2022 19:38:02 +0000 Subject: [PATCH 3/9] Add System Info Log Function --- Source/Internal/LoggingSystem/CMakeLists.txt | 3 +++ .../LoggingSystem/ERS_LogSystemInfo.cpp | 17 +++++++++++++++++ .../Internal/LoggingSystem/ERS_LogSystemInfo.h | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/Source/Internal/LoggingSystem/CMakeLists.txt b/Source/Internal/LoggingSystem/CMakeLists.txt index d9cb6ff770..4ea88fe332 100644 --- a/Source/Internal/LoggingSystem/CMakeLists.txt +++ b/Source/Internal/LoggingSystem/CMakeLists.txt @@ -26,6 +26,9 @@ target_link_libraries(ERS_LoggingSystem # Link Internal Libs target_link_libraries(ERS_LoggingSystem + ERS_VersioningSystem + ERS_CompileTimeStamp + ERS_CompilePlatformInfo ) if (WIN32) diff --git a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp index e399cefb19..8e331e2421 100644 --- a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp +++ b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp @@ -8,6 +8,23 @@ void ERS_LogSystemInfo(ERS_LoggingSystem* Logger) { + // Log Logo Text + Logger->Log("Starting BrainGenix-ERS Instance", 2); + Logger->Log("", 5); + Logger->Log("---------------------------------------------------------------------------", 5); + Logger->Log("\x1b[38;2;0;128;55m██████╗ ██████╗ █████╗ ██╗███╗ ██╗\x1b[38;2;130;68;208m ██████╗ ███████╗███╗ ██╗██╗██╗ ██╗", 5); + Logger->Log("\x1b[38;2;0;128;55m██╔══██╗██╔══██╗██╔══██╗██║████╗ ██║\x1b[38;2;130;68;208m██╔════╝ ██╔════╝████╗ ██║██║╚██╗██╔╝", 5); + Logger->Log("\x1b[38;2;0;128;55m██████╔╝██████╔╝███████║██║██╔██╗ ██║\x1b[38;2;130;68;208m██║ ███╗█████╗ ██╔██╗ ██║██║ ╚███╔╝ ", 5); + Logger->Log("\x1b[38;2;0;128;55m██╔══██╗██╔══██╗██╔══██║██║██║╚██╗██║\x1b[38;2;130;68;208m██║ ██║██╔══╝ ██║╚██╗██║██║ ██╔██╗ ", 5); + Logger->Log("\x1b[38;2;0;128;55m██████╔╝██║ ██║██║ ██║██║██║ ╚████║\x1b[38;2;130;68;208m╚██████╔╝███████╗██║ ╚████║██║██╔╝ ██╗", 5); + Logger->Log("\x1b[38;2;0;128;55m╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝╚═╝ ╚═══╝\x1b[38;2;130;68;208m ╚═════╝ ╚══════╝╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝", 5); + Logger->Log("---------------------------------------------------------------------------", 5); + Logger->Log("", 5); + Logger->Log(" +-----------------------------------------------------------------+", 4); + Logger->Log(" | BrainGenix-ERS Real-Time Environment Rendering System |", 4); + Logger->Log(" +-----------------------------------------------------------------+", 4); + Logger->Log("", 4); + Logger->Log("Version: " + ERS_VERSION, 5); } \ No newline at end of file diff --git a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h index e95c801b2d..1c7b080fda 100644 --- a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h +++ b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.h @@ -12,6 +12,10 @@ // Internal Libraries (BG convention: use <> instead of "") #include +#include +#include +#include + /** * @brief Logs the system information as defined during compilation (version, target os, etc.) From d0822c78b6380808ae3375ef47295d7c81c30fe6 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Fri, 30 Sep 2022 19:38:34 +0000 Subject: [PATCH 4/9] Add System Info Log Function --- Source/Main.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Source/Main.cpp b/Source/Main.cpp index a3b7c64aaa..91aed20229 100644 --- a/Source/Main.cpp +++ b/Source/Main.cpp @@ -163,22 +163,7 @@ int main(int NumArguments, char** ArguemntValues) { RendererManager sERSRendererManager(SystemUtils.get(), ProjectUtils.get(), HIDUtils.get()); - // Log Logo Text - SystemUtils->Logger_->Log("Starting BrainGenix-ERS Instance", 2); - SystemUtils->Logger_->Log("", 5); - SystemUtils->Logger_->Log("---------------------------------------------------------------------------", 5); - SystemUtils->Logger_->Log("\x1b[38;2;0;128;55m██████╗ ██████╗ █████╗ ██╗███╗ ██╗\x1b[38;2;130;68;208m ██████╗ ███████╗███╗ ██╗██╗██╗ ██╗", 5); - SystemUtils->Logger_->Log("\x1b[38;2;0;128;55m██╔══██╗██╔══██╗██╔══██╗██║████╗ ██║\x1b[38;2;130;68;208m██╔════╝ ██╔════╝████╗ ██║██║╚██╗██╔╝", 5); - SystemUtils->Logger_->Log("\x1b[38;2;0;128;55m██████╔╝██████╔╝███████║██║██╔██╗ ██║\x1b[38;2;130;68;208m██║ ███╗█████╗ ██╔██╗ ██║██║ ╚███╔╝ ", 5); - SystemUtils->Logger_->Log("\x1b[38;2;0;128;55m██╔══██╗██╔══██╗██╔══██║██║██║╚██╗██║\x1b[38;2;130;68;208m██║ ██║██╔══╝ ██║╚██╗██║██║ ██╔██╗ ", 5); - SystemUtils->Logger_->Log("\x1b[38;2;0;128;55m██████╔╝██║ ██║██║ ██║██║██║ ╚████║\x1b[38;2;130;68;208m╚██████╔╝███████╗██║ ╚████║██║██╔╝ ██╗", 5); - SystemUtils->Logger_->Log("\x1b[38;2;0;128;55m╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝╚═╝ ╚═══╝\x1b[38;2;130;68;208m ╚═════╝ ╚══════╝╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝", 5); - SystemUtils->Logger_->Log("---------------------------------------------------------------------------", 5); - SystemUtils->Logger_->Log("", 5); - SystemUtils->Logger_->Log(" +-----------------------------------------------------------------+", 4); - SystemUtils->Logger_->Log(" | BrainGenix-ERS Real-Time Environment Rendering System |", 4); - SystemUtils->Logger_->Log(" +-----------------------------------------------------------------+", 4); - SystemUtils->Logger_->Log("", 4); + ERS_LogSystemInfo(SystemUtils->Logger_.get()); // Initialize Times From 87fb43e7af3988a53bce3899bf5c96b5f6157ed2 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Fri, 30 Sep 2022 19:38:55 +0000 Subject: [PATCH 5/9] Add System Info Log Function --- Source/Main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Main.cpp b/Source/Main.cpp index 91aed20229..ef30f75d39 100644 --- a/Source/Main.cpp +++ b/Source/Main.cpp @@ -28,6 +28,7 @@ #include #include +#include #include #include #include From 1b4ec92353f2902d286e8c398e1877474554cc8a Mon Sep 17 00:00:00 2001 From: datacrystals Date: Fri, 30 Sep 2022 19:40:52 +0000 Subject: [PATCH 6/9] Add System Info Log Function --- Source/Internal/LoggingSystem/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Internal/LoggingSystem/CMakeLists.txt b/Source/Internal/LoggingSystem/CMakeLists.txt index 4ea88fe332..98d07f918d 100644 --- a/Source/Internal/LoggingSystem/CMakeLists.txt +++ b/Source/Internal/LoggingSystem/CMakeLists.txt @@ -9,10 +9,12 @@ add_library(ERS_LoggingSystem # Add Source Files (.cpp) "ERS_LoggingSystem.cpp" "ERS_RGBColor.cpp" + "ERS_LogSystemInfo.cpp" # Add Header Files (.h) "ERS_LoggingSystem.h" "ERS_RGBColor.h" + "ERS_LogSystemInfo.h" ${BACKWARD_ENABLE} From 49d5e0b9719eec980a581822657795fba19bd232 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Fri, 30 Sep 2022 19:41:26 +0000 Subject: [PATCH 7/9] Add System Info Log Function --- Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp index 8e331e2421..198b75f2dc 100644 --- a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp +++ b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp @@ -25,6 +25,6 @@ void ERS_LogSystemInfo(ERS_LoggingSystem* Logger) { Logger->Log(" +-----------------------------------------------------------------+", 4); Logger->Log("", 4); - Logger->Log("Version: " + ERS_VERSION, 5); + Logger->Log(std::string("Version: ") + ERS_VERSION, 5); } \ No newline at end of file From 041e722a3f5d40a94d19bd25cba76e3263d4c29e Mon Sep 17 00:00:00 2001 From: datacrystals Date: Fri, 30 Sep 2022 19:44:12 +0000 Subject: [PATCH 8/9] Add System Info Log Function --- Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp index 198b75f2dc..f8b402bcbd 100644 --- a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp +++ b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp @@ -26,5 +26,12 @@ void ERS_LogSystemInfo(ERS_LoggingSystem* Logger) { Logger->Log("", 4); Logger->Log(std::string("Version: ") + ERS_VERSION, 5); + Logger->Log(std::string("Compile Date: ") + ERS_COMPILE_TIME_STAMP, 5); + Logger->Log(std::string("Target OS: ") + ERS_TARGET_OS_NAME, 5); + Logger->Log(std::string("Target OS Version: ") + ERS_TARGET_OS_VERSION, 5); + Logger->Log(std::string("Target Processor Architecture: ") + ERS_TARGET_PROCESSOR, 5); + Logger->Log(std::string("Host OS: ") + ERS_HOST_OS_NAME, 5); + Logger->Log(std::string("Host OS Version: ") + ERS_HOST_OS_VERSION, 5); + Logger->Log(std::string("Host Processor Architecture: ") + ERS_HOST_PROCESSOR, 5); } \ No newline at end of file From 9438acbc7753a5e874e7506eddaf52113a4ab98f Mon Sep 17 00:00:00 2001 From: datacrystals Date: Fri, 30 Sep 2022 19:45:38 +0000 Subject: [PATCH 9/9] Add System Info Log Function --- .../Internal/LoggingSystem/ERS_LogSystemInfo.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp index f8b402bcbd..7d23b79ef6 100644 --- a/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp +++ b/Source/Internal/LoggingSystem/ERS_LogSystemInfo.cpp @@ -25,13 +25,13 @@ void ERS_LogSystemInfo(ERS_LoggingSystem* Logger) { Logger->Log(" +-----------------------------------------------------------------+", 4); Logger->Log("", 4); - Logger->Log(std::string("Version: ") + ERS_VERSION, 5); - Logger->Log(std::string("Compile Date: ") + ERS_COMPILE_TIME_STAMP, 5); - Logger->Log(std::string("Target OS: ") + ERS_TARGET_OS_NAME, 5); - Logger->Log(std::string("Target OS Version: ") + ERS_TARGET_OS_VERSION, 5); - Logger->Log(std::string("Target Processor Architecture: ") + ERS_TARGET_PROCESSOR, 5); - Logger->Log(std::string("Host OS: ") + ERS_HOST_OS_NAME, 5); - Logger->Log(std::string("Host OS Version: ") + ERS_HOST_OS_VERSION, 5); - Logger->Log(std::string("Host Processor Architecture: ") + ERS_HOST_PROCESSOR, 5); + Logger->Log(std::string("Version: ") + ERS_VERSION, 4); + Logger->Log(std::string("Compile Date: ") + ERS_COMPILE_TIME_STAMP, 4); + Logger->Log(std::string("Target OS: ") + ERS_TARGET_OS_NAME, 4); + Logger->Log(std::string("Target OS Version: ") + ERS_TARGET_OS_VERSION, 4); + Logger->Log(std::string("Target Processor Architecture: ") + ERS_TARGET_PROCESSOR, 4); + Logger->Log(std::string("Host OS: ") + ERS_HOST_OS_NAME, 4); + Logger->Log(std::string("Host OS Version: ") + ERS_HOST_OS_VERSION, 4); + Logger->Log(std::string("Host Processor Architecture: ") + ERS_HOST_PROCESSOR, 4); } \ No newline at end of file