SHADE_Application/src/Application/SBApplication.cpp

@@ -8,8 +8,8 @@
 //#include "Scenes/SBEditorScene.h"
 #endif // SHEDITOR
 
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
-#include "Tools/SHFileUtilties.h"
+#include "Tools/Utilities/SHFileUtilties.h"
 
 #include <chrono>
 #include <ratio>
@@ -44,7 +44,7 @@
 #include "Scenes/SBMainScene.h"
 #include "Serialization/Configurations/SHConfigurationManager.h"
 
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Tools/SHDebugDraw.h"
 
 using namespace SHADE;
@@ -60,6 +60,8 @@ namespace Sandbox
     _In_      INT       nCmdShow
   )
   {
+    SHLOG_INFO_D("Initialising SHADE engine")
+
     // Set working directory
     SHFileUtilities::SetWorkDirToExecDir();
     WindowData wndData{};

SHADE_Application/src/WinMain.cpp

@@ -1,6 +1,6 @@
 #include "SBpch.h"
 #include <Engine/SHEngine.h>
-#include <Tools/SHLogger.h>
+#include <Tools/Logger/SHLogger.h>
 #include <Tools/SHExceptionHandler.h>
 #include "Application/SBApplication.h"
 

SHADE_Engine/src/Camera/SHCameraDirector.cpp

@@ -5,7 +5,7 @@
 #include "ECS_Base/Managers/SHComponentManager.h"
 #include "ECS_Base/SHECSMacros.h"
 #include "ECS_Base/Managers/SHEntityManager.h"
-#include "Tools/SHLog.h"
+#include "Tools/Logger/SHLog.h"
 
 namespace SHADE
 {

SHADE_Engine/src/ECS_Base/UnitTesting/SHECSUnitTest.cpp

@@ -5,7 +5,7 @@
 #include "../Managers/SHSystemManager.h"
 #include "SHTestComponents.h"
 #include "SHTestSystems.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 
 

SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanel.cpp

@@ -23,7 +23,7 @@
 #include <imgui.h>
 
 #include "Serialization/SHSerialization.h"
-#include "Tools/SHClipboardUtilities.h"
+#include "Tools/Utilities/SHClipboardUtilities.h"
 
 
 namespace SHADE

SHADE_Engine/src/Editor/EditorWindow/SHEditorWindowManager.h

@@ -3,7 +3,7 @@
 #include <memory>
 #include <unordered_map>
 #include "SHEditorWindow.h"
-#include "Tools/SHLog.h"
+#include "Tools/Logger/SHLog.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Editor/SHEditor.cpp

@@ -10,7 +10,7 @@
 //#==============================================================#
 //||                       SHADE Includes                       ||
 //#==============================================================#
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Tools/SHException.h"
 
 #include "ECS_Base/Managers/SHSystemManager.h"

SHADE_Engine/src/Editor/SHEditor.h

@@ -15,7 +15,7 @@
 #include "ECS_Base/System/SHSystemRoutine.h"
 #include "Resource/SHHandle.h"
 #include "EditorWindow/SHEditorWindow.h"
-#include "Tools/SHLog.h"
+#include "Tools/Logger/SHLog.h"
 #include "Gizmos/SHTransformGizmo.h"
 #include "Events/SHEventDefines.h"
 #include "Events/SHEvent.h"

SHADE_Engine/src/FRC/SHFramerateController.cpp

@@ -12,11 +12,11 @@
 
 //TODO Legacy code. Delete soon
 
+#include <SHpch.h>
+
 #include <chrono>
 #include <cassert>
-#include <SHpch.h>
 #include "SHFramerateController.h"
-#include "../Tools/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/Commands/SHVkCommandBuffer.cpp

@@ -3,7 +3,7 @@
 #include "SHVkCommandPool.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "SHVkCommandPool.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/Renderpass/SHVkRenderpass.h"
 #include "Graphics/Framebuffer/SHVkFramebuffer.h"
 #include "Graphics/Pipeline/SHVkPipeline.h"

SHADE_Engine/src/Graphics/Commands/SHVkCommandPool.cpp

@@ -3,7 +3,7 @@
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Instance/SHVkInstance.h"
 #include "Resource/SHResourceLibrary.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/Debugging/SHValidationLayersQuery.cpp

@@ -1,6 +1,6 @@
 #include "SHPch.h"
 #include "SHValidationLayersQuery.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/Debugging/SHVkDebugMessenger.cpp

@@ -3,8 +3,8 @@
 #include "SHVkDebugMessenger.h"
 #include "SHVulkanDebugUtil.h"
 #include "Graphics/Instance/SHVkInstance.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
-//#include "Tools/SHLogger.h"
+//#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/Debugging/SHVulkanDebugUtil.cpp

@@ -1,6 +1,6 @@
 #include "SHPch.h"
 #include "SHVulkanDebugUtil.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/Descriptors/SHVkDescriptorSetGroup.cpp

@@ -6,7 +6,7 @@
 #include "SHVkDescriptorPool.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Descriptors/SHVkDescriptorSetLayout.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/Images/SHVkImage.h"
 #include "Graphics/Images/SHVkImageView.h"
 #include "Graphics/Images/SHVkSampler.h"

SHADE_Engine/src/Graphics/Devices/SHVkLogicalDevice.cpp

@@ -2,7 +2,7 @@
 #include "SHVkLogicalDevice.h"
 #include "SHVkPhysicalDevice.h"
 #include "Graphics/Instance/SHVkInstance.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/Windowing/Surface/SHVkSurface.h"
 #include "Graphics/Swapchain/SHVkSwapchain.h"
 #include "Graphics/Commands/SHVkCommandPool.h"

SHADE_Engine/src/Graphics/Devices/SHVkPhysicalDevice.cpp

@@ -3,7 +3,7 @@
 #include <iostream>
 #include <vector>
 #include <set>
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/Devices/SHVkPhysicalDeviceLibrary.cpp

@@ -3,7 +3,7 @@
 #include <unordered_map>
 #include "SHVkPhysicalDeviceLibrary.h"
 #include "Graphics/Instance/SHVkInstance.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/Framebuffer/SHVkFramebuffer.cpp

@@ -3,7 +3,7 @@
 #include "Graphics/Images/SHVkImageView.h"
 #include "Graphics/Images/SHVkImage.h"
 #include "Graphics/Renderpass/SHVkRenderpass.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 
 namespace SHADE

SHADE_Engine/src/Graphics/Images/SHVkImage.cpp

@@ -2,7 +2,7 @@
 #include "SHVkImage.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Debugging/SHVulkanDebugUtil.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "SHVkImageView.h"
 #include "Graphics/Instance/SHVkInstance.h"
 #include "Graphics/Buffers/SHVkBuffer.h"

SHADE_Engine/src/Graphics/Images/SHVkImageView.cpp

@@ -2,7 +2,7 @@
 #include "SHVkImageView.h"
 #include "SHVkImage.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/Instance/SHVkInstance.cpp

@@ -3,7 +3,7 @@
 #include "Graphics/Debugging/SHValidationLayersQuery.h"
 #include "Graphics/Debugging/SHVkDebugMessenger.h"
 #include "Graphics/Devices/SHVkPhysicalDeviceLibrary.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/Devices/SHVkPhysicalDeviceLibrary.h"
 //#include <vulkan/vulkan_win32.h>
 

SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatcher.cpp

@@ -22,7 +22,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "Graphics/MiddleEnd/Interface/SHMaterialInstance.h"
 #include "Graphics/Pipeline/SHVkPipeline.h"
 #include "ECS_Base/Managers/SHComponentManager.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.cpp

@@ -5,7 +5,7 @@
 #include "Graphics/Pipeline/SHVkPipelineLayout.h"
 #include "Graphics/Descriptors/SHVkDescriptorSetLayout.h"
 #include "Graphics/MiddleEnd/Lights/SHLightData.h"
-#include "Tools/SHUtilities.h"
+#include "Tools/Utilities/SHUtilities.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterialInstance.cpp

@@ -15,7 +15,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "SHGraphicsConstants.h"
 #include "SHMaterial.h"
 #include "Graphics/Pipeline/SHVkPipeline.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHViewport.cpp

@@ -15,7 +15,7 @@ of DigiPen Institute of Technology is prohibited.
 
 #include "Graphics/Commands/SHVkCommandBuffer.h"
 #include "Graphics/Instance/SHVkInstance.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "SHRenderer.h"
 #include "Resource/SHResourceLibrary.h"
 #include "Graphics/RenderGraph/SHRenderGraph.h"

SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp

@@ -1,7 +1,7 @@
 #include "SHpch.h"
 #include "SHLightingSubSystem.h"
 #include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
-#include "Tools/SHUtilities.h"
+#include "Tools/Utilities/SHUtilities.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Buffers/SHVkBuffer.h"
 #include "Graphics/Descriptors/SHVkDescriptorSetGroup.h"

SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.cpp

@@ -1,6 +1,6 @@
 #include "SHPch.h"
 #include "SHRenderContext.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Swapchain/SHVkSwapchain.h"
 

SHADE_Engine/src/Graphics/MiddleEnd/Textures/SHTextureLibrary.cpp

@@ -19,7 +19,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "Graphics/Buffers/SHVkBuffer.h"
 #include "Graphics/Commands/SHVkCommandBuffer.h"
 #include "Graphics/SHVkUtil.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/MiddleEnd/Interface/SHGraphicsConstants.h"
 #include "Graphics/Descriptors/SHVkDescriptorSetGroup.h"
 #include "Graphics/Images/SHVkImage.h"

SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp

@@ -2,7 +2,7 @@
 #include "SHVkPipelineLayout.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Shaders/SHVkShaderModule.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/Instance/SHVkInstance.h"
 
 namespace SHADE

SHADE_Engine/src/Graphics/Queues/SHVkQueue.cpp

@@ -1,6 +1,6 @@
 #include "SHPch.h"
 #include "SHVkQueue.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Synchronization/SHVkSemaphore.h"
 #include "Graphics/Synchronization/SHVkFence.h"

SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp

@@ -7,7 +7,7 @@
 #include "Graphics/Images/SHVkImageView.h"
 #include "Graphics/Framebuffer/SHVkFramebuffer.h"
 #include "Graphics/Buffers/SHVkBuffer.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "SHAttachmentDescInitParams.h"
 #include "SHRenderGraphStorage.h"
 #include "Graphics/RenderGraph/SHRenderGraphNodeCompute.h"

SHADE_Engine/src/Graphics/Shaders/BlockInterface/SHShaderBlockInterface.cpp

@@ -1,6 +1,6 @@
 #include "SHPch.h"
 #include "SHShaderBlockInterface.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/Shaders/SHShaderReflected.cpp

@@ -1,6 +1,6 @@
 #include "SHPch.h"
 #include "SHShaderReflected.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/Instance/SHVkInstance.h"
 
 

SHADE_Engine/src/Graphics/Shaders/SHVkShaderModule.cpp

@@ -2,7 +2,7 @@
 #include "SHVkShaderModule.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Debugging/SHVulkanDebugUtil.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Graphics/Swapchain/SHVkSwapchain.cpp

@@ -3,7 +3,7 @@
 #include "Graphics/Devices/SHVkPhysicalDevice.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Windowing/Surface/SHVkSurface.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Graphics/Images/SHVkImage.h"
 #include "Graphics/Instance/SHVkInstance.h"
 

SHADE_Engine/src/Graphics/Windowing/Surface/SHVkSurface.cpp

@@ -4,7 +4,7 @@
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Instance/SHVkInstance.h"
 #include "Graphics/Debugging/SHVulkanDebugUtil.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Math/SHQuaternion.cpp

@@ -16,7 +16,7 @@
 #include "Vector/SHVec3.h"
 #include "SHMatrix.h"
 #include "SHMathHelpers.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 using namespace DirectX;
 

SHADE_Engine/src/Math/Vector/SHVec2.cpp

@@ -14,7 +14,7 @@
 #include "SHVec2.h"
 // Project Headers
 #include "Math/SHMatrix.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 using namespace DirectX;
 

SHADE_Engine/src/Math/Vector/SHVec3.cpp

@@ -15,7 +15,7 @@
 // Project Headers
 #include "Math/SHMatrix.h"
 #include "Math/SHQuaternion.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 using namespace DirectX;
 

SHADE_Engine/src/Math/Vector/SHVec4.cpp

@@ -15,7 +15,7 @@
 // Project Headers
 #include "Math/SHMatrix.h"
 #include "Math/SHColour.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 using namespace DirectX;
 

SHADE_Engine/src/Physics/PhysicsObject/SHPhysicsObjectManager.cpp

@@ -15,7 +15,7 @@
 
 // Project Headers
 #include "ECS_Base/Managers/SHEntityManager.h"
-#include "Tools/SHUtilities.h"
+#include "Tools/Utilities/SHUtilities.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Physics/System/SHPhysicsDebugDrawSystem.h

@@ -16,7 +16,7 @@
 #include "ECS_Base/System/SHSystemRoutine.h"
 #include "Math/SHColour.h"
 #include "SHPhysicsSystem.h"
-#include "Tools/SHUtilities.h"
+#include "Tools/Utilities/SHUtilities.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Resource/SHResourceManager.hpp

@@ -20,7 +20,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "Assets/Asset Types/SHAssetIncludes.h"
 #include "Graphics/MiddleEnd/Interface/SHGraphicsSystem.h"
 #include "ECS_Base/Managers/SHSystemManager.h"
-#include "Tools/SHLog.h"
+#include "Tools/Logger/SHLog.h"
 #include "Graphics/Shaders/SHVkShaderModule.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/MiddleEnd/Materials/SHMaterialSpec.h"

SHADE_Engine/src/SHpch.h

@@ -37,5 +37,5 @@
 #include <span>
 
 #include "Common/SHCommonTypes.h"
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 #include "Tools/SHException.h"

SHADE_Engine/src/Scripting/SHDotNetRuntime.cpp

@@ -20,7 +20,7 @@ of DigiPen Institute of Technology is prohibited.
 #include <array>
 // External Dependencies
 #include <shlwapi.h>                  // PathRemoveFileSpecA
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Scripting/SHScriptEngine.cpp

@@ -19,8 +19,8 @@ of DigiPen Institute of Technology is prohibited.
 #include <memory>       // std::shared_ptr
 #include <thread>       // std::this_thread::sleep_for
 // Project Headers
-#include "Tools/SHLogger.h"
+#include "Tools/Logger/SHLogger.h"
-#include "Tools/SHStringUtils.h"
+#include "Tools/Utilities/SHStringUtilities.h"
 #include "ECS_Base/Events/SHEntityDestroyedEvent.h"
 #include "Events/SHEvent.h"
 #include "Events/SHEventReceiver.h"
@@ -616,7 +616,7 @@ namespace SHADE
       auto err = GetLastError();
       std::ostringstream oss;
       oss << "[ScriptEngine] Failed to launch process. Error code: " << std::hex << err
-          << " (" << SHStringUtils::GetWin32ErrorMessage(err) << ")";
+          << " (" << SHStringUtilities::GetWin32ErrorMessage(err) << ")";
       throw std::runtime_error(oss.str());
     }
 
@@ -630,7 +630,7 @@ namespace SHADE
         auto err = GetLastError();
         std::ostringstream oss;
         oss << "[ScriptEngine] Failed to query process. Error code: " << std::hex << err
-            << " (" << SHStringUtils::GetWin32ErrorMessage(err) << ")";
+            << " (" << SHStringUtilities::GetWin32ErrorMessage(err) << ")";
         throw std::runtime_error(oss.str());
       }
 
@@ -647,7 +647,7 @@ namespace SHADE
   std::wstring SHScriptEngine::generateBuildCommand(bool debug)
   {
     std::wostringstream oss;
-    oss << "dotnet build \"" << SHStringUtils::StrToWstr(CSPROJ_PATH) << "\" -c ";
+    oss << "dotnet build \"" << SHStringUtilities::StrToWstr(CSPROJ_PATH) << "\" -c ";
     oss << debug ? "Debug" : "Release";
     oss << " -o \"./tmp/\" -fl -flp:LogFile=build.log;Verbosity=quiet -r \"win-x64\"";
     return oss.str();

SHADE_Engine/src/Serialization/SHSerializationHelper.hpp

@@ -9,7 +9,7 @@
 
 #include "ECS_Base/Managers/SHComponentManager.h"
 #include "Graphics/MiddleEnd/Materials/SHMaterialSpec.h"
-#include "Tools/SHLog.h"
+#include "Tools/Logger/SHLog.h"
 
 
 namespace SHADE

SHADE_Engine/src/Tools/Logger/SHLogger.h

@@ -177,8 +177,34 @@ namespace SHADE
 /*-------------------------------------------------------------------------------------*/
 
 #ifdef _DEBUG
-  #define SHLOG_TRACE(format, ...)    SHADE::SHLogger::UseTrivialPattern(); SPDLOG_LOGGER_TRACE(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);
+
-  #define SHLOGV_TRACE(format, ...)   SHADE::SHLogger::UseVerbosePattern(); SPDLOG_LOGGER_TRACE(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);
+  #define SHLOG_INFO_D(format, ...)       SHADE::SHLogger::UseTrivialPattern(); SPDLOG_LOGGER_INFO(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);
+  #define SHLOGV_INFO_D(format, ...)      SHADE::SHLogger::UseVerbosePattern(); SPDLOG_LOGGER_INFO(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);
+
+  #define SHLOG_WARNING_D(format, ...)    SHADE::SHLogger::UseTrivialPattern(); SPDLOG_LOGGER_WARN(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);
+  #define SHLOGV_WARNING_D(format, ...)   SHADE::SHLogger::UseVerbosePattern(); SPDLOG_LOGGER_WARN(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);
+
+  #define SHLOG_ERROR_D(format, ...)      SHADE::SHLogger::UseTrivialPattern(); SPDLOG_LOGGER_ERROR(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);
+  #define SHLOGV_ERROR_D(format, ...)     SHADE::SHLogger::UseVerbosePattern(); SPDLOG_LOGGER_ERROR(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);
+
+  #define SHLOG_CRITICAL_D(format, ...)   SHADE::SHLogger::UseTrivialPattern(); SPDLOG_LOGGER_CRITICAL(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);
+  #define SHLOGV_CRITICAL_D(format, ...)  SHADE::SHLogger::UseVerbosePattern(); SPDLOG_LOGGER_CRITICAL(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);
+
+#else
+
+  #define SHLOG_INFO_D(format, ...)     
+  #define SHLOGV_INFO_D(format, ...)    
+
+  #define SHLOG_WARNING_D(format, ...)  
+  #define SHLOGV_WARNING_D(format, ...) 
+
+  #define SHLOG_ERROR_D(format, ...)    
+  #define SHLOGV_ERROR_D(format, ...)   
+
+  #define SHLOG_CRITICAL_D(format, ...) 
+  #define SHLOGV_CRITICAL_D(format, ...)
+
+
 #endif
 
 #define SHLOG_INFO(format, ...)       SHADE::SHLogger::UseTrivialPattern(); SPDLOG_LOGGER_INFO(spdlog::get(SHLOGGER_NAME), format, ## __VA_ARGS__);

SHADE_Engine/src/Tools/SHException.h

@@ -18,7 +18,7 @@
 #include <cstdlib>
 
 // Project Headers
-#include "SHLogger.h"
+#include "Logger/SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Tools/SHExceptionHandler.cpp

@@ -12,10 +12,8 @@
 
 // Primary Header
 #include "SHExceptionHandler.h"
-
 // Project Headers
 #include "SHException.h"
-#include "SHLogger.h"
 
 namespace SHADE
 {

SHADE_Engine/src/Tools/Utilities/SHStringUtilities.cpp

@@ -1,5 +1,5 @@
 /************************************************************************************//*!
-\file           StringUtilities.cpp
+\file           SHStringUtilities.cpp
 \author         Tng Kah Wei, kahwei.tng, 390009620
 \par            email: kahwei.tng\@digipen.edu
 \date           Nov 29, 2021
@@ -12,22 +12,22 @@ of DigiPen Institute of Technology is prohibited.
 // Precompiled Header
 #include <SHpch.h>
 // Primary Header
-#include "SHStringUtils.h"
+#include "SHStringUtilities.h"
 
 namespace SHADE
 {
     /*---------------------------------------------------------------------------------*/
     /* Utility Functions                                                               */
     /*---------------------------------------------------------------------------------*/
-    std::vector<std::string> SHStringUtils::Split(const std::string& str, const char& delim)
+    std::vector<std::string> SHStringUtilities::Split(const std::string& str, const char& delim)
     {
         return Split<char>(str, delim);
     }
-    std::vector<std::wstring> SHStringUtils::Split(const std::wstring& str, const wchar_t& delim)
+    std::vector<std::wstring> SHStringUtilities::Split(const std::wstring& str, const wchar_t& delim)
     {
         return Split<wchar_t>(str, delim);
 	}
-	std::string SHStringUtils::WstrToStr(const std::wstring& wstr)
+	std::string SHStringUtilities::WstrToStr(const std::wstring& wstr)
 	{
 		static std::vector<char> buffer;
 		const int STR_SIZE = WideCharToMultiByte(CP_UTF8, 0, wstr.data(), static_cast<int>(wstr.size()), nullptr, 0, nullptr, nullptr) + 1 /* Null Terminator */;
@@ -35,7 +35,7 @@ namespace SHADE
 		WideCharToMultiByte(CP_UTF8, 0, wstr.data(), static_cast<int>(wstr.size()), buffer.data(), MAX_PATH, nullptr, nullptr);
 		return std::string(buffer.data());
 	}
-	std::wstring SHStringUtils::StrToWstr(const std::string& str)
+	std::wstring SHStringUtilities::StrToWstr(const std::string& str)
 	{
 		static std::vector<wchar_t> buffer;
 		const int WSTR_SIZE = MultiByteToWideChar(CP_UTF8, 0, str.data(), static_cast<int>(str.size()), nullptr, 0) + 1 /* Null Terminator */;
@@ -44,7 +44,7 @@ namespace SHADE
 		return std::wstring(buffer.data());
 	}
 
-	std::string SHStringUtils::GetWin32ErrorMessage(unsigned long errorCode)
+	std::string SHStringUtilities::GetWin32ErrorMessage(unsigned long errorCode)
 	{
 		return std::system_category().message(errorCode);
 	}

SHADE_Engine/src/Tools/Utilities/SHStringUtilities.h

@@ -1,5 +1,5 @@
 /************************************************************************************//*!
-\file           StringUtilities.h
+\file           SHStringUtilities.h
 \author         Tng Kah Wei, kahwei.tng, 390009620
 \par            email: kahwei.tng\@digipen.edu
 \date           Nov 29, 2021
@@ -19,7 +19,7 @@ namespace SHADE
     /// <summary>
     /// Contains useful functions for operating on strings.
     /// </summary>
-    class SHStringUtils
+    class SHStringUtilities
     {
       public:
         /*-----------------------------------------------------------------------------*/
@@ -74,8 +74,8 @@ namespace SHADE
       /*-------------------------------------------------------------------------------*/
       /* Constructors/Destructors                                                      */
       /*-------------------------------------------------------------------------------*/
-        SHStringUtils() = delete;
+        SHStringUtilities() = delete;
     };
 }
 
-#include "SHStringUtils.hpp"
+#include "SHStringUtilities.hpp"

SHADE_Engine/src/Tools/Utilities/SHStringUtilities.hpp

@@ -1,5 +1,5 @@
 /************************************************************************************//*!
-\file           StringUtilities.hpp
+\file           SHStringUtilities.hpp
 \author         Tng Kah Wei, kahwei.tng, 390009620
 \par            email: kahwei.tng\@digipen.edu
 \date           Nov 29, 2021
@@ -12,7 +12,7 @@ of DigiPen Institute of Technology is prohibited.
 *//*************************************************************************************/
 #pragma once
 // Primary Header
-#include "SHStringUtils.h"
+#include "SHStringUtilities.h"
 
 namespace SHADE
 {
@@ -20,7 +20,7 @@ namespace SHADE
     /* Template Function Definitions                                                 */
     /*-------------------------------------------------------------------------------*/
     template<typename T>
-    inline std::vector<std::basic_string<T>> SHStringUtils::Split(const std::basic_string<T>& str, const T& delim)
+    inline std::vector<std::basic_string<T>> SHStringUtilities::Split(const std::basic_string<T>& str, const T& delim)
     {
         std::vector<std::basic_string<T>> results;
         std::basic_string<T> remaining = str;

SHADE_Managed/src/Engine/ECS.cxx

@@ -26,7 +26,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "Physics/Interface/SHRigidBodyComponent.h"
 #include "Scene/SHSceneManager.h"
 #include "Scene/SHSceneGraph.h"
-#include "Tools/SHLog.h"
+#include "Tools/Logger/SHLog.h"
 #include "Graphics\MiddleEnd\Interface\SHRenderable.h"
 // Project Headers
 #include "Utility/Convert.hxx"

SHADE_Managed/src/Scripts/ScriptStore.cxx

@@ -20,7 +20,7 @@ of DigiPen Institute of Technology is prohibited.
 #include <sstream>
 // External Dependencies
 #include "ECS_Base/Managers/SHEntityManager.h"
-#include "Tools/SHLog.h"
+#include "Tools/Logger/SHLog.h"
 // Project Headers
 #include "Utility/Debug.hxx"
 #include "Utility/Convert.hxx"

SHADE_Managed/src/Utility/Debug.cxx

@@ -19,7 +19,7 @@ of DigiPen Institute of Technology is prohibited.
 // Standard Libraries
 #include <sstream>
 // External Libraries
-#include "Tools/SHLog.h"
+#include "Tools/Logger/SHLog.h"
 // Project Headers
 #include "Convert.hxx"