Merge branch 'main' into SP3-141-Camera-System

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Report a bug that should be fixed
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest a feature for the project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

Assets/Scenes/M2Scene.shade

@@ -223,9 +223,4 @@
           Bounciness: 0
           Density: 1
           Position Offset: {x: 0, y: 0.5, z: 0}
-  Scripts:
+  Scripts: ~
-    - Type: Item
-      currCategory: 0
-    - Type: PickAndThrow
-      throwForce: [100, 200, 100]
-      item: 51000

SHADE_Application/premake5.lua

@@ -75,7 +75,8 @@ project "SHADE_Application"
     "26439",
     "26451",
     "26437",
-    "4275"
+    "4275",
+    "4635"
   }
 
   linkoptions { "-IGNORE:4006" }

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_CSharp/premake5.lua

@@ -27,6 +27,12 @@ project "SHADE_CSharp"
 
   warnings 'Extra'
   
+  postbuildcommands 
+  {
+    "xcopy  /r /y /q \"%{outputdir}\\net5.0\\SHADE_CSharp.xml\" \"%{outputdir}\"",
+    "xcopy  /r /y /q \"%{outputdir}\\net5.0\\SHADE_CSharp.pdb\" \"%{outputdir}\""
+  }
+
   filter "configurations:Debug"
     symbols "On"
     defines {"_DEBUG"}
@@ -41,12 +47,18 @@ project "SHADE_CSharp"
 
   require "vstudio"
 
-  function platformsElement(cfg)
+  function platformsElementCS(cfg)
     _p(2,'<Platforms>x64</Platforms>')
   end
+  function docsElementCS(cfg)
+    _p(2,'<GenerateDocumentationFile>true</GenerateDocumentationFile>')
+  end
+  function docsLocationElementCS(cfg)
+    _p(2,'<DocumentationFile>$(OutDir)</DocumentationFile>')
+  end
 
   premake.override(premake.vstudio.cs2005.elements, "projectProperties", function (oldfn, cfg)
     return table.join(oldfn(cfg), {
-      platformsElement,
+      platformsElementCS, docsElementCS, docsLocationElementCS,
     })
   end)

SHADE_Engine/premake5.lua

@@ -78,7 +78,8 @@ project "SHADE_Engine"
     "26439",
     "26451",
     "26437",
-    "4275"
+    "4275",
+    "4635"
   }
 
   linkoptions { "-IGNORE:4006" }

SHADE_Engine/src/Assets/SHAssetManager.cpp

@@ -161,21 +161,39 @@ namespace SHADE
       newPath += PREFAB_FOLDER;
       newPath += name;
       newPath += PREFAB_EXTENSION;
-      data = new SHPrefabAsset();
+      {
+        auto prefab = new SHPrefabAsset();
+        prefab->name = name;
+
+        data = prefab;
+      }
+
       break;
 
     case AssetType::SCENE:
       newPath += SCENE_FOLDER;
       newPath += name;
       newPath += SCENE_EXTENSION;
-      data = new SHSceneAsset();
+
+      {
+        auto scene = new SHSceneAsset();
+      scene->name = name;
+
+      data = scene;
+      }
       break;
 
     case AssetType::MATERIAL:
       newPath += MATERIAL_FOLDER;
       newPath += name;
       newPath += MATERIAL_EXTENSION;
-      data = new SHMaterialAsset();
+
+      {
+        auto material = new SHMaterialAsset();
+      material->name = name;
+
+      data = material;
+      }
       break;
 
     default:
@@ -192,7 +210,7 @@ namespace SHADE
       false
     };
 
-    assetCollection.insert({
+    auto result = assetCollection.emplace(
       id,
         SHAsset(
           name,
@@ -201,10 +219,13 @@ namespace SHADE
           newPath,
           false
           )
-    });
+    );
 
     assetData.emplace(id, data);
 
+    SHAssetMetaHandler::WriteMetaData(asset);
+    SaveAsset(id);
+
 		return id;
 	}
 
@@ -361,6 +382,21 @@ namespace SHADE
       modelPath += MODEL_EXTENSION;
       newPath = modelPath;
     }
+    else if (ext == DDS_EXTENSION.data())
+    {
+      auto pathGen = SHTextureCompiler::CompileTextureAsset(path);
+      if (!pathGen.has_value())
+      {
+        SHLOG_ERROR("Texture Compilation Failed for: {}", path.string());
+        return;
+      }
+      newPath = pathGen.value();
+    }
+    else
+    {
+      SHLOG_WARNING("File Type compilation not yet Implemented: {}", path.string());
+      return;
+    }
 
     if (genMeta)
     {
@@ -376,7 +412,7 @@ namespace SHADE
   void SHAssetManager::RefreshDirectory() noexcept
   {
     SHFileSystem::DestroyDirectory(folderRoot);
-    assetCollection.clear();
+    //assetCollection.clear();
     BuildAssetCollection();
   }
 
@@ -507,7 +543,7 @@ namespace SHADE
     {
       SHAsset newAsset{
         path.stem().string(),
-        GenerateAssetID(AssetType::SHADER_BUILT_IN),
+        GenerateAssetID(AssetType::TEXTURE),
         AssetType::SHADER_BUILT_IN,
         path,
         false
@@ -560,6 +596,34 @@ namespace SHADE
       assetCollection.emplace(newAsset.id, newAsset);
       SHAssetMetaHandler::WriteMetaData(newAsset);
 
+      return newAsset.id;
+    }
+    else if (ext == SCENE_EXTENSION)
+    {
+      SHAsset newAsset{
+        path.stem().string(),
+        GenerateAssetID(AssetType::SCENE),
+        AssetType::SCENE,
+        path,
+        false
+      };
+      assetCollection.emplace(newAsset.id, newAsset);
+      SHAssetMetaHandler::WriteMetaData(newAsset);
+
+      return newAsset.id;
+    }
+    else if (ext == FONT_EXTENSION)
+    {
+      SHAsset newAsset{
+        path.stem().string(),
+        GenerateAssetID(AssetType::FONT),
+        AssetType::FONT,
+        path,
+        false
+      };
+      assetCollection.emplace(newAsset.id, newAsset);
+      SHAssetMetaHandler::WriteMetaData(newAsset);
+
       return newAsset.id;
     }
   }
@@ -571,8 +635,11 @@ namespace SHADE
 
     for (auto& file : toGenNew)
     {
-      auto newID{ GenerateNewMeta(file->path).value() };
+      auto newID{ GenerateNewMeta(file->path) };
-      file->assetMeta = &assetCollection[newID];
+      if (newID.has_value())
+      {
+      file->assetMeta = &assetCollection[newID.value()];
+      }
     }
 
     for (auto& asset : std::ranges::views::values(assetCollection))
@@ -583,6 +650,12 @@ namespace SHADE
         for (auto i{ 0 }; i < asset.subAssets.size(); ++i)
         {
           auto const id = asset.subAssets[i]->id;
+          
+          if (assetCollection.contains(id))
+          {
+            continue;
+          }
+
           assetCollection[id] = *asset.subAssets[i];
           delete asset.subAssets[i];
           asset.subAssets[i] = &assetCollection[id];

SHADE_Engine/src/Assets/SHAssetMetaHandler.cpp

@@ -138,6 +138,7 @@ namespace SHADE
 		metaFile.close();
 
 		meta.path = path.parent_path().string() + "/" + path.stem().string();
+    meta.path.make_preferred();
 
 		return meta;
 	}

SHADE_Engine/src/AudioSystem/SHAudioSystem.h

@@ -7,7 +7,7 @@
 #include "ECS_Base/System/SHSystem.h"
 #include "ECS_Base/System/SHSystemRoutine.h"
 #include "ECS_Base/SHECSMacros.h"
-#include "Math/SHMath.h"
+#include "Math/Vector/SHVec3.h"
 #include <optional>
 #include <FMOD/fmod_studio.hpp>
 #include "SH_API.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
@@ -345,10 +345,18 @@ namespace SHADE
   void SHHierarchyPanel::ParentSelectedEntities(EntityID parentEID, std::vector<EntityID> const& entities) const noexcept
   {
     auto const& sceneGraph = SHSceneManager::GetCurrentSceneGraph();
+    
+    std::vector<EntityID> entitiesToParent{};
+    std::ranges::copy_if(entities, std::back_inserter(entitiesToParent), [&sceneGraph](EntityID const& eid)
+      {
+        if (sceneGraph.GetParent(eid)->GetEntityID() == MAX_EID)
+          return true;
+        return false;
+      });
     //auto const editor = SHSystemManager::GetSystem<SHEditor>();
     SHEntityParentCommand::EntityParentData entityParentData;
     std::vector<EntityID> parentedEIDS;
-    for (auto const& eid : entities)
+    for (auto const& eid : entitiesToParent)
     {
       if(eid == parentEID)
         continue;

SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp

@@ -68,10 +68,10 @@ namespace SHADE
   {
     if (!component)
       return;
+    
     const auto componentType = rttr::type::get<T>();
     ImGui::PushID(SHFamilyID<SHComponent>::GetID<T>());
     SHEditorWidgets::CheckBox("##IsActive", [component]() {return component->isActive; }, [component](bool const& active) {component->isActive = active; }, "Is Component Active");
-    ImGui::PopID();
     ImGui::SameLine();
     if (ImGui::CollapsingHeader(componentType.get_name().data()))
     {
@@ -216,6 +216,89 @@ namespace SHADE
       }
     }
     else DrawContextMenu(component);
+    ImGui::PopID();
+
+  }
+
+  template<>
+  static void DrawComponent(SHRigidBodyComponent* component)
+  {
+    if(!component)
+      return;
+    ImGui::PushID(SHFamilyID<SHComponent>::GetID<SHRigidBodyComponent>());
+
+    const auto componentType = rttr::type::get<SHRigidBodyComponent>();
+    SHEditorWidgets::CheckBox("##IsActive", [component]() {return component->isActive; }, [component](bool const& active) {component->isActive = active; }, "Is Component Active");
+    ImGui::SameLine();
+    if (ImGui::CollapsingHeader(componentType.get_name().data()))
+    {
+      DrawContextMenu(component);
+      
+      SHRigidBodyComponent::Type rbType = component->GetType();
+
+      auto enumAlign = rttr::type::get<SHRigidBodyComponent::Type>().get_enumeration();
+      auto names = enumAlign.get_names();
+      std::vector<const char*> list;
+      for (auto const& name : names)
+        list.push_back(name.data());
+      SHEditorWidgets::ComboBox("Type", list, [component] {return static_cast<int>(component->GetType()); }, [component, enumAlign](int const& idx)
+        {
+          auto values = enumAlign.get_values();
+          auto it = std::next(values.begin(), idx);
+          component->SetType((*it).convert<SHRigidBodyComponent::Type>());
+        }, "RigidBody Type");
+      
+      
+      if(rbType == SHRigidBodyComponent::Type::DYNAMIC) //Dynamic only fields
+      {
+        SHEditorWidgets::CheckBox("Use Gravity", [component]{return component->IsGravityEnabled();}, [component](bool const& value){component->SetGravityEnabled(value);}, "Gravity");
+        SHEditorWidgets::DragFloat("Mass", [component] {return component->GetMass(); }, [component](float const& value) {component->SetMass(value); }, "Mass");
+      }
+      if (rbType == SHRigidBodyComponent::Type::DYNAMIC || rbType == SHRigidBodyComponent::Type::KINEMATIC) //Dynamic or Kinematic only fields
+      {
+        SHEditorWidgets::DragFloat("Drag", [component] {return component->GetDrag(); }, [component](float const& value) {component->SetDrag(value); }, "Drag");
+        SHEditorWidgets::DragFloat("Angular Drag", [component] {return component->GetAngularDrag(); }, [component](float const& value) {component->SetAngularDrag(value); }, "Angular Drag");
+
+        SHEditorWidgets::CheckBox("Interpolate", [component] {return component->IsInterpolating(); }, [component](bool const& value) {component->SetInterpolate(value); }, "Interpolate");
+
+        SHEditorWidgets::BeginPanel(std::format("{} Constraints", ICON_FA_LOCK).data(), { ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y });
+
+        SHEditorWidgets::TextLabel("Freeze Position");
+        SHEditorWidgets::CheckBox("X", [component] {return component->GetFreezePositionX(); }, [component](bool const& value) {component->SetFreezePositionX(value); }, "Freeze Position - X"); ImGui::SameLine();
+        SHEditorWidgets::CheckBox("Y", [component] {return component->GetFreezePositionY(); }, [component](bool const& value) {component->SetFreezePositionY(value); }, "Freeze Position - Y"); ImGui::SameLine();
+        SHEditorWidgets::CheckBox("Z", [component] {return component->GetFreezePositionZ(); }, [component](bool const& value) {component->SetFreezePositionZ(value); }, "Freeze Position - Z");
+
+        SHEditorWidgets::TextLabel("Freeze Rotation");
+        SHEditorWidgets::CheckBox("X", [component] {return component->GetFreezeRotationX(); }, [component](bool const& value) {component->SetFreezeRotationX(value); }, "Freeze Rotation - X"); ImGui::SameLine();
+        SHEditorWidgets::CheckBox("Y", [component] {return component->GetFreezeRotationY(); }, [component](bool const& value) {component->SetFreezeRotationY(value); }, "Freeze Rotation - Y"); ImGui::SameLine();
+        SHEditorWidgets::CheckBox("Z", [component] {return component->GetFreezeRotationZ(); }, [component](bool const& value) {component->SetFreezeRotationZ(value); }, "Freeze Rotation - Z");
+
+        SHEditorWidgets::EndPanel();
+      }
+
+      //Debug Info (Read-Only)
+      if(ImGui::CollapsingHeader("Debug Information", ImGuiTreeNodeFlags_DefaultOpen))//Dynamic or Kinematic only fields
+      {
+        SHEditorWidgets::DragVec3("Position", { "X", "Y", "Z" }, [component] {return component->GetPosition(); }, [](SHVec3 const& value) {}, false, "Position", 0.1f, "%.3f", 0.0f, 0.0f, ImGuiSliderFlags_ReadOnly);
+        SHEditorWidgets::DragVec3("Rotation", { "X", "Y", "Z" }, [component] {return component->GetRotation(); }, [](SHVec3 const& value) {}, false, "Rotation", 0.1f, "%.3f", 0.0f, 0.0f, ImGuiSliderFlags_ReadOnly);
+        if (rbType == SHRigidBodyComponent::Type::DYNAMIC || rbType == SHRigidBodyComponent::Type::KINEMATIC) //Dynamic or Kinematic only fields
+        {
+          SHEditorWidgets::DragVec3("Velocity", { "X", "Y", "Z" }, [component] {return component->GetLinearVelocity(); }, [](SHVec3 const& value) {}, false, "Linear Velocity", 0.1f, "%.3f", 0.0f, 0.0f, ImGuiSliderFlags_ReadOnly);
+          SHEditorWidgets::DragVec3("Angular\nVelocity", { "X", "Y", "Z" }, [component] {return component->GetAngularVelocity(); }, [](SHVec3 const& value) {}, false, "Angular Velocity", 0.1f, "%.3f", 0.0f, 0.0f, ImGuiSliderFlags_ReadOnly);
+        }
+        if (rbType == SHRigidBodyComponent::Type::DYNAMIC) //Dynamic only fields
+        {
+          SHEditorWidgets::DragVec3("Force", { "X", "Y", "Z" }, [component] {return component->GetForce(); }, [](SHVec3 const& value) {}, false, "Force", 0.1f, "%.3f", 0.0f, 0.0f, ImGuiSliderFlags_ReadOnly);
+          SHEditorWidgets::DragVec3("Torque", { "X", "Y", "Z" }, [component] {return component->GetTorque(); }, [](SHVec3 const& value) {}, false, "Torque", 0.1f, "%.3f", 0.0f, 0.0f, ImGuiSliderFlags_ReadOnly);
+        } 
+      }
+
+    }
+    else
+    {
+      DrawContextMenu(component);
+    }
+    ImGui::PopID();
   }
 
   template<>
@@ -223,6 +306,7 @@ namespace SHADE
   {
     if (!component)
       return;
+    ImGui::PushID(SHFamilyID<SHComponent>::GetID<SHColliderComponent>());
 
     const auto componentType = rttr::type::get(*component);
     SHEditorWidgets::CheckBox("##IsActive", [component]() {return component->isActive; }, [component](bool const& active) {component->isActive = active; }, "Is Component Active");
@@ -246,7 +330,7 @@ namespace SHADE
         if (collider->GetType() == SHCollisionShape::Type::BOX)
         {
           SHEditorWidgets::BeginPanel(std::format("{} Box #{}", ICON_FA_CUBE, i).data(), { ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y });
-          const auto* BOX = reinterpret_cast<const SHBoundingBox*>(collider->GetShape());
+          const auto* BOX = reinterpret_cast<const SHBox*>(collider->GetShape());
           SHEditorWidgets::DragVec3
           (
             "Half Extents", { "X", "Y", "Z" },
@@ -256,7 +340,7 @@ namespace SHADE
         else if (collider->GetType() == SHCollisionShape::Type::SPHERE)
         {
           SHEditorWidgets::BeginPanel(std::format("{} Sphere #{}", ICON_MD_CIRCLE, i).data(), { ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y });
-          const auto* SPHERE = reinterpret_cast<const SHBoundingSphere*>(collider->GetShape());
+          const auto* SPHERE = reinterpret_cast<const SHSphere*>(collider->GetShape());
           SHEditorWidgets::DragFloat
           (
             "Radius",
@@ -275,21 +359,12 @@ namespace SHADE
           [&collider]
           {
             auto offset = collider->GetRotationOffset();
-            offset.x = SHMath::RadiansToDegrees(offset.x);
-            offset.y = SHMath::RadiansToDegrees(offset.y);
-            offset.z = SHMath::RadiansToDegrees(offset.z);
             return offset;
           }, 
           [&collider](SHVec3 const& vec)
           {
-            const SHVec3 vecInRad
+            collider->SetRotationOffset(vec);
-            {
+          }, true);
-              SHMath::DegreesToRadians(vec.x)
-            , SHMath::DegreesToRadians(vec.y)
-            , SHMath::DegreesToRadians(vec.z)
-            };
-            collider->SetRotationOffset(vecInRad);
-          });
           SHEditorWidgets::EndPanel();
         }
 
@@ -322,6 +397,7 @@ namespace SHADE
       }
     }
     else DrawContextMenu(component);
+    ImGui::PopID();
   }
 
   template<>
@@ -329,6 +405,7 @@ namespace SHADE
   {
     if (!component)
       return;
+    ImGui::PushID(SHFamilyID<SHComponent>::GetID<SHLightComponent>());
     const auto componentType = rttr::type::get(*component);
     SHEditorWidgets::CheckBox("##IsActive", [component]() {return component->isActive; }, [component](bool const& active) {component->isActive = active; }, "Is Component Active");
     ImGui::SameLine();
@@ -352,6 +429,7 @@ namespace SHADE
     {
       DrawContextMenu(component);
     }
+    ImGui::PopID();
   }
 
   template<>
@@ -359,6 +437,7 @@ namespace SHADE
   {
     if (!component)
       return;
+    ImGui::PushID(SHFamilyID<SHComponent>::GetID<SHRenderable>());
     const auto componentType = rttr::type::get(*component);
     SHEditorWidgets::CheckBox("##IsActive", [component]() {return component->isActive; }, [component](bool const& active) {component->isActive = active; }, "Is Component Active");
     ImGui::SameLine();
@@ -396,5 +475,6 @@ namespace SHADE
     {
       DrawContextMenu(component);
     }
+    ImGui::PopID();
   }
 }

SHADE_Engine/src/Editor/EditorWindow/MenuBar/SHEditorMenuBar.cpp

@@ -221,13 +221,20 @@ namespace SHADE
       ImGui::BeginDisabled(editor->editorState == SHEditor::State::PLAY);
       if(ImGui::SmallButton(ICON_MD_PLAY_ARROW))
       {
-        if(editor->SaveScene())
+        if(editor->editorState == SHEditor::State::STOP)
+        {
+          if (editor->SaveScene())
+          {
+            editor->Play();
+          }
+        }
+        else
         {
           editor->Play();
         }
       }
       ImGui::EndDisabled();
-      ImGui::BeginDisabled(editor->editorState == SHEditor::State::PAUSE);
+      ImGui::BeginDisabled(editor->editorState == SHEditor::State::STOP || editor->editorState == SHEditor::State::PAUSE);
       if(ImGui::SmallButton(ICON_MD_PAUSE))
       {
         editor->Pause();

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/EditorWindow/ViewportWindow/SHEditorViewport.cpp

@@ -85,7 +85,7 @@ namespace SHADE
 
       shouldUpdateCamArm = ImGui::IsWindowHovered() && ImGui::IsKeyDown(ImGuiKey_LeftAlt) && ImGui::IsMouseDown(ImGuiMouseButton_Left);
       
-      if (editor->editorState != SHEditor::State::PLAY && ImGui::IsWindowFocused() && !ImGui::IsMouseDown(ImGuiMouseButton_Right))
+      if (editor->editorState != SHEditor::State::PLAY && !ImGui::IsAnyItemActive() && !ImGui::IsMouseDown(ImGuiMouseButton_Right))
       {
         if (ImGui::IsKeyReleased(ImGuiKey_W))
         {
@@ -151,7 +151,7 @@ namespace SHADE
       if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled))
       {
         ImGui::BeginTooltip();
-        ImGui::Text("Translate [Q]");
+        ImGui::Text("Translate [W]");
         ImGui::EndTooltip();
       }
       if (isTranslate)
@@ -169,7 +169,7 @@ namespace SHADE
       if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled))
       {
         ImGui::BeginTooltip();
-        ImGui::Text("Rotate [W]");
+        ImGui::Text("Rotate [E]");
         ImGui::EndTooltip();
       }
       if (isRotate)
@@ -187,7 +187,7 @@ namespace SHADE
       if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled))
       {
         ImGui::BeginTooltip();
-        ImGui::Text("Scale [E]");
+        ImGui::Text("Scale [R]");
         ImGui::EndTooltip();
       }
       if (isScale)

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/Editor/SHEditorWidgets.hpp

@@ -166,14 +166,14 @@ namespace SHADE
       const ImGuiWindow* const window = ImGui::GetCurrentWindow();
       if (window->SkipItems)
         return false;
-
+      static constexpr float defaultLabelColWidth = 80.0f;
       const ImGuiContext& g = *GImGui;
       bool valueChanged = false;
       ImGui::BeginGroup();
       ImGui::PushID(label.c_str());
       PushMultiItemsWidthsAndLabels(componentLabels, 0.0f);
       ImGui::BeginColumns("DragVecCol", 2, ImGuiOldColumnFlags_NoBorder | ImGuiOldColumnFlags_NoResize);
-      ImGui::SetColumnWidth(-1, 80.0f);
+      ImGui::SetColumnWidth(-1, defaultLabelColWidth);
       ImGui::Text(label.c_str());
       if (isHovered)
         *isHovered |= ImGui::IsItemHovered();
@@ -219,7 +219,7 @@ namespace SHADE
       }
       bool const changed = DragN<float, 2>(label, componentLabels, { &values.x, &values.y }, speed, displayFormat, valueMin, valueMax, flags);
       static bool startRecording = false;
-      if (changed)
+      if (!(flags & ImGuiSliderFlags_ReadOnly) && changed)
       {
         if(isAnAngleInRad)
         {
@@ -255,7 +255,7 @@ namespace SHADE
       bool isHovered = false;
       bool const changed = DragN<float, 3>(label, componentLabels, { &values.x, &values.y, &values.z }, speed, displayFormat, valueMin, valueMax, flags, &isHovered);
       static bool startRecording = false;
-      if (changed)
+      if (!(flags & ImGuiSliderFlags_ReadOnly) && changed)
       {
         SHVec3 old = get();
         if(isAnAngleInRad)
@@ -293,7 +293,7 @@ namespace SHADE
       }
       bool const changed = DragN<float, 4>(label, componentLabels, { &values.x, &values.y, &values.z, &values.w }, speed, displayFormat, valueMin, valueMax, flags);
       static bool startRecording = false;
-      if (changed)
+      if (!(flags & ImGuiSliderFlags_ReadOnly) && changed)
       {
         if(isAnAngleInRad)
         {

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/Filesystem/SHFileSystem.cpp

@@ -130,6 +130,14 @@ namespace SHADE
 				}
 
         // If item is folder
+        if (path.stem().string() == "bin"
+          || path.stem().string() == "obj"
+          || !std::filesystem::exists(path))
+        {
+          SHLOG_INFO("[FileSystem] Skipped paths in directory building: {}", path.string());
+          continue;
+        }
+
         auto newFolder{ folder->CreateSubFolderHere(path.stem().string()) };
         folderStack.push(newFolder);
 			}
@@ -144,7 +152,10 @@ namespace SHADE
         bool found{ false };
         for (auto const& asset : assets)
         {
-          assetCollection.emplace(asset.id, asset);
+          if (!assetCollection.contains(asset.id))
+          {
+            assetCollection.emplace(asset.id, asset);
+          }
           if (file.name == asset.name)
           {
             AssetPath path{ file.path };
@@ -162,22 +173,6 @@ namespace SHADE
           toGenerate.push_back(&file);
         }
       }
-      //for (auto const& asset : assets)
-      //{
-      //  assetCollection.emplace(asset.id, asset);
-      //  for(auto& file : folder->files)
-      //  {
-      //    if (file.name == asset.name)
-      //    {
-      //      AssetPath path{ file.path };
-      //      if (SHAssetMetaHandler::GetTypeFromExtension(path.extension().string()) == asset.type)
-      //      {
-      //        file.assetMeta = &assetCollection[asset.id];
-      //        break;
-      //      }
-      //    }
-      //  }
-      //}
 
       for (auto i {0}; i < folder->files.size(); ++i)
       {

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/SHMaterial.h

@@ -17,6 +17,7 @@ of DigiPen Institute of Technology is prohibited.
 // Project Includes
 #include "Resource/SHHandle.h"
 #include "SHCommonTypes.h"
+#include "SH_API.h"
 
 namespace SHADE
 {
@@ -35,7 +36,7 @@ namespace SHADE
 		Describes a Pipeline along with it's associated properties for this instance.
 	*/
 	/***********************************************************************************/
-	class SHMaterial
+	class SH_API SHMaterial
 	{
 	  public:
 		/*-----------------------------------------------------------------------------*/

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/SHMaterialInstance.h

@@ -43,9 +43,9 @@ namespace SHADE
     /*-----------------------------------------------------------------------------*/
     struct OverrideData
     {
-      size_t Index;
+      uint32_t Index;
-      size_t DataSize;
+      uint32_t DataSize;
-      size_t StoredDataOffset;
+      uint32_t StoredDataOffset;
     };
 
     /*-----------------------------------------------------------------------------*/

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

@@ -11,6 +11,7 @@ of DigiPen Institute of Technology is prohibited.
 *//*************************************************************************************/
 #pragma once
 #include "SHMaterialInstance.h"
+#include "SHMaterial.h"
 
 namespace SHADE
 {
@@ -34,26 +35,39 @@ namespace SHADE
       dataStore.reset(new char[dataStoreSize]);
     }
 
-    OverrideData od;
+    // Check if this was stored before
-    od.Index = SHADER_INFO->GetVariableIndex(key);
+    const uint32_t VAR_IDX = SHADER_INFO->GetVariableIndex(key);
-    od.DataSize = sizeof(T);
+    auto existingOverride = std::find_if(overrideData.begin(), overrideData.end(), [&](const OverrideData& od)
-    if (overrideData.empty())
     {
-      od.StoredDataOffset = 0;
+        return od.Index == VAR_IDX;
-    }
+    });
-    else
+    
+    // Otherwise, create it
+    if (existingOverride == overrideData.end())
     {
-      const OverrideData& lastInsertedData = overrideData.back();
+      OverrideData od;
-      od.StoredDataOffset = lastInsertedData.StoredDataOffset + lastInsertedData.DataSize;
+      od.Index = VAR_IDX;
+      od.DataSize = sizeof(T);
+
+      if (overrideData.empty())
+      {
+        od.StoredDataOffset = 0;
+      }
+      else
+      {
+        const OverrideData& lastInsertedData = overrideData.back();
+        od.StoredDataOffset = lastInsertedData.StoredDataOffset + lastInsertedData.DataSize;
+      }
+
+      // Save the override data information
+      overrideData.emplace_back(std::move(od));
+      existingOverride = overrideData.end() - 1;
     }
 
     // Get offset and modify the memory directly
-    T* dataPtr = reinterpret_cast<T*>(dataStore.get() + od.StoredDataOffset);
+    T* dataPtr = reinterpret_cast<T*>(dataStore.get() + existingOverride->StoredDataOffset);
     *dataPtr = value;
     
-    // Save the override data information
-    overrideData.emplace_back(std::move(od));
-
     // Flag
 	dataWasChanged = true;
   }
@@ -70,11 +84,22 @@ namespace SHADE
     // Search Override Data for the property
     uint32_t PROP_IDX = SHADER_INFO->GetVariableIndex(key);
     auto prop = std::find_if(overrideData.begin(), overrideData.end(), [&](const OverrideData& data)
-      {
+    {
-        return PROP_IDX == data.Index;
+      return PROP_IDX == data.Index;
-      });
+    });
+
+    // No overrides, we get from the base material instead
     if (prop == overrideData.end())
-      throw std::invalid_argument("Attempted to get an property that was not set previously!");
+    {
+      if (baseMaterial)
+      {
+        return baseMaterial->GetProperty<T>(key);
+      }
+      else
+      {
+        throw std::invalid_argument("Attempted to get an property that was not set previously!");
+      }
+    }
 
     // Get offset and return the memory directly
     T* dataPtr = reinterpret_cast<T*>(dataStore.get() + prop->StoredDataOffset);

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

@@ -34,8 +34,11 @@ namespace SHADE
   void SHRenderable::OnDestroy()
   {
     // Remove from SuperBatch
-    Handle<SHSuperBatch> superBatch = sharedMaterial->GetBaseMaterial()->GetPipeline()->GetPipelineState().GetSubpass()->GetSuperBatch();
+    if (sharedMaterial)
-	superBatch->Remove(this);
+    {
+      Handle<SHSuperBatch> superBatch = sharedMaterial->GetBaseMaterial()->GetPipeline()->GetPipelineState().GetSubpass()->GetSuperBatch();
+      superBatch->Remove(this);
+    }
 
     // Free resources
     if (material)
@@ -88,6 +91,7 @@ namespace SHADE
     {
       SHGraphicsSystem* gfxSystem = SHSystemManager::GetSystem<SHGraphicsSystem>();
       material = gfxSystem->AddMaterialInstanceCopy(sharedMaterial);
+      matChanged = true;
     }
 
     return material;

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/Geometry/SHBox.cpp

@@ -11,7 +11,7 @@
 #include <SHpch.h>
 
 // Primary Header
-#include "SHBoundingBox.h"
+#include "SHBox.h"
 // Project Headers
 #include "Math/SHMathHelpers.h"
 #include "Math/SHRay.h"
@@ -24,13 +24,13 @@ namespace SHADE
   /* Constructors & Destructor Definitions                                             */
   /*-----------------------------------------------------------------------------------*/
 
-  SHBoundingBox::SHBoundingBox() noexcept
+  SHBox::SHBox() noexcept
   : RelativeExtents { SHVec3::One }
   {
     type = Type::BOX;
   }
 
-  SHBoundingBox::SHBoundingBox(const SHVec3& c, const SHVec3& hE) noexcept
+  SHBox::SHBox(const SHVec3& c, const SHVec3& hE) noexcept
   : RelativeExtents { SHVec3::One }
   {
     type = Type::BOX;
@@ -40,7 +40,7 @@ namespace SHADE
   }
 
 
-  SHBoundingBox::SHBoundingBox(const SHBoundingBox& rhs) noexcept
+  SHBox::SHBox(const SHBox& rhs) noexcept
   {
     if (this == &rhs)
       return;
@@ -52,7 +52,7 @@ namespace SHADE
     RelativeExtents = rhs.RelativeExtents;
   }
 
-  SHBoundingBox::SHBoundingBox(SHBoundingBox&& rhs) noexcept
+  SHBox::SHBox(SHBox&& rhs) noexcept
   {
     type = Type::BOX;
 
@@ -65,7 +65,7 @@ namespace SHADE
   /* Operator Overload Definitions                                                     */
   /*-----------------------------------------------------------------------------------*/
 
-  SHBoundingBox& SHBoundingBox::operator=(const SHBoundingBox& rhs) noexcept
+  SHBox& SHBox::operator=(const SHBox& rhs) noexcept
   {
     if (rhs.type != Type::BOX)
     {
@@ -81,7 +81,7 @@ namespace SHADE
     return *this;
   }
 
-  SHBoundingBox& SHBoundingBox::operator=(SHBoundingBox&& rhs) noexcept
+  SHBox& SHBox::operator=(SHBox&& rhs) noexcept
   {
     if (rhs.type != Type::BOX)
     {
@@ -101,27 +101,27 @@ namespace SHADE
   /* Getter Function Definitions                                                       */
   /*-----------------------------------------------------------------------------------*/
 
-  SHVec3 SHBoundingBox::GetCenter() const noexcept
+  SHVec3 SHBox::GetCenter() const noexcept
   {
     return Center;
   }
 
-  SHVec3 SHBoundingBox::GetWorldExtents() const noexcept
+  SHVec3 SHBox::GetWorldExtents() const noexcept
   {
     return Extents;
   }
 
-  const SHVec3& SHBoundingBox::GetRelativeExtents() const noexcept
+  const SHVec3& SHBox::GetRelativeExtents() const noexcept
   {
     return RelativeExtents;
   }
 
-  SHVec3 SHBoundingBox::GetMin() const noexcept
+  SHVec3 SHBox::GetMin() const noexcept
   {
     return SHVec3{ Center.x - Extents.x, Center.y - Extents.y, Center.z - Extents.z };
   }
 
-  SHVec3 SHBoundingBox::GetMax() const noexcept
+  SHVec3 SHBox::GetMax() const noexcept
   {
     return SHVec3{ Center.x + Extents.x, Center.y + Extents.y, Center.z + Extents.z };
   }
@@ -130,22 +130,22 @@ namespace SHADE
   /* Setter Function Definitions                                                       */
   /*-----------------------------------------------------------------------------------*/
 
-  void SHBoundingBox::SetCenter(const SHVec3& newCenter) noexcept
+  void SHBox::SetCenter(const SHVec3& newCenter) noexcept
   {
     Center = newCenter;
   }
 
-  void SHBoundingBox::SetWorldExtents(const SHVec3& newWorldExtents) noexcept
+  void SHBox::SetWorldExtents(const SHVec3& newWorldExtents) noexcept
   {
     Extents = newWorldExtents;
   }
 
-  void SHBoundingBox::SetRelativeExtents(const SHVec3& newRelativeExtents) noexcept
+  void SHBox::SetRelativeExtents(const SHVec3& newRelativeExtents) noexcept
   {
     RelativeExtents = newRelativeExtents;
   }
 
-  void SHBoundingBox::SetMin(const SHVec3& min) noexcept
+  void SHBox::SetMin(const SHVec3& min) noexcept
   {
     const SHVec3 MAX = GetMax();
 
@@ -153,7 +153,7 @@ namespace SHADE
     Extents = SHVec3::Abs((MAX - min) * 0.5f);
   }
 
-  void SHBoundingBox::SetMax(const SHVec3& max) noexcept
+  void SHBox::SetMax(const SHVec3& max) noexcept
   {
     const SHVec3 MIN = GetMin();
 
@@ -161,13 +161,13 @@ namespace SHADE
     Extents = SHVec3::Abs((max - MIN) * 0.5f);
   }
 
-  void SHBoundingBox::SetMinMax(const SHVec3& min, const SHVec3& max) noexcept
+  void SHBox::SetMinMax(const SHVec3& min, const SHVec3& max) noexcept
   {
     Center  = SHVec3::Lerp(min, max, 0.5f);
     Extents = SHVec3::Abs((max - min) * 0.5f);
   }
 
-  std::vector<SHVec3> SHBoundingBox::GetVertices() const noexcept
+  std::vector<SHVec3> SHBox::GetVertices() const noexcept
   {
     std::vector<SHVec3> vertices{ 8 };
     GetCorners(vertices.data());
@@ -178,27 +178,27 @@ namespace SHADE
   /* Public Function Member Definitions                                                */
   /*-----------------------------------------------------------------------------------*/
 
-  bool SHBoundingBox::TestPoint(const SHVec3& point) noexcept
+  bool SHBox::TestPoint(const SHVec3& point) noexcept
   {
     return BoundingBox::Contains(point);
   }
 
-  bool SHBoundingBox::Raycast(const SHRay& ray, float& distance) noexcept
+  bool SHBox::Raycast(const SHRay& ray, float& distance) noexcept
   {
     return BoundingBox::Intersects(ray.position, ray.direction, distance);
   }
 
-  bool SHBoundingBox::Contains(const SHBoundingBox& rhs) const noexcept
+  bool SHBox::Contains(const SHBox& rhs) const noexcept
   {
     return BoundingBox::Contains(rhs);
   }
 
-  float SHBoundingBox::Volume() const noexcept
+  float SHBox::Volume() const noexcept
   {
     return 8.0f * (Extents.x * Extents.y * Extents.z);
   }
 
-  float SHBoundingBox::SurfaceArea() const noexcept
+  float SHBox::SurfaceArea() const noexcept
   {
     return 8.0f * ((Extents.x * Extents.y) 
       + (Extents.x * Extents.z) 
@@ -209,21 +209,21 @@ namespace SHADE
   /* Static Function Member Definitions                                                */
   /*-----------------------------------------------------------------------------------*/
 
-  SHBoundingBox SHBoundingBox::Combine(const SHBoundingBox& lhs, const SHBoundingBox& rhs) noexcept
+  SHBox SHBox::Combine(const SHBox& lhs, const SHBox& rhs) noexcept
   {
-    SHBoundingBox result;
+    SHBox result;
     CreateMerged(result, lhs, rhs);
     return result;
   }
 
-  bool SHBoundingBox::Intersect(const SHBoundingBox& lhs, const SHBoundingBox& rhs) noexcept
+  bool SHBox::Intersect(const SHBox& lhs, const SHBox& rhs) noexcept
   {
     return lhs.Intersects(rhs);
   }
 
-  SHBoundingBox SHBoundingBox::BuildFromBoxes(const SHBoundingBox* boxes, size_t numBoxes) noexcept
+  SHBox SHBox::BuildFromBoxes(const SHBox* boxes, size_t numBoxes) noexcept
   {
-    SHBoundingBox result;
+    SHBox result;
 
     for (size_t i = 1; i < numBoxes; ++i)
       CreateMerged(result, boxes[i - 1], boxes[i]);
@@ -231,9 +231,9 @@ namespace SHADE
     return result;
   }
 
-  SHBoundingBox SHBoundingBox::BuildFromVertices(const SHVec3* vertices, size_t numVertices, size_t stride) noexcept
+  SHBox SHBox::BuildFromVertices(const SHVec3* vertices, size_t numVertices, size_t stride) noexcept
   {
-    SHBoundingBox result;
+    SHBox result;
     CreateFromPoints(result, numVertices, vertices, stride);
     return result;
   }

SHADE_Engine/src/Math/Geometry/SHBox.h

@@ -22,8 +22,8 @@ namespace SHADE
   /* Type Definitions                                                                  */
   /*-----------------------------------------------------------------------------------*/
 
-  class SH_API SHBoundingBox :  public SHShape,
+  class SH_API SHBox :  public SHShape,
-                                private DirectX::BoundingBox
+                        private DirectX::BoundingBox
   {
   public:
     /*---------------------------------------------------------------------------------*/
@@ -36,19 +36,19 @@ namespace SHADE
     /* Constructors & Destructor                                                       */
     /*---------------------------------------------------------------------------------*/
 
-    ~SHBoundingBox  () override = default;
+    ~SHBox  () override = default;
 
-    SHBoundingBox   ()                                                noexcept;
+    SHBox   ()                                                noexcept;
-    SHBoundingBox   (const SHVec3& center, const SHVec3& halfExtents) noexcept;
+    SHBox   (const SHVec3& center, const SHVec3& halfExtents) noexcept;
-    SHBoundingBox   (const SHBoundingBox& rhs)                        noexcept;
+    SHBox   (const SHBox& rhs)                        noexcept;
-    SHBoundingBox   (SHBoundingBox&& rhs)                             noexcept;
+    SHBox   (SHBox&& rhs)                             noexcept;
 
     /*---------------------------------------------------------------------------------*/
     /* Operator Overloads                                                              */
     /*---------------------------------------------------------------------------------*/
 
-    SHBoundingBox& operator=  (const SHBoundingBox& rhs)  noexcept;
+    SHBox& operator=  (const SHBox& rhs)  noexcept;
-    SHBoundingBox& operator=  (SHBoundingBox&& rhs)       noexcept;
+    SHBox& operator=  (SHBox&& rhs)       noexcept;
 
     /*---------------------------------------------------------------------------------*/
     /* Getter Functions                                                                */
@@ -79,7 +79,7 @@ namespace SHADE
     [[nodiscard]] bool    TestPoint   (const SHVec3& point)               noexcept override;
     [[nodiscard]] bool    Raycast     (const SHRay& ray, float& distance) noexcept override;
 
-    [[nodiscard]] bool    Contains    (const SHBoundingBox& rhs)          const noexcept;
+    [[nodiscard]] bool    Contains    (const SHBox& rhs)          const noexcept;
     [[nodiscard]] float   Volume      ()                                  const noexcept;
     [[nodiscard]] float   SurfaceArea ()                                  const noexcept;
 
@@ -87,10 +87,10 @@ namespace SHADE
     /* Static Function Members                                                         */
     /*---------------------------------------------------------------------------------*/
 
-    [[nodiscard]] static SHBoundingBox  Combine           (const SHBoundingBox& lhs, const SHBoundingBox& rhs)            noexcept;
+    [[nodiscard]] static SHBox  Combine           (const SHBox& lhs, const SHBox& rhs)            noexcept;
-    [[nodiscard]] static bool           Intersect         (const SHBoundingBox& lhs, const SHBoundingBox& rhs)            noexcept;
+    [[nodiscard]] static bool           Intersect         (const SHBox& lhs, const SHBox& rhs)            noexcept;
-    [[nodiscard]] static SHBoundingBox  BuildFromBoxes    (const SHBoundingBox* boxes, size_t numBoxes)                   noexcept;
+    [[nodiscard]] static SHBox  BuildFromBoxes    (const SHBox* boxes, size_t numBoxes)                   noexcept;
-    [[nodiscard]] static SHBoundingBox  BuildFromVertices (const SHVec3* vertices, size_t numVertices, size_t stride = 0) noexcept;
+    [[nodiscard]] static SHBox  BuildFromVertices (const SHVec3* vertices, size_t numVertices, size_t stride = 0) noexcept;
 
   private:
     /*---------------------------------------------------------------------------------*/

SHADE_Engine/src/Math/Geometry/SHSphere.cpp

@@ -11,7 +11,7 @@
 #include <SHpch.h>
 
 // Primary Header
-#include "SHBoundingSphere.h"
+#include "SHSphere.h"
 // Project Headers
 #include "Math/SHMathHelpers.h"
 #include "Math/SHRay.h"
@@ -24,13 +24,13 @@ namespace SHADE
   /* Constructors & Destructor Definitions                                             */
   /*-----------------------------------------------------------------------------------*/
 
-  SHBoundingSphere::SHBoundingSphere() noexcept
+  SHSphere::SHSphere() noexcept
   : RelativeRadius { 1.0f }
   {
     type = Type::SPHERE;
   }
 
-  SHBoundingSphere::SHBoundingSphere(const SHVec3& center, float radius) noexcept
+  SHSphere::SHSphere(const SHVec3& center, float radius) noexcept
   : RelativeRadius { 1.0f }
   {
     type = Type::SPHERE;
@@ -39,7 +39,7 @@ namespace SHADE
     Radius = radius;
   }
 
-  SHBoundingSphere::SHBoundingSphere(const SHBoundingSphere& rhs) noexcept
+  SHSphere::SHSphere(const SHSphere& rhs) noexcept
   {
     if (this == &rhs)
       return;
@@ -51,7 +51,7 @@ namespace SHADE
     RelativeRadius  = rhs.RelativeRadius;
   }
 
-  SHBoundingSphere::SHBoundingSphere(SHBoundingSphere&& rhs) noexcept
+  SHSphere::SHSphere(SHSphere&& rhs) noexcept
   {
     type = Type::SPHERE;
 
@@ -64,7 +64,7 @@ namespace SHADE
   /* Operator Overload Definitions                                                     */
   /*-----------------------------------------------------------------------------------*/
 
-  SHBoundingSphere& SHBoundingSphere::operator=(const SHBoundingSphere& rhs) noexcept
+  SHSphere& SHSphere::operator=(const SHSphere& rhs) noexcept
   {
     if (rhs.type != Type::SPHERE)
     {
@@ -80,7 +80,7 @@ namespace SHADE
     return *this;
   }
 
-  SHBoundingSphere& SHBoundingSphere::operator=(SHBoundingSphere&& rhs) noexcept
+  SHSphere& SHSphere::operator=(SHSphere&& rhs) noexcept
   {
     if (rhs.type != Type::SPHERE)
     {
@@ -100,17 +100,17 @@ namespace SHADE
   /* Getter Function Definitions                                                       */
   /*-----------------------------------------------------------------------------------*/
 
-  SHVec3 SHBoundingSphere::GetCenter() const noexcept
+  SHVec3 SHSphere::GetCenter() const noexcept
   {
     return Center;
   }
 
-  float SHBoundingSphere::GetWorldRadius() const noexcept
+  float SHSphere::GetWorldRadius() const noexcept
   {
     return Radius;
   }
 
-  float SHBoundingSphere::GetRelativeRadius() const noexcept
+  float SHSphere::GetRelativeRadius() const noexcept
   {
     return RelativeRadius;
   }
@@ -119,17 +119,17 @@ namespace SHADE
   /* Setter Function Definitions                                                       */
   /*-----------------------------------------------------------------------------------*/
 
-  void SHBoundingSphere::SetCenter(const SHVec3& center) noexcept
+  void SHSphere::SetCenter(const SHVec3& center) noexcept
   {
     Center = center;
   }
 
-  void SHBoundingSphere::SetWorldRadius(float newWorldRadius) noexcept
+  void SHSphere::SetWorldRadius(float newWorldRadius) noexcept
   {
     Radius = newWorldRadius;
   }
 
-  void SHBoundingSphere::SetRelativeRadius(float newRelativeRadius) noexcept
+  void SHSphere::SetRelativeRadius(float newRelativeRadius) noexcept
   {
     RelativeRadius = newRelativeRadius;
   }
@@ -138,27 +138,27 @@ namespace SHADE
   /* Public Function Member Definitions                                                */
   /*-----------------------------------------------------------------------------------*/
 
-  bool SHBoundingSphere::TestPoint(const SHVec3& point) noexcept
+  bool SHSphere::TestPoint(const SHVec3& point) noexcept
   {
     return BoundingSphere::Contains(point);
   }
 
-  bool SHBoundingSphere::Raycast(const SHRay& ray, float& distance) noexcept
+  bool SHSphere::Raycast(const SHRay& ray, float& distance) noexcept
   {
     return Intersects(ray.position, ray.direction, distance);
   }
 
-  bool SHBoundingSphere::Contains(const SHBoundingSphere& rhs) const noexcept
+  bool SHSphere::Contains(const SHSphere& rhs) const noexcept
   {
     return BoundingSphere::Contains(rhs);
   }
 
-  float SHBoundingSphere::Volume() const noexcept
+  float SHSphere::Volume() const noexcept
   {
     return (4.0f / 3.0f) * SHMath::PI * (Radius * Radius * Radius);
   }
 
-  float SHBoundingSphere::SurfaceArea() const noexcept
+  float SHSphere::SurfaceArea() const noexcept
   {
     return 4.0f * SHMath::PI * (Radius * Radius);
   }
@@ -167,21 +167,21 @@ namespace SHADE
   /* Static Function Member Definitions                                                */
   /*-----------------------------------------------------------------------------------*/
 
-  SHBoundingSphere SHBoundingSphere::Combine(const SHBoundingSphere& lhs, const SHBoundingSphere& rhs) noexcept
+  SHSphere SHSphere::Combine(const SHSphere& lhs, const SHSphere& rhs) noexcept
   {
-    SHBoundingSphere result;
+    SHSphere result;
     CreateMerged(result, lhs, rhs);
     return result;
   }
 
-  bool SHBoundingSphere::Intersect(const SHBoundingSphere& lhs, const SHBoundingSphere& rhs) noexcept
+  bool SHSphere::Intersect(const SHSphere& lhs, const SHSphere& rhs) noexcept
   {
     return lhs.Intersects(rhs);
   }
 
-  SHBoundingSphere SHBoundingSphere::BuildFromSpheres(const SHBoundingSphere* spheres, size_t numSpheres) noexcept
+  SHSphere SHSphere::BuildFromSpheres(const SHSphere* spheres, size_t numSpheres) noexcept
   {
-    SHBoundingSphere result;
+    SHSphere result;
 
     for (size_t i = 1; i < numSpheres; ++i)
       CreateMerged(result, spheres[i - 1], spheres[i]);
@@ -189,9 +189,9 @@ namespace SHADE
     return result;
   }
 
-  SHBoundingSphere SHBoundingSphere::BuildFromVertices(const SHVec3* vertices, size_t numVertices, size_t stride) noexcept
+  SHSphere SHSphere::BuildFromVertices(const SHVec3* vertices, size_t numVertices, size_t stride) noexcept
   {
-    SHBoundingSphere result;
+    SHSphere result;
     CreateFromPoints(result, numVertices, vertices, stride);
     return result;
   }

SHADE_Engine/src/Math/Geometry/SHSphere.h

@@ -22,27 +22,27 @@ namespace SHADE
   /* Type Definitions                                                                  */
   /*-----------------------------------------------------------------------------------*/
 
-  class SH_API SHBoundingSphere : public SHShape,
+  class SH_API SHSphere : public SHShape,
-                                  private DirectX::BoundingSphere
+                          private DirectX::BoundingSphere
   {
   public:
     /*---------------------------------------------------------------------------------*/
     /* Constructors & Destructor                                                       */
     /*---------------------------------------------------------------------------------*/
 
-    SHBoundingSphere  ()                                    noexcept;
+    SHSphere  ()                                    noexcept;
-    SHBoundingSphere  (const SHVec3& center, float radius)  noexcept;
+    SHSphere  (const SHVec3& center, float radius)  noexcept;
-    SHBoundingSphere  (const SHBoundingSphere& rhs)         noexcept;
+    SHSphere  (const SHSphere& rhs)         noexcept;
-    SHBoundingSphere  (SHBoundingSphere&& rhs)              noexcept;
+    SHSphere  (SHSphere&& rhs)              noexcept;
 
-    ~SHBoundingSphere () override = default;
+    ~SHSphere () override = default;
 
     /*---------------------------------------------------------------------------------*/
     /* Operator Overloads                                                              */
     /*---------------------------------------------------------------------------------*/
 
-    SHBoundingSphere& operator=  (const SHBoundingSphere& rhs)  noexcept;
+    SHSphere& operator=  (const SHSphere& rhs)  noexcept;
-    SHBoundingSphere& operator=  (SHBoundingSphere&& rhs)       noexcept;
+    SHSphere& operator=  (SHSphere&& rhs)       noexcept;
 
     /*---------------------------------------------------------------------------------*/
     /* Getter Functions                                                                */
@@ -67,7 +67,7 @@ namespace SHADE
     [[nodiscard]] bool    TestPoint   (const SHVec3& point)               noexcept override;
     [[nodiscard]] bool    Raycast     (const SHRay& ray, float& distance) noexcept override;
 
-    [[nodiscard]] bool    Contains    (const SHBoundingSphere& rhs)       const noexcept;
+    [[nodiscard]] bool    Contains    (const SHSphere& rhs)       const noexcept;
     [[nodiscard]] float   Volume      ()                                  const noexcept;
     [[nodiscard]] float   SurfaceArea ()                                  const noexcept;
 
@@ -76,10 +76,10 @@ namespace SHADE
     /* Static Function Members                                                         */
     /*---------------------------------------------------------------------------------*/
 
-    [[nodiscard]] static SHBoundingSphere Combine           (const SHBoundingSphere& lhs, const SHBoundingSphere& rhs)      noexcept;
+    [[nodiscard]] static SHSphere Combine           (const SHSphere& lhs, const SHSphere& rhs)      noexcept;
-    [[nodiscard]] static bool             Intersect         (const SHBoundingSphere& lhs, const SHBoundingSphere& rhs)      noexcept;
+    [[nodiscard]] static bool             Intersect         (const SHSphere& lhs, const SHSphere& rhs)      noexcept;
-    [[nodiscard]] static SHBoundingSphere BuildFromSpheres  (const SHBoundingSphere* spheres, size_t numSpheres)            noexcept;
+    [[nodiscard]] static SHSphere BuildFromSpheres  (const SHSphere* spheres, size_t numSpheres)            noexcept;
-    [[nodiscard]] static SHBoundingSphere BuildFromVertices (const SHVec3* vertices, size_t numVertices, size_t stride = 0) noexcept;
+    [[nodiscard]] static SHSphere BuildFromVertices (const SHVec3* vertices, size_t numVertices, size_t stride = 0) noexcept;
 
   private:
     /*---------------------------------------------------------------------------------*/

SHADE_Engine/src/Math/SHMatrix.cpp

@@ -483,6 +483,16 @@ namespace SHADE
     return result;
   }
 
+  SHMatrix SHMatrix::Transform(const SHVec3& pos, const SHVec3& eulerAngles, const SHVec3& scale) noexcept
+  {
+    return Scale(scale) * Rotate(eulerAngles) * Translate(pos);
+  }
+
+  SHMatrix SHMatrix::Transform(const SHVec3& pos, const SHQuaternion& rot, const SHVec3& scale) noexcept
+  {
+    return Scale(scale) * Rotate(rot) * Translate(pos);
+  }
+
   SHMatrix SHMatrix::LookAtRH(const SHVec3& eye, const SHVec3& target, const SHVec3& up) noexcept
   {
     SHMatrix result;

SHADE_Engine/src/Math/SHMatrix.h

@@ -131,34 +131,37 @@ namespace SHADE
     /* Static Function Members                                                         */
     /*---------------------------------------------------------------------------------*/
 
-    [[nodiscard]] static SHMatrix Transpose         (const SHMatrix& matrix)                                        noexcept;
+    [[nodiscard]] static SHMatrix Transpose         (const SHMatrix& matrix)                                            noexcept;
-    [[nodiscard]] static SHMatrix Inverse           (const SHMatrix& matrix)                                        noexcept;
+    [[nodiscard]] static SHMatrix Inverse           (const SHMatrix& matrix)                                            noexcept;
 
-    [[nodiscard]] static SHMatrix Translate         (float x, float y, float z)                                     noexcept;
+    [[nodiscard]] static SHMatrix Translate         (float x, float y, float z)                                         noexcept;
-    [[nodiscard]] static SHMatrix Translate         (const SHVec3& pos)                                             noexcept;
+    [[nodiscard]] static SHMatrix Translate         (const SHVec3& pos)                                                 noexcept;
 
-    [[nodiscard]] static SHMatrix Rotate            (const SHVec3& axis, float angleInRad)                          noexcept;
+    [[nodiscard]] static SHMatrix Rotate            (const SHVec3& axis, float angleInRad)                              noexcept;
-    [[nodiscard]] static SHMatrix Rotate            (float yaw, float pitch, float roll)                            noexcept;
+    [[nodiscard]] static SHMatrix Rotate            (float yaw, float pitch, float roll)                                noexcept;
-    [[nodiscard]] static SHMatrix Rotate            (const SHVec3& eulerAngles)                                     noexcept;
+    [[nodiscard]] static SHMatrix Rotate            (const SHVec3& eulerAngles)                                         noexcept;
-    [[nodiscard]] static SHMatrix Rotate            (const SHQuaternion& q)                                         noexcept;
+    [[nodiscard]] static SHMatrix Rotate            (const SHQuaternion& q)                                             noexcept;
-    [[nodiscard]] static SHMatrix RotateX           (float angleInRad)                                              noexcept;
+    [[nodiscard]] static SHMatrix RotateX           (float angleInRad)                                                  noexcept;
-    [[nodiscard]] static SHMatrix RotateY           (float angleInRad)                                              noexcept;
+    [[nodiscard]] static SHMatrix RotateY           (float angleInRad)                                                  noexcept;
-    [[nodiscard]] static SHMatrix RotateZ           (float angleInRad)                                              noexcept;
+    [[nodiscard]] static SHMatrix RotateZ           (float angleInRad)                                                  noexcept;
 
-    [[nodiscard]] static SHMatrix Scale             (float uniformScaleFactor)                                      noexcept;
+    [[nodiscard]] static SHMatrix Scale             (float uniformScaleFactor)                                          noexcept;
-    [[nodiscard]] static SHMatrix Scale             (float x, float y, float z)                                     noexcept;
+    [[nodiscard]] static SHMatrix Scale             (float x, float y, float z)                                         noexcept;
-    [[nodiscard]] static SHMatrix Scale             (const SHVec3& scale)                                           noexcept;
+    [[nodiscard]] static SHMatrix Scale             (const SHVec3& scale)                                               noexcept;
 
-    [[nodiscard]] static SHMatrix LookAtRH          (const SHVec3& eye, const SHVec3& target, const SHVec3& up)     noexcept;
+    [[nodiscard]] static SHMatrix Transform         (const SHVec3& pos, const SHVec3& eulerAngles, const SHVec3& scale) noexcept;
-    [[nodiscard]] static SHMatrix LookAtLH          (const SHVec3& eye, const SHVec3& target, const SHVec3& up)     noexcept;
+    [[nodiscard]] static SHMatrix Transform         (const SHVec3& pos, const SHQuaternion& rot, const SHVec3& scale)   noexcept;
-    [[nodiscard]] static SHMatrix CamToWorldRH      (const SHVec3& pos, const SHVec3& forward, const SHVec3& up)    noexcept;
+
-    [[nodiscard]] static SHMatrix CamToWorldLH      (const SHVec3& pos, const SHVec3& forward, const SHVec3& up)    noexcept;
+    [[nodiscard]] static SHMatrix LookAtRH          (const SHVec3& eye, const SHVec3& target, const SHVec3& up)         noexcept;
-    [[nodiscard]] static SHMatrix PerspectiveFovRH  (float fov, float aspectRatio, float nearPlane, float farPlane) noexcept;
+    [[nodiscard]] static SHMatrix LookAtLH          (const SHVec3& eye, const SHVec3& target, const SHVec3& up)         noexcept;
-    [[nodiscard]] static SHMatrix PerspectiveFovLH  (float fov, float aspectRatio, float nearPlane, float farPlane) noexcept;
+    [[nodiscard]] static SHMatrix CamToWorldRH      (const SHVec3& pos, const SHVec3& forward, const SHVec3& up)        noexcept;
-    [[nodiscard]] static SHMatrix PerspectiveRH     (float width, float height, float nearPlane, float farPlane)    noexcept;
+    [[nodiscard]] static SHMatrix CamToWorldLH      (const SHVec3& pos, const SHVec3& forward, const SHVec3& up)        noexcept;
-    [[nodiscard]] static SHMatrix PerspectiveLH     (float width, float height, float nearPlane, float farPlane)    noexcept;
+    [[nodiscard]] static SHMatrix PerspectiveFovRH  (float fov, float aspectRatio, float nearPlane, float farPlane)     noexcept;
-    [[nodiscard]] static SHMatrix OrthographicRH    (float width, float height, float nearPlane, float farPlane)    noexcept;
+    [[nodiscard]] static SHMatrix PerspectiveFovLH  (float fov, float aspectRatio, float nearPlane, float farPlane)     noexcept;
-    [[nodiscard]] static SHMatrix OrthographicLH    (float width, float height, float nearPlane, float farPlane)    noexcept;
+    [[nodiscard]] static SHMatrix PerspectiveRH     (float width, float height, float nearPlane, float farPlane)        noexcept;
+    [[nodiscard]] static SHMatrix PerspectiveLH     (float width, float height, float nearPlane, float farPlane)        noexcept;
+    [[nodiscard]] static SHMatrix OrthographicRH    (float width, float height, float nearPlane, float farPlane)        noexcept;
+    [[nodiscard]] static SHMatrix OrthographicLH    (float width, float height, float nearPlane, float farPlane)        noexcept;
 
     // TODO(Diren): Billboard, Shadow, Projection & Reflection
   };

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/Interface/SHColliderComponent.cpp

@@ -95,7 +95,7 @@ namespace SHADE
       {
         case SHCollisionShape::Type::BOX:
         {
-          auto* box = reinterpret_cast<SHBoundingBox*>(collisionShape.shape);
+          auto* box = reinterpret_cast<SHBox*>(collisionShape.shape);
           const SHVec3& RELATIVE_EXTENTS = box->GetRelativeExtents();
 
           // Recompute world extents based on new scale and fixed relative extents
@@ -106,7 +106,7 @@ namespace SHADE
         }
         case SHCollisionShape::Type::SPHERE:
         {
-          auto* sphere = reinterpret_cast<SHBoundingSphere*>(collisionShape.shape);
+          auto* sphere = reinterpret_cast<SHSphere*>(collisionShape.shape);
           const float RELATIVE_RADIUS = sphere->GetRelativeRadius();
 
           // Recompute world radius based on new scale and fixed radius

SHADE_Engine/src/Physics/Interface/SHColliderComponent.h

@@ -14,8 +14,8 @@
 
 // Project Headers
 #include "ECS_Base/Components/SHComponent.h"
-#include "Math/Geometry/SHBoundingBox.h"
+#include "Math/Geometry/SHBox.h"
-#include "Math/Geometry/SHBoundingSphere.h"
+#include "Math/Geometry/SHSphere.h"
 #include "SHCollisionShape.h"
 
 //namespace SHADE

SHADE_Engine/src/Physics/Interface/SHCollisionShape.cpp

@@ -13,8 +13,8 @@
 // Primary Header
 #include "SHCollisionShape.h"
 // Project Headers
-#include "Math/Geometry/SHBoundingBox.h"
+#include "Math/Geometry/SHBox.h"
-#include "Math/Geometry/SHBoundingSphere.h"
+#include "Math/Geometry/SHSphere.h"
 #include "Math/SHMathHelpers.h"
 #include "Reflection/SHReflectionMetadata.h"
 #include "SHColliderComponent.h"
@@ -37,12 +37,12 @@ namespace SHADE
     {
       case Type::BOX: 
       {
-        shape = new SHBoundingBox{ SHVec3::Zero, SHVec3::One };
+        shape = new SHBox{ SHVec3::Zero, SHVec3::One };
         break;
       }
       case Type::SPHERE:
       {
-        shape = new SHBoundingSphere{ SHVec3::Zero, 0.5f };
+        shape = new SHSphere{ SHVec3::Zero, 0.5f };
         break;
       }
       default: break;
@@ -177,30 +177,48 @@ namespace SHADE
   {
     dirty = true;
 
-    const auto* colliderComponent = SHComponentManager::GetComponent<SHColliderComponent>(entityID);
+    const auto* COLLIDER = SHComponentManager::GetComponent<SHColliderComponent>(entityID);
+    auto* box = reinterpret_cast<SHBox*>(shape);
+
+    SHVec3 correctedHalfExtents = halfExtents;
+
+    // Get current relative halfExtents for error checking. 0 is ignored
+    const SHVec3& CURRENT_RELATIVE_EXTENTS = box->GetRelativeExtents();
+    for (size_t i = 0; i < SHVec3::SIZE; ++i)
+    {
+      if (SHMath::CompareFloat(halfExtents[i], 0.0f))
+        correctedHalfExtents[i] = CURRENT_RELATIVE_EXTENTS[i];
+    }
+    
     // Set the half extents relative to world scale
-    const SHVec3 WORLD_EXTENTS = halfExtents * colliderComponent->GetScale() * 0.5f;
+    const SHVec3 WORLD_EXTENTS = correctedHalfExtents * COLLIDER->GetScale() * 0.5f;
 
     if (type != Type::BOX)
     {
       type = Type::BOX;
 
       delete shape;
-      shape = new SHBoundingBox{ positionOffset, WORLD_EXTENTS };
+      shape = new SHBox{ positionOffset, WORLD_EXTENTS };
     }
 
-    auto* box = reinterpret_cast<SHBoundingBox*>(shape);
     box->SetWorldExtents(WORLD_EXTENTS);
-    box->SetRelativeExtents(halfExtents);
+    box->SetRelativeExtents(correctedHalfExtents);
   }
 
   void SHCollisionShape::SetBoundingSphere(float radius)
   {
     dirty = true;
 
-    const auto* colliderComponent = SHComponentManager::GetComponent<SHColliderComponent>(entityID);
+    auto* sphere = reinterpret_cast<SHSphere*>(shape);
+    const auto* COLLIDER = SHComponentManager::GetComponent<SHColliderComponent>(entityID);
+
+    // Get current relative halfExtents for error checking. 0 is ignored
+    const float CURRENT_RELATIVE_RADIUS = sphere->GetRelativeRadius();
+    if (SHMath::CompareFloat(radius, 0.0f))
+      radius = CURRENT_RELATIVE_RADIUS;
+
     // Set the radius relative to world scale
-    const SHVec3 WORLD_SCALE  = colliderComponent->GetScale();
+    const SHVec3 WORLD_SCALE  = COLLIDER->GetScale();
     const float MAX_SCALE     = SHMath::Max({ WORLD_SCALE.x, WORLD_SCALE.y, WORLD_SCALE.z });
     const float WORLD_RADIUS  = radius * MAX_SCALE * 0.5f;
 
@@ -209,11 +227,11 @@ namespace SHADE
       type = Type::SPHERE;
 
       delete shape;
-      shape = new SHBoundingSphere{ positionOffset, WORLD_RADIUS };
+      shape = new SHSphere{ positionOffset, WORLD_RADIUS };
     }
 
-    auto* sphere = reinterpret_cast<SHBoundingSphere*>(shape);
     sphere->SetWorldRadius(WORLD_RADIUS);
+    sphere->SetRelativeRadius(radius);
   }
 
   void SHCollisionShape::SetIsTrigger(bool trigger) noexcept
@@ -255,12 +273,12 @@ namespace SHADE
     {
       case Type::BOX:
       {
-        reinterpret_cast<SHBoundingBox*>(shape)->SetCenter(positionOffset);
+        reinterpret_cast<SHBox*>(shape)->SetCenter(positionOffset);
         break;
       }
       case Type::SPHERE:
       {
-        reinterpret_cast<SHBoundingSphere*>(shape)->SetCenter(positionOffset);
+        reinterpret_cast<SHSphere*>(shape)->SetCenter(positionOffset);
         break;
       }
       default: break;
@@ -283,16 +301,16 @@ namespace SHADE
     {
       case Type::BOX: 
       {
-        const auto* RHS_BOX = reinterpret_cast<const SHBoundingBox*>(rhs);
+        const auto* RHS_BOX = reinterpret_cast<const SHBox*>(rhs);
 
-        shape = new SHBoundingBox{ positionOffset, RHS_BOX->GetWorldExtents() };
+        shape = new SHBox{ positionOffset, RHS_BOX->GetWorldExtents() };
         break;
       }
       case Type::SPHERE:
       {
-        const  auto* RHS_SPHERE = reinterpret_cast<const SHBoundingSphere*>(rhs);
+        const  auto* RHS_SPHERE = reinterpret_cast<const SHSphere*>(rhs);
 
-        shape = new SHBoundingSphere{ positionOffset, RHS_SPHERE->GetWorldRadius() };
+        shape = new SHSphere{ positionOffset, RHS_SPHERE->GetWorldRadius() };
         break;
       }
       default: break;

SHADE_Engine/src/Physics/Interface/SHPhysicsMaterial.cpp

@@ -44,7 +44,7 @@ namespace SHADE
         && SHMath::CompareFloat(density, rhs.density);
   }
 
-  bool  SHPhysicsMaterial::operator!=(const SHPhysicsMaterial& rhs) const noexcept
+  bool SHPhysicsMaterial::operator!=(const SHPhysicsMaterial& rhs) const noexcept
   {
     return !SHMath::CompareFloat(friction, rhs.friction)
         || !SHMath::CompareFloat(bounciness, rhs.bounciness)

SHADE_Engine/src/Physics/Interface/SHRigidBodyComponent.cpp

@@ -302,6 +302,9 @@ namespace SHADE
   {
     static constexpr int FLAG_POS = 9;
 
+    if (newMass < 0.0f)
+      return;
+
     if (type != Type::DYNAMIC)
     {
       SHLOG_WARNING("Cannot set mass of a non-dynamic object {}", GetEID())
@@ -385,42 +388,62 @@ namespace SHADE
 
   void SHRigidBodyComponent::AddForce(const SHVec3& force) const noexcept
   {
-    system->AddForce(GetEID(), force);
+    if (auto* physicsObject = system->GetPhysicsObject(GetEID()); physicsObject)
+      physicsObject->GetRigidBody()->applyWorldForceAtCenterOfMass(force);
   }
 
   void SHRigidBodyComponent::AddForceAtLocalPos(const SHVec3& force, const SHVec3& localPos) const noexcept
   {
-    system->AddForceAtLocalPos(GetEID(), force, localPos);
+    if (auto* physicsObject = system->GetPhysicsObject(GetEID()); physicsObject)
+      physicsObject->GetRigidBody()->applyWorldForceAtLocalPosition(force, localPos);
   }
 
   void SHRigidBodyComponent::AddForceAtWorldPos(const SHVec3& force, const SHVec3& worldPos) const noexcept
   {
-    system->AddForceAtWorldPos(GetEID(), force, worldPos);
+    if (auto* physicsObject = system->GetPhysicsObject(GetEID()); physicsObject)
+      physicsObject->GetRigidBody()->applyWorldForceAtWorldPosition(force, worldPos);
   }
 
   void SHRigidBodyComponent::AddRelativeForce(const SHVec3& relativeForce) const noexcept
   {
-    system->AddRelativeForce(GetEID(), relativeForce);
+    if (auto* physicsObject = system->GetPhysicsObject(GetEID()); physicsObject)
+      physicsObject->GetRigidBody()->applyLocalForceAtCenterOfMass(relativeForce);
   }
 
   void SHRigidBodyComponent::AddRelativeForceAtLocalPos(const SHVec3& relativeForce, const SHVec3& localPos) const noexcept
   {
-    system->AddRelativeForceAtLocalPos(GetEID(), relativeForce, localPos);
+    if (auto* physicsObject = system->GetPhysicsObject(GetEID()); physicsObject)
+      physicsObject->GetRigidBody()->applyLocalForceAtLocalPosition(relativeForce, localPos);
   }
 
   void SHRigidBodyComponent::AddRelativeForceAtWorldPos(const SHVec3& relativeForce, const SHVec3& worldPos) const noexcept
   {
-    system->AddRelativeForceAtWorldPos(GetEID(), relativeForce, worldPos);
+    if (auto* physicsObject = system->GetPhysicsObject(GetEID()); physicsObject)
+      physicsObject->GetRigidBody()->applyLocalForceAtWorldPosition(relativeForce, worldPos);
   }
 
   void SHRigidBodyComponent::AddTorque(const SHVec3& torque) const noexcept
   {
-    system->AddTorque(GetEID(), torque);
+    if (auto* physicsObject = system->GetPhysicsObject(GetEID()); physicsObject)
+      physicsObject->GetRigidBody()->applyWorldTorque(torque);
   }
 
   void SHRigidBodyComponent::AddRelativeTorque(const SHVec3& relativeTorque) const noexcept
   {
-    system->AddRelativeTorque(GetEID(), relativeTorque);
+    if (auto* physicsObject = system->GetPhysicsObject(GetEID()); physicsObject)
+      physicsObject->GetRigidBody()->applyLocalTorque(relativeTorque);
+  }
+
+  void SHRigidBodyComponent::ClearForces() const noexcept
+  {
+    if (auto* physicsObject = system->GetPhysicsObject(GetEID()); physicsObject)
+      physicsObject->GetRigidBody()->resetForce();
+  }
+
+  void SHRigidBodyComponent::ClearTorque() const noexcept
+  {
+    if (auto* physicsObject = system->GetPhysicsObject(GetEID()); physicsObject)
+      physicsObject->GetRigidBody()->resetTorque();
   }
 
 } // namespace SHADE

SHADE_Engine/src/Physics/Interface/SHRigidBodyComponent.h

@@ -125,14 +125,15 @@ namespace SHADE
     void  AddForce                    (const SHVec3& force)                                 const noexcept;
     void  AddForceAtLocalPos          (const SHVec3& force, const SHVec3& localPos)         const noexcept;
     void  AddForceAtWorldPos          (const SHVec3& force, const SHVec3& worldPos)         const noexcept;
-
     void  AddRelativeForce            (const SHVec3& relativeForce)                         const noexcept;
     void  AddRelativeForceAtLocalPos  (const SHVec3& relativeForce, const SHVec3& localPos) const noexcept;
     void  AddRelativeForceAtWorldPos  (const SHVec3& relativeForce, const SHVec3& worldPos) const noexcept;
-
     void  AddTorque                   (const SHVec3& torque)                                const noexcept;
     void  AddRelativeTorque           (const SHVec3& relativeTorque)                        const noexcept;
 
+    void  ClearForces                 () const noexcept;
+    void  ClearTorque                 () const noexcept;
+
   private:
     /*---------------------------------------------------------------------------------*/
     /* Data Members                                                                    */

SHADE_Engine/src/Physics/PhysicsObject/SHPhysicsObject.cpp

@@ -16,6 +16,7 @@
 // Project Headers
 #include "ECS_Base/Managers/SHSystemManager.h"
 #include "ECS_Base/Managers/SHComponentManager.h"
+#include "Scene/SHSceneManager.h"
 
 
 namespace SHADE
@@ -25,10 +26,11 @@ namespace SHADE
   /*-----------------------------------------------------------------------------------*/
 
   SHPhysicsObject::SHPhysicsObject(EntityID eid, rp3d::PhysicsCommon* physicsFactory, rp3d::PhysicsWorld* physicsWorld) noexcept
-  : entityID    { eid }
+  : entityID        { eid }
-  , factory     { physicsFactory }
+  , collidersActive { true }
-  , world       { physicsWorld }
+  , factory         { physicsFactory }
-  , rp3dBody    { nullptr }
+  , world           { physicsWorld }
+  , rp3dBody        { nullptr }
   {
     // Implicitly create a static body.
 
@@ -148,6 +150,10 @@ namespace SHADE
 
   void SHPhysicsObject::SyncRigidBody(SHRigidBodyComponent& component) const noexcept
   {
+    // This state is synced in the pre-update routine
+    if (!rp3dBody->isActive())
+      return;
+
     if (component.dirtyFlags == 0)
       return;
 
@@ -267,23 +273,28 @@ namespace SHADE
 
   void SHPhysicsObject::SyncColliders(SHColliderComponent& component) const noexcept
   {
-    int index = 0;
+    // This state is synced in the pre-update routine
-    for (auto& collisionShape : component.collisionShapes)
+    if (!rp3dBody->isActive())
+      return;
+
+    const int NUM_SHAPES = static_cast<int>(component.collisionShapes.size());
+    for (int i = 0; i < NUM_SHAPES; ++i)
     {
+      auto& collisionShape = component.collisionShapes[i];
+
       if (!collisionShape.dirty)
         continue;
 
       switch (collisionShape.GetType())
       {
-        case SHCollisionShape::Type::BOX:     syncBoxShape(index, collisionShape);    break;
+        case SHCollisionShape::Type::BOX:     syncBoxShape(i, collisionShape);    break;
-        case SHCollisionShape::Type::SPHERE:  syncSphereShape(index, collisionShape); break;
+        case SHCollisionShape::Type::SPHERE:  syncSphereShape(i, collisionShape); break;
         default: break;
       }
 
-      // TODO(Diren): Update Material
+      syncMaterial(i, collisionShape);
 
       collisionShape.dirty = false;
-      ++index;
     }
   }
 
@@ -291,6 +302,14 @@ namespace SHADE
   /* Private Function Member Definitions                                               */
   /*-----------------------------------------------------------------------------------*/
 
+  void SHPhysicsObject::syncMaterial(int colliderIndex, SHCollisionShape& collisionShape) const noexcept
+  {
+    auto& rp3dMaterial = rp3dBody->getCollider(colliderIndex)->getMaterial();
+    rp3dMaterial.setFrictionCoefficient(collisionShape.GetFriction());
+    rp3dMaterial.setBounciness(collisionShape.GetBounciness());
+    rp3dMaterial.setMassDensity(collisionShape.GetDensity());
+  }
+
   void SHPhysicsObject::addBoxShape(SHCollisionShape& boxShape) const noexcept
   {
     const rp3d::Transform OFFSETS
@@ -299,7 +318,7 @@ namespace SHADE
     , boxShape.GetRotationOffset()
     };
 
-    const auto* BOX = reinterpret_cast<const SHBoundingBox*>(boxShape.GetShape());
+    const auto* BOX = reinterpret_cast<const SHBox*>(boxShape.GetShape());
     rp3d::BoxShape* newBox = factory->createBoxShape(BOX->GetWorldExtents());
 
     rp3dBody->addCollider(newBox, OFFSETS);
@@ -307,7 +326,7 @@ namespace SHADE
 
   void SHPhysicsObject::syncBoxShape(int index, SHCollisionShape& boxShape) const noexcept
   {
-    const auto* BOX = reinterpret_cast<const SHBoundingBox*>(boxShape.GetShape());
+    const auto* BOX = reinterpret_cast<const SHBox*>(boxShape.GetShape());
 
     auto* rp3dCollider = rp3dBody->getCollider(index);
     auto* rp3dBox = reinterpret_cast<rp3d::BoxShape*>(rp3dCollider->getCollisionShape());
@@ -332,7 +351,7 @@ namespace SHADE
     , sphereShape.GetRotationOffset()
     };
 
-    const auto* SPHERE = reinterpret_cast<const SHBoundingSphere*>(sphereShape.GetShape());
+    const auto* SPHERE = reinterpret_cast<const SHSphere*>(sphereShape.GetShape());
     rp3d::SphereShape* newSphere = factory->createSphereShape(SPHERE->GetWorldRadius());
 
     rp3dBody->addCollider(newSphere, OFFSETS);
@@ -340,7 +359,7 @@ namespace SHADE
 
   void SHPhysicsObject::syncSphereShape(int index, SHCollisionShape& sphereShape) const noexcept
   {
-    const auto* SPHERE = reinterpret_cast<const SHBoundingSphere*>(sphereShape.GetShape());
+    const auto* SPHERE = reinterpret_cast<const SHSphere*>(sphereShape.GetShape());
 
     auto* rp3dCollider = rp3dBody->getCollider(index);
     auto* rp3dSphere = reinterpret_cast<rp3d::SphereShape*>(rp3dCollider->getCollisionShape());

SHADE_Engine/src/Physics/PhysicsObject/SHPhysicsObject.h

@@ -84,17 +84,20 @@ namespace SHADE
     /*---------------------------------------------------------------------------------*/
 
     EntityID              entityID;
+    bool                  collidersActive;  // Only used to sync with SHADE components
 
     rp3d::PhysicsCommon*  factory;
     rp3d::PhysicsWorld*   world;
 
     rp3d::RigidBody*      rp3dBody;
-    rp3d::Transform       prevTransform;  // Cached transform for interpolation
+    rp3d::Transform       prevTransform;    // Cached transform for interpolation
 
     /*---------------------------------------------------------------------------------*/
     /* Function Members                                                                */
     /*---------------------------------------------------------------------------------*/
 
+    void syncMaterial     (int colliderIndex, SHCollisionShape& collisionShape) const noexcept;
+
     // Box Shapes
 
     void addBoxShape      (SHCollisionShape& boxShape) const noexcept;

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
 {
@@ -167,6 +167,7 @@ namespace SHADE
       if (!COMPONENT_GROUP.rigidBodyComponent && !COMPONENT_GROUP.colliderComponent)
       {
         destroyPhysicsObject(COMMAND.eid);
+        wakeAllObjects();
         continue;
       }
 
@@ -176,6 +177,10 @@ namespace SHADE
         physicsObject = createPhysicsObject(COMMAND.eid);
 
       componentFunc[SHUtilities::ConvertEnum(COMMAND.command)][SHUtilities::ConvertEnum(COMMAND.component)](COMMAND, physicsObject, COMPONENT_GROUP);
+
+      // If any removal was done, wake all objects
+      if (COMMAND.command == QueueCommand::Command::REMOVE)
+        wakeAllObjects();
     }
   }
 
@@ -297,5 +302,11 @@ namespace SHADE
     physicsObject->RemoveCollisionShape(command.shapeIndex);
   }
 
+  void SHPhysicsObjectManager::wakeAllObjects() noexcept
+  {
+    for (auto& physicsObject : physicsObjects | std::views::values)
+      physicsObject.GetRigidBody()->setIsSleeping(false);
+  }
+
   
 } // namespace SHADE

SHADE_Engine/src/Physics/PhysicsObject/SHPhysicsObjectManager.h

@@ -165,6 +165,8 @@ namespace SHADE
     SHPhysicsObject*  createPhysicsObject   (EntityID eid) noexcept;
     void              destroyPhysicsObject  (EntityID eid) noexcept;
 
+    void              wakeAllObjects        () noexcept;
+
     static void       addRigidBody          (const QueueCommand& command, SHPhysicsObject* physicsObject, const PhysicsComponentGroup& componentGroup);
     static void       addCollider           (const QueueCommand& command, SHPhysicsObject* physicsObject, const PhysicsComponentGroup& componentGroup);
     static void       removeRigidBody       (const QueueCommand& command, SHPhysicsObject* physicsObject, const PhysicsComponentGroup& componentGroup);
@@ -172,6 +174,8 @@ namespace SHADE
 
     static void       addCollisionShape     (const QueueCommand& command, SHPhysicsObject* physicsObject, const PhysicsComponentGroup& componentGroup);
     static void       removeCollisionShape  (const QueueCommand& command, SHPhysicsObject* physicsObject, const PhysicsComponentGroup& componentGroup);
+
+    
   };
   
 } // namespace SHADE

SHADE_Engine/src/Physics/System/SHPhysicsDebugDrawSystem.cpp

@@ -16,6 +16,7 @@
 // Project Headers
 #include "ECS_Base/Managers/SHSystemManager.h"
 #include "Graphics/MiddleEnd/Interface/SHDebugDrawSystem.h"
+#include "Scene/SHSceneManager.h"
 
 namespace SHADE
 {
@@ -122,6 +123,10 @@ namespace SHADE
     const auto& COLLIDER_SET = SHComponentManager::GetDense<SHColliderComponent>();
     for (const auto& COLLIDER : COLLIDER_SET)
     {
+      // Skip inactive colliders
+      if (!SHSceneManager::CheckNodeAndComponentsActive<SHColliderComponent>(COLLIDER.GetEID()))
+        continue;
+
       for (auto& collisionShape : COLLIDER.GetCollisionShapes())
       {
         switch (collisionShape.GetType())
@@ -176,7 +181,7 @@ namespace SHADE
       return;
     }
 
-    auto* BOX = reinterpret_cast<const SHBoundingBox*>(collisionShape.GetShape());
+    auto* BOX = reinterpret_cast<const SHBox*>(collisionShape.GetShape());
 
     // Calculate final position & orientation
     const SHVec3        FINAL_POS = colliderComponent.GetPosition() + collisionShape.GetPositionOffset();
@@ -216,7 +221,7 @@ namespace SHADE
       return;
     }
 
-    auto* SPHERE = reinterpret_cast<const SHBoundingSphere*>(collisionShape.GetShape());
+    auto* SPHERE = reinterpret_cast<const SHSphere*>(collisionShape.GetShape());
 
     const SHColour COLLIDER_COLOUR = collisionShape.IsTrigger() ? SHColour::PURPLE : SHColour::GREEN;
 

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/Physics/System/SHPhysicsSystem.cpp

@@ -20,6 +20,7 @@
 #include "Editor/SHEditor.h"
 #include "Physics/SHPhysicsEvents.h"
 #include "Scene/SHSceneManager.h"
+#include "Scripting/SHScriptEngine.h"
 
 /*-------------------------------------------------------------------------------------*/
 /* Local Helper Functions                                                              */
@@ -34,16 +35,16 @@ namespace SHADE
   SHPhysicsSystem::SHPhysicsSystem()
   : worldUpdated        { false }
   , interpolationFactor { 0.0 }
-  , fixedDT             { 60.0 }
+  , fixedDT             { DEFAULT_FIXED_STEP }
   {}
 
   /*-----------------------------------------------------------------------------------*/
   /* Getter Function Definitions                                                       */
   /*-----------------------------------------------------------------------------------*/
 
-  double SHPhysicsSystem::GetFixedDT() const noexcept
+  double SHPhysicsSystem::GetFixedUpdateRate() const noexcept
   {
-    return fixedDT;
+    return 1.0 / fixedDT;
   }
 
   const SHPhysicsWorldState::WorldSettings& SHPhysicsSystem::GetWorldSettings() const noexcept
@@ -61,7 +62,7 @@ namespace SHADE
     return collisionListener.GetTriggerInfoContainer();
   }
 
-  const SHPhysicsObject* const SHPhysicsSystem::GetPhysicsObject(EntityID eid) noexcept
+  const SHPhysicsObject* SHPhysicsSystem::GetPhysicsObject(EntityID eid) noexcept
   {
     return objectManager.GetPhysicsObject(eid);
   }
@@ -76,9 +77,9 @@ namespace SHADE
   /* Setter Function Definitions                                                       */
   /*-----------------------------------------------------------------------------------*/
 
-  void SHPhysicsSystem::SetFixedDT(double fixedUpdateRate) noexcept
+  void SHPhysicsSystem::SetFixedUpdateRate(double fixedUpdateRate) noexcept
   {
-    fixedDT = fixedUpdateRate;
+    fixedDT = 1.0 / fixedUpdateRate;
   }
 
   void SHPhysicsSystem::SetWorldSettings(const SHPhysicsWorldState::WorldSettings& settings) noexcept
@@ -126,6 +127,45 @@ namespace SHADE
     worldState.DestroyWorld(factory);
   }
 
+  void SHPhysicsSystem::ForceUpdate()
+  {
+    if (!worldState.world)
+    {
+      SHLOGV_ERROR("Unable to force update without a Physics world!")
+      return;
+    }
+
+    auto* scriptingSystem = SHSystemManager::GetSystem<SHScriptEngine>();
+    if (scriptingSystem == nullptr)
+    {
+        SHLOGV_ERROR("Unable to invoke FixedUpdate() on scripts due to missing SHScriptEngine!");
+    }
+
+    // Force the physics world to update once
+    if (scriptingSystem != nullptr)
+        scriptingSystem->ExecuteFixedUpdates();
+
+    worldState.world->update(static_cast<rp3d::decimal>(fixedDT));
+
+    // Sync transforms. No interpolation applied here
+    for (auto& [entityID, physicsObject] : objectManager.physicsObjects)
+    {
+      auto* transformComponent = SHComponentManager::GetComponent_s<SHTransformComponent>(entityID);
+      auto* rigidBodyComponent = SHComponentManager::GetComponent_s<SHRigidBodyComponent>(entityID);
+      auto* colliderComponent = SHComponentManager::GetComponent_s<SHColliderComponent>(entityID);
+
+      postUpdateSyncTransforms
+      (
+        physicsObject
+      , transformComponent
+      , rigidBodyComponent
+      , colliderComponent
+      , 1.0   // We use 1.0 here to avoid any interpolation
+      );
+    }
+  }
+
+
   void SHPhysicsSystem::AddCollisionShape(EntityID eid, int shapeIndex)
   {
     static const auto ADD_SHAPE = [&](EntityID entityID, int index)
@@ -183,48 +223,6 @@ namespace SHADE
   #endif
   }
 
-  void SHPhysicsSystem::AddForce(EntityID eid, const SHVec3& force) noexcept
-  {
-    auto* physicsObject = objectManager.GetPhysicsObject(eid);
-
-  }
-
-  void SHPhysicsSystem::AddForceAtLocalPos(EntityID eid, const SHVec3& force, const SHVec3& localPos) noexcept
-  {
-    auto* physicsObject = objectManager.GetPhysicsObject(eid);
-  }
-
-  void SHPhysicsSystem::AddForceAtWorldPos(EntityID eid, const SHVec3& force, const SHVec3& worldPos) noexcept
-  {
-    auto* physicsObject = objectManager.GetPhysicsObject(eid);
-  }
-
-  void SHPhysicsSystem::AddRelativeForce(EntityID eid, const SHVec3& relativeForce) noexcept
-  {
-    auto* physicsObject = objectManager.GetPhysicsObject(eid);
-  }
-
-  void SHPhysicsSystem::AddRelativeForceAtLocalPos(EntityID eid, const SHVec3& relativeForce, const SHVec3& localPos) noexcept
-  {
-    auto* physicsObject = objectManager.GetPhysicsObject(eid);
-  }
-
-
-  void SHPhysicsSystem::AddRelativeForceAtWorldPos(EntityID eid, const SHVec3& relativeForce, const SHVec3& worldPos) noexcept
-  {
-    auto* physicsObject = objectManager.GetPhysicsObject(eid);
-  }
-
-  void SHPhysicsSystem::AddTorque(EntityID eid, const SHVec3& torque) noexcept
-  {
-    auto* physicsObject = objectManager.GetPhysicsObject(eid);
-  }
-  
-  void SHPhysicsSystem::AddRelativeTorque(EntityID eid, const SHVec3& relativeTorque) noexcept
-  {
-    auto* physicsObject = objectManager.GetPhysicsObject(eid);
-  }
-
   /*-----------------------------------------------------------------------------------*/
   /* Private Function Member Definitions                                               */
   /*-----------------------------------------------------------------------------------*/
@@ -339,5 +337,93 @@ namespace SHADE
     return onStopEvent->handle;
   }
 
+  void SHPhysicsSystem::preUpdateSyncTransform
+  (
+    SHPhysicsObject&      physicsObject
+  , SHTransformComponent* transformComponent
+  , SHRigidBodyComponent* rigidBodyComponent
+  , SHColliderComponent*  colliderComponent
+  ) noexcept
+  {
+    if (!transformComponent)
+      return;
+
+    const SHVec3&       WORLD_POS = transformComponent->GetWorldPosition();
+    const SHQuaternion& WORLD_ROT = transformComponent->GetWorldOrientation();
+    const SHVec3&       WORLD_SCL = transformComponent->GetWorldScale();
+
+    const rp3d::Transform RP3D_TRANSFORM { WORLD_POS, WORLD_ROT };
+    physicsObject.GetRigidBody()->setTransform(RP3D_TRANSFORM);
+
+    if (rigidBodyComponent && SHSceneManager::CheckNodeAndComponentsActive<SHRigidBodyComponent>(physicsObject.entityID))
+    {
+      rigidBodyComponent->position    = WORLD_POS;
+      rigidBodyComponent->orientation = WORLD_ROT;
+    }
+
+    if (colliderComponent && SHSceneManager::CheckNodeAndComponentsActive<SHColliderComponent>(physicsObject.entityID))
+    {
+      colliderComponent->position     = WORLD_POS;
+      colliderComponent->orientation  = WORLD_ROT;
+      colliderComponent->scale        = WORLD_SCL;
+
+      colliderComponent->RecomputeCollisionShapes();
+    }
+  }
+
+  void SHPhysicsSystem::postUpdateSyncTransforms
+  (
+    SHPhysicsObject&      physicsObject 
+  , SHTransformComponent* transformComponent
+  , SHRigidBodyComponent* rigidBodyComponent
+  , SHColliderComponent*  colliderComponent
+  , double                interpolationFactor
+  ) noexcept
+  {
+    const rp3d::Transform& CURRENT_TF = physicsObject.GetRigidBody()->getTransform();
+    auto  renderPos = CURRENT_TF.getPosition();
+    auto  renderRot = CURRENT_TF.getOrientation();
+
+    // Cache transforms
+    if (physicsObject.GetRigidBody()->isActive())
+      physicsObject.prevTransform = CURRENT_TF;
+
+    // Sync with rigid bodies
+    if (rigidBodyComponent && SHSceneManager::CheckNodeAndComponentsActive<SHRigidBodyComponent>(physicsObject.entityID))
+    {
+      // Skip static bodies
+      if (rigidBodyComponent->GetType() == SHRigidBodyComponent::Type::STATIC)
+        return;
+
+      // Check if transform should be interpolated
+      if (rigidBodyComponent->IsInterpolating())
+      {
+        // Interpolate transforms between current and predicted next transform
+
+        const rp3d::Transform PREV_TF         = physicsObject.prevTransform;
+        const rp3d::Transform INTERPOLATED_TF = rp3d::Transform::interpolateTransforms(PREV_TF, CURRENT_TF, static_cast<rp3d::decimal>(interpolationFactor));
+
+        renderPos = INTERPOLATED_TF.getPosition();
+        renderRot = INTERPOLATED_TF.getOrientation();
+      }
+
+      rigidBodyComponent->position     = CURRENT_TF.getPosition();
+      rigidBodyComponent->orientation  = CURRENT_TF.getOrientation();
+    }
+
+    // Sync with colliders
+    if (colliderComponent && SHSceneManager::CheckNodeAndComponentsActive<SHColliderComponent>(physicsObject.entityID))
+    {
+      colliderComponent->position     = CURRENT_TF.getPosition();
+      colliderComponent->orientation  = CURRENT_TF.getOrientation();
+    }
+
+    // Set transform for rendering
+    if (transformComponent)
+    {
+      transformComponent->SetWorldPosition(renderPos);
+      transformComponent->SetWorldOrientation(renderRot);
+    }
+  }
 
 } // namespace SHADE

SHADE_Engine/src/Physics/System/SHPhysicsSystem.h

@@ -55,20 +55,20 @@ namespace SHADE
     /* Getter Functions                                                                */
     /*---------------------------------------------------------------------------------*/
 
-    [[nodiscard]] double                                                GetFixedDT          ()  const noexcept;
+    [[nodiscard]] double                                                GetFixedUpdateRate  ()  const noexcept;
     [[nodiscard]] const SHPhysicsWorldState::WorldSettings&             GetWorldSettings    ()  const noexcept;
 
     [[nodiscard]] const std::vector<SHCollisionInfo>&                   GetAllCollisionInfo ()  const noexcept;
     [[nodiscard]] const std::vector<SHCollisionInfo>&                   GetAllTriggerInfo   ()  const noexcept;
 
-    [[nodiscard]] const SHPhysicsObject* const                          GetPhysicsObject    (EntityID eid) noexcept;
+    [[nodiscard]] const SHPhysicsObject*                                GetPhysicsObject    (EntityID eid) noexcept;
     [[nodiscard]] const SHPhysicsObjectManager::PhysicsObjectEntityMap& GetPhysicsObjects   ()  const noexcept;
     /*---------------------------------------------------------------------------------*/
     /* Setter Functions                                                                */
     /*---------------------------------------------------------------------------------*/
 
-    void  SetFixedDT        (double fixedUpdateRate)                              noexcept;
+    void  SetFixedUpdateRate  (double fixedUpdateRate)                              noexcept;
-    void  SetWorldSettings  (const SHPhysicsWorldState::WorldSettings& settings)  noexcept;
+    void  SetWorldSettings    (const SHPhysicsWorldState::WorldSettings& settings)  noexcept;
 
     /*---------------------------------------------------------------------------------*/
     /* Function Members                                                                */
@@ -77,25 +77,15 @@ namespace SHADE
     void  Init                  () override;
     void  Exit                  () override;
 
-    // Specific Handling for Collision Shapes as they are not under the Component System
+    void  ForceUpdate           ();
+
+    // Specific Handling for Collision Shapes as they are not under the Component System.
+    // This is done as events need to be sent out.
+    // TODO(Diren): Consider using a static method through the ColliderComponent.
 
     void  AddCollisionShape     (EntityID eid, int shapeIndex);
     void  RemoveCollisionShape  (EntityID eid, int shapeIndex);
 
-    // Forces are applied from components here. These functions should only be invoked during play (through scripts)
-    // Thus there is no need to check for an editor.
-
-    void  AddForce                    (EntityID eid, const SHVec3& force)                                 noexcept;
-    void  AddForceAtLocalPos          (EntityID eid, const SHVec3& force, const SHVec3& localPos)         noexcept;
-    void  AddForceAtWorldPos          (EntityID eid, const SHVec3& force, const SHVec3& worldPos)         noexcept;
-
-    void  AddRelativeForce            (EntityID eid, const SHVec3& relativeForce)                         noexcept;
-    void  AddRelativeForceAtLocalPos  (EntityID eid, const SHVec3& relativeForce, const SHVec3& localPos) noexcept;
-    void  AddRelativeForceAtWorldPos  (EntityID eid, const SHVec3& relativeForce, const SHVec3& worldPos) noexcept;
-
-    void  AddTorque                   (EntityID eid, const SHVec3& torque)                                noexcept;
-    void  AddRelativeTorque           (EntityID eid, const SHVec3& relativeTorque)                        noexcept;
-
     /*---------------------------------------------------------------------------------*/
     /* System Routines                                                                 */
     /*---------------------------------------------------------------------------------*/
@@ -120,15 +110,9 @@ namespace SHADE
       /* Function Members                                                              */
       /*-------------------------------------------------------------------------------*/
 
-      static void syncOnPlay(EntityID eid, SHPhysicsObject& physicsObject) noexcept;
+      void        syncRigidBodyActive (EntityID eid, SHPhysicsObject& physicsObject)  const noexcept;
-
+      void        syncColliderActive  (EntityID eid, SHPhysicsObject& physicsObject)  const noexcept;
-      static void preUpdateSyncTransform
+      static void syncOnPlay          (EntityID eid, SHPhysicsObject& physicsObject)  noexcept;
-      (
-        SHPhysicsObject&      physicsObject 
-      , SHTransformComponent& transformComponent
-      , SHRigidBodyComponent* rigidBodyComponent
-      , SHColliderComponent*  colliderComponent
-      ) noexcept;
     };
 
     class SH_API PhysicsFixedUpdate final : public SHFixedSystemRoutine
@@ -161,20 +145,6 @@ namespace SHADE
       /*-------------------------------------------------------------------------------*/
 
       void Execute(double dt) noexcept override;
-
-    private:
-      /*-------------------------------------------------------------------------------*/
-      /* Function Members                                                              */
-      /*-------------------------------------------------------------------------------*/
-
-      static void postUpdateSyncTransforms
-      (
-        SHPhysicsObject&      physicsObject 
-      , SHTransformComponent& transformComponent
-      , SHRigidBodyComponent* rigidBodyComponent
-      , SHColliderComponent*  colliderComponent
-      , double                interpolationFactor
-      ) noexcept;
     };
 
   private:
@@ -208,5 +178,24 @@ namespace SHADE
     SHEventHandle     onPlay                  (SHEventPtr onPlayEvent);
     SHEventHandle     onStop                  (SHEventPtr onStopEvent);
 
+    
+
+    static void preUpdateSyncTransform
+    (
+      SHPhysicsObject&      physicsObject 
+    , SHTransformComponent* transformComponent
+    , SHRigidBodyComponent* rigidBodyComponent
+    , SHColliderComponent*  colliderComponent
+    ) noexcept;
+
+    static void postUpdateSyncTransforms
+    (
+      SHPhysicsObject&      physicsObject 
+    , SHTransformComponent* transformComponent
+    , SHRigidBodyComponent* rigidBodyComponent
+    , SHColliderComponent*  colliderComponent
+    , double                interpolationFactor
+    ) noexcept;
+
   };
 } // namespace SHADE

SHADE_Engine/src/Physics/System/SHPhysicsSystemInterface.cpp

@@ -55,7 +55,7 @@ namespace SHADE
     auto phySystem = SHSystemManager::GetSystem<SHPhysicsSystem>();
     if (phySystem)
     {
-      return phySystem->GetFixedDT();
+      return phySystem->GetFixedUpdateRate();
     }
 
     SHLOG_WARNING("[SHPhysicsSystemInterface] Failed to get fixed delta time. 0.0 returned instead.");

SHADE_Engine/src/Physics/System/SHPhysicsSystemRoutines.cpp

@@ -13,10 +13,14 @@
 // Primary Header
 #include "SHPhysicsSystem.h"
 // Project Headers
+#include "ECS_Base/Managers/SHEntityManager.h"
 #include "ECS_Base/Managers/SHSystemManager.h"
 #include "Editor/SHEditor.h"
+#include "Scene/SHSceneManager.h"
 #include "Scripting/SHScriptEngine.h"
 
+#include "Input/SHInputManager.h"
+
 namespace SHADE
 {
   /*-----------------------------------------------------------------------------------*/
@@ -43,65 +47,13 @@ namespace SHADE
   {
     auto* physicsSystem  = reinterpret_cast<SHPhysicsSystem*>(GetSystem());
 
-    #ifdef  SHEDITOR
+  #ifdef  SHEDITOR
-
-      auto* editor = SHSystemManager::GetSystem<SHEditor>();
-
-      // Only Sync on Play.
-      // Otherwise, Components are only holding data until the world is built on play.
-
-      if (editor)
-      {
-        if (editor->editorState != SHEditor::State::STOP)
-        {
-          physicsSystem->objectManager.UpdateCommands();
-
-          for (auto& [entityID, physicsObject] : physicsSystem->objectManager.physicsObjects)
-          {
-            // Ensure a valid physics Object
-            if (physicsObject.rp3dBody == nullptr)
-              continue;
-
-            syncOnPlay(entityID, physicsObject);
-          }
-        }
-        else
-        {
-          auto& rigidBodyDense  = SHComponentManager::GetDense<SHRigidBodyComponent>();
-          auto& colliderDense   = SHComponentManager::GetDense<SHColliderComponent>();
-
-          for (auto& rigidBodyComponent : rigidBodyDense)
-          {
-            const auto* TRANSFORM = SHComponentManager::GetComponent_s<SHTransformComponent>(rigidBodyComponent.GetEID());
-
-            if (TRANSFORM && TRANSFORM->HasChanged())
-            {
-              rigidBodyComponent.position     = TRANSFORM->GetWorldPosition();
-              rigidBodyComponent.orientation  = TRANSFORM->GetWorldOrientation();
-            }
-          }
-
-          for (auto& colliderComponent : colliderDense)
-          {
-            const auto* TRANSFORM = SHComponentManager::GetComponent_s<SHTransformComponent>(colliderComponent.GetEID());
-
-            if (TRANSFORM && TRANSFORM->HasChanged())
-            {
-              colliderComponent.position    = TRANSFORM->GetWorldPosition();
-              colliderComponent.orientation = TRANSFORM->GetWorldOrientation();
-              colliderComponent.scale       = TRANSFORM->GetWorldScale();
-
-              colliderComponent.RecomputeCollisionShapes();
-            }
-          }
-        }
-      }
-
-    #else
-
-      // Always sync Rigid Body & Collider Components with Physics Objects
-      // Do not check for an editor here
 
+    // Only Sync on Play.
+    // Otherwise, Components are only holding data until the world is built on play.
+    const auto* EDITOR = SHSystemManager::GetSystem<SHEditor>();
+    if (EDITOR && EDITOR->editorState != SHEditor::State::STOP)
+    {
       physicsSystem->objectManager.UpdateCommands();
 
       for (auto& [entityID, physicsObject] : physicsSystem->objectManager.physicsObjects)
@@ -110,10 +62,64 @@ namespace SHADE
         if (physicsObject.rp3dBody == nullptr)
           continue;
 
+        // Sync active states between SHADE & RP3D
+        syncRigidBodyActive(entityID, physicsObject);
+        syncColliderActive(entityID, physicsObject);
+
         syncOnPlay(entityID, physicsObject);
       }
+    }
+    else
+    {
+      auto& rigidBodyDense  = SHComponentManager::GetDense<SHRigidBodyComponent>();
+      auto& colliderDense   = SHComponentManager::GetDense<SHColliderComponent>();
 
-    #endif
+      for (auto& rigidBodyComponent : rigidBodyDense)
+      {
+        const auto* TRANSFORM = SHComponentManager::GetComponent_s<SHTransformComponent>(rigidBodyComponent.GetEID());
+
+        if (TRANSFORM && TRANSFORM->HasChanged())
+        {
+          rigidBodyComponent.position     = TRANSFORM->GetWorldPosition();
+          rigidBodyComponent.orientation  = TRANSFORM->GetWorldOrientation();
+        }
+      }
+
+      for (auto& colliderComponent : colliderDense)
+      {
+        const auto* TRANSFORM = SHComponentManager::GetComponent_s<SHTransformComponent>(colliderComponent.GetEID());
+
+        if (TRANSFORM && TRANSFORM->HasChanged())
+        {
+          colliderComponent.position    = TRANSFORM->GetWorldPosition();
+          colliderComponent.orientation = TRANSFORM->GetWorldOrientation();
+          colliderComponent.scale       = TRANSFORM->GetWorldScale();
+
+          colliderComponent.RecomputeCollisionShapes();
+        }
+      }
+    }
+
+  #else
+
+    // Always sync Rigid Body & Collider Components with Physics Objects
+    // Do not check for an editor here
+
+    physicsSystem->objectManager.UpdateCommands();
+
+    for (auto& [entityID, physicsObject] : physicsSystem->objectManager.physicsObjects)
+    {
+      // Ensure a valid physics Object
+      if (physicsObject.rp3dBody == nullptr)
+        continue;
+
+      syncRigidBodyActive(entityID, physicsObject);
+      syncColliderActive(entityID, physicsObject);
+
+      syncOnPlay(entityID, physicsObject);
+    }
+
+  #endif
   }
 
   void SHPhysicsSystem::PhysicsFixedUpdate::Execute(double dt) noexcept
@@ -125,18 +131,18 @@ namespace SHADE
         SHLOGV_ERROR("Unable to invoke FixedUpdate() on scripts due to missing SHScriptEngine!");
     }
 
-    fixedTimeStep = 1.0 / physicsSystem->fixedDT;
+    const double FIXED_DT = physicsSystem->fixedDT;
     accumulatedTime += dt;
 
     int count = 0;
-    while (accumulatedTime > fixedTimeStep)
+    while (accumulatedTime > FIXED_DT)
     {
       if (scriptingSystem != nullptr)
         scriptingSystem->ExecuteFixedUpdates();
 
-      physicsSystem->worldState.world->update(static_cast<rp3d::decimal>(fixedTimeStep));
+      physicsSystem->worldState.world->update(static_cast<rp3d::decimal>(FIXED_DT));
 
-      accumulatedTime -= fixedTimeStep;
+      accumulatedTime -= FIXED_DT;
       ++count;
     }
 
@@ -165,17 +171,14 @@ namespace SHADE
         auto* rigidBodyComponent  = SHComponentManager::GetComponent_s<SHRigidBodyComponent>(entityID);
         auto* colliderComponent   = SHComponentManager::GetComponent_s<SHColliderComponent>(entityID);
 
-        if (transformComponent)
+        postUpdateSyncTransforms
-        {
+        (
-          postUpdateSyncTransforms
+          physicsObject
-          (
+        , transformComponent
-            physicsObject
+        , rigidBodyComponent
-          , *transformComponent
+        , colliderComponent
-          , rigidBodyComponent
+        , physicsSystem->interpolationFactor
-          , colliderComponent
+        );
-          , physicsSystem->interpolationFactor
-          );
-        }
       }
 
       // Collision & Trigger messages
@@ -191,6 +194,48 @@ namespace SHADE
   /* Private Function Member Definitions                                               */
   /*-----------------------------------------------------------------------------------*/
 
+  void SHPhysicsSystem::PhysicsPreUpdate::syncRigidBodyActive(EntityID eid, SHPhysicsObject& physicsObject) const noexcept
+  {
+    if (!SHComponentManager::HasComponent<SHRigidBodyComponent>(eid))
+      return;
+
+    const bool IS_ACTIVE_IN_SCENE   = SHSceneManager::CheckNodeAndComponentsActive<SHRigidBodyComponent>(eid);
+    const bool IS_RP3D_BODY_ACTIVE  = physicsObject.GetRigidBody()->isActive();
+
+    if (IS_ACTIVE_IN_SCENE != IS_RP3D_BODY_ACTIVE)
+      physicsObject.GetRigidBody()->setIsActive(IS_ACTIVE_IN_SCENE);
+  }
+
+  void SHPhysicsSystem::PhysicsPreUpdate::syncColliderActive(EntityID eid, SHPhysicsObject& physicsObject) const noexcept
+  {
+    const auto* COLLIDER = SHComponentManager::GetComponent_s<SHColliderComponent>(eid);
+    if (!COLLIDER)
+      return;
+
+    const bool IS_ACTIVE_IN_SCENE       = SHSceneManager::CheckNodeAndComponentsActive<SHColliderComponent>(eid);
+    const bool IS_RP3D_COLLIDER_ACTIVE  = physicsObject.collidersActive;
+
+    if (IS_ACTIVE_IN_SCENE != IS_RP3D_COLLIDER_ACTIVE)
+    {
+      // HACK: If active state turned off, remove all collision shapes. If turned on, add them back.
+      auto* physicsSystem = reinterpret_cast<SHPhysicsSystem*>(GetSystem());
+
+      const int NUM_SHAPES = static_cast<int>(COLLIDER->GetCollisionShapes().size());
+      if (IS_ACTIVE_IN_SCENE)
+      {
+        for (int i = 0; i < NUM_SHAPES; ++i)
+          physicsSystem->objectManager.AddCollisionShape(eid, i);
+      }
+      else
+      {
+        for (int i = NUM_SHAPES - 1; i >= 0; --i)
+          physicsSystem->objectManager.RemoveCollisionShape(eid, i);
+      }
+
+      physicsObject.collidersActive = IS_ACTIVE_IN_SCENE;
+    }
+  }
+
   void SHPhysicsSystem::PhysicsPreUpdate::syncOnPlay(EntityID eid, SHPhysicsObject& physicsObject) noexcept
   {
     auto* transformComponent  = SHComponentManager::GetComponent_s<SHTransformComponent>(eid);
@@ -203,7 +248,7 @@ namespace SHADE
       preUpdateSyncTransform
       (
         physicsObject
-      , *transformComponent
+      , transformComponent
       , rigidBodyComponent
       , colliderComponent
       );
@@ -217,99 +262,4 @@ namespace SHADE
     if (colliderComponent)
       physicsObject.SyncColliders(*colliderComponent);
   }
-
-  void SHPhysicsSystem::PhysicsPreUpdate::preUpdateSyncTransform
-  (
-    SHPhysicsObject&      physicsObject
-  , SHTransformComponent& transformComponent
-  , SHRigidBodyComponent* rigidBodyComponent
-  , SHColliderComponent*  colliderComponent
-  ) noexcept
-  {
-    const SHVec3&       WORLD_POS = transformComponent.GetWorldPosition();
-    const SHQuaternion& WORLD_ROT = transformComponent.GetWorldOrientation();
-    const SHVec3&       WORLD_SCL = transformComponent.GetWorldScale();
-
-    const rp3d::Transform RP3D_TRANSFORM { WORLD_POS, WORLD_ROT };
-    physicsObject.GetRigidBody()->setTransform(RP3D_TRANSFORM);
-
-    if (rigidBodyComponent)
-    {
-      rigidBodyComponent->position    = WORLD_POS;
-      rigidBodyComponent->orientation = WORLD_ROT;
-    }
-
-    if (colliderComponent)
-    {
-      colliderComponent->position     = WORLD_POS;
-      colliderComponent->orientation  = WORLD_ROT;
-      colliderComponent->scale        = WORLD_SCL;
-
-      colliderComponent->RecomputeCollisionShapes();
-    }
-  }
-
-  void SHPhysicsSystem::PhysicsPostUpdate::postUpdateSyncTransforms
-  (
-    SHPhysicsObject&      physicsObject 
-  , SHTransformComponent& transformComponent
-  , SHRigidBodyComponent* rigidBodyComponent
-  , SHColliderComponent*  colliderComponent
-  , double                interpolationFactor
-  ) noexcept
-  {
-    rp3d::Vector3     rp3dPos;
-    rp3d::Quaternion  rp3dRot;
-
-    const rp3d::Transform CURRENT_TF = physicsObject.rp3dBody->getTransform();
-
-    // Check if transform should be interpolated
-      
-    if (rigidBodyComponent)
-    {
-      // Skip static bodies
-      if (rigidBodyComponent->GetType() == SHRigidBodyComponent::Type::STATIC)
-        return;
-
-      if (rigidBodyComponent->IsInterpolating())
-      {
-        // Interpolate transforms between current and predicted next transform
-
-        const rp3d::Transform PREV_TF         = physicsObject.prevTransform;
-        const rp3d::Transform INTERPOLATED_TF = rp3d::Transform::interpolateTransforms(PREV_TF, CURRENT_TF, static_cast<rp3d::decimal>(interpolationFactor));
-
-        rp3dPos = INTERPOLATED_TF.getPosition();
-        rp3dRot = INTERPOLATED_TF.getOrientation();
-      }
-      else
-      {
-        rp3dPos = CURRENT_TF.getPosition();
-        rp3dRot = CURRENT_TF.getOrientation();
-      }
-
-      rigidBodyComponent->position     = CURRENT_TF.getPosition();
-      rigidBodyComponent->orientation  = CURRENT_TF.getOrientation();
-
-      if (colliderComponent)
-      {
-        // Sync with colliders
-
-        colliderComponent->position     = CURRENT_TF.getPosition();
-        colliderComponent->orientation  = CURRENT_TF.getOrientation();
-      }
-    }
-    else
-    {
-      rp3dPos = CURRENT_TF.getPosition();
-      rp3dRot = CURRENT_TF.getOrientation();
-    }
-
-    // Convert RP3D Transform to SHADE
-    transformComponent.SetWorldPosition(rp3dPos);
-    transformComponent.SetWorldOrientation(rp3dRot);
-
-    // Cache transforms
-    physicsObject.prevTransform = CURRENT_TF;
-  }
-
 } // 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"
@@ -272,6 +272,7 @@ namespace SHADE
   <ItemGroup>\n\
     <None Remove=\".gitignore\" />\n\
     <None Remove=\".gitmodules\" />\n\
+    <None Remove=\"*.shmeta\" />\n\
   </ItemGroup>\n\
   <ItemGroup>\n\
     <Reference Include=\"SHADE_Managed\">\n";
@@ -615,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());
     }
 
@@ -629,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());
       }
 
@@ -646,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/SHSerialization.cpp

@@ -179,7 +179,9 @@ namespace SHADE
   {
     if (ComponentType* component = SHComponentManager::GetComponent_s<ComponentType>(eid))
     {
-      componentsNode[rttr::type::get<ComponentType>().get_name().data()] = YAML::convert<ComponentType>::encode(*component);
+      auto componentNode = YAML::convert<ComponentType>::encode(*component);
+      componentNode[IsActive.data()] = component->isActive;
+      componentsNode[rttr::type::get<ComponentType>().get_name().data()] = componentNode;
     }
   }
 

SHADE_Engine/src/Serialization/SHSerializationHelper.hpp

@@ -9,11 +9,13 @@
 
 #include "ECS_Base/Managers/SHComponentManager.h"
 #include "Graphics/MiddleEnd/Materials/SHMaterialSpec.h"
-#include "Tools/SHLog.h"
+#include "Tools/Logger/SHLog.h"
 
 
 namespace SHADE
 {
+  static constexpr std::string_view IsActive = "IsActive";
+
   using AssetQueue =  std::unordered_map<AssetID, AssetType>;
   struct SHSerializationHelper
   {
@@ -118,9 +120,9 @@ namespace SHADE
       YAML::Node node{};
       if (!component)
         return node;
-
       auto componentType = rttr::type::get<ComponentType>();
       node = RTTRToNode(*component);
+      node[IsActive.data()] = component->isActive;
 
       return node;
     }
@@ -198,6 +200,9 @@ namespace SHADE
       auto componentNode = componentsNode[rttrType.get_name().data()];
       if (!componentNode.IsDefined())
         return;
+      if(componentNode[IsActive.data()].IsDefined())
+        component->isActive = componentNode[IsActive.data()].as<bool>();
+      
       auto properties = rttrType.get_properties();
       for (auto const& prop : properties)
       {
@@ -227,8 +232,10 @@ namespace SHADE
       auto component = SHComponentManager::GetComponent_s<ComponentType>(eid);
       if (componentsNode.IsNull() && !component)
         return;
-     
+      auto componentNode = GetComponentNode<ComponentType>(componentsNode, eid);
-      YAML::convert<ComponentType>::decode(GetComponentNode<ComponentType>(componentsNode, eid), *component);
+      if (componentNode[IsActive.data()].IsDefined())
+        component->isActive = componentNode[IsActive.data()].as<bool>();
+      YAML::convert<ComponentType>::decode(componentNode, *component);
     }
 
     template <typename ComponentType, std::enable_if_t<std::is_base_of_v<SHComponent, ComponentType>, bool> = true>

SHADE_Engine/src/Serialization/SHYAMLConverters.h

@@ -1,8 +1,8 @@
 #pragma once
 #include "Graphics/MiddleEnd/Interface/SHRenderable.h"
 #include "Graphics/MiddleEnd/Materials/SHMaterialSpec.h"
-#include "Math/Geometry/SHBoundingBox.h"
+#include "Math/Geometry/SHBox.h"
-#include "Math/Geometry/SHBoundingSphere.h"
+#include "Math/Geometry/SHSphere.h"
 #include "Physics/Interface/SHCollisionShape.h"
 #include "Resource/SHResourceManager.h"
 #include "Math/Vector/SHVec2.h"
@@ -130,13 +130,13 @@ namespace YAML
       {
       case SHCollisionShape::Type::BOX:
       {
-        const auto* BOX = reinterpret_cast<const SHBoundingBox*>(rhs.GetShape());
+        const auto* BOX = reinterpret_cast<const SHBox*>(rhs.GetShape());
         node[HalfExtents] = BOX->GetRelativeExtents();
       }
       break;
       case SHCollisionShape::Type::SPHERE:
       {
-        const auto* SPHERE = reinterpret_cast<const SHBoundingSphere*>(rhs.GetShape());
+        const auto* SPHERE = reinterpret_cast<const SHSphere*>(rhs.GetShape());
         node[Radius] = SPHERE->GetRelativeRadius();
       }
       break;
@@ -288,7 +288,15 @@ namespace YAML
     {
       YAML::Node node;
       node[MESH_YAML_TAG.data()] = SHResourceManager::GetAssetID<SHMesh>(rhs.GetMesh()).value_or(0);
-      node[MAT_YAML_TAG.data()] = SHResourceManager::GetAssetID<SHMaterial>(rhs.GetMaterial()->GetBaseMaterial()).value_or(0);
+      auto mat = rhs.GetMaterial();
+      if (mat)
+      {
+        node[MAT_YAML_TAG.data()] = SHResourceManager::GetAssetID<SHMaterial>(rhs.GetMaterial()->GetBaseMaterial()).value_or(0);
+      }
+      else
+      {
+        node[MAT_YAML_TAG.data()] = 0;
+      }
       return node;
     }
     static bool decode(YAML::Node const& node, SHRenderable& rhs)

SHADE_Engine/src/Tools/Logger/SHLog.cpp

@@ -44,13 +44,6 @@ namespace SHADE
 		SHLOG_FLOOR()
 	}
 
-#ifdef _DEBUG
-	void SHLog::Trace(const std::string& msg) noexcept
-	{
-		SHLOG_TRACE(msg)
-	}
-#endif
-
     void SHLog_Info(const char* msg) noexcept
     {
 		SHLOG_INFO(msg)

SHADE_Engine/src/Tools/Logger/SHLogger.cpp

@@ -323,34 +323,6 @@ namespace SHADE
     SHLOG_FLOOR()
   }
 
-  #ifdef _DEBUG
-    void SHLogger::LogTrace(const std::string& msg) noexcept
-    {
-      SHLOG_TRACE(msg)
-    }
-
-    void SHLogger::LogVerboseTrace(const std::string& msg, const std::source_location& src) noexcept
-    {
-      const bool SHOW_SRC_FILE  = configFlags & (1U << 3);
-      const bool SHOW_SRC_LINE  = configFlags & (1U << 4);
-
-      std::stringstream ss;
-      ss << "[";
-      if (SHOW_SRC_FILE)
-      {
-        ss << std::filesystem::path(src.file_name()).filename().string() << ", ";
-        if (SHOW_SRC_LINE)
-        {
-            ss << src.line() << ", ";
-        }
-      }
-
-      ss << src.function_name() << "] " << msg;
-    
-      SHLOG_TRACE(ss.str())
-    }
-  #endif
-
   /*-----------------------------------------------------------------------------------*/
   /* Private Function Member Definitions                                               */
   /*-----------------------------------------------------------------------------------*/

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"