SHADE_Application/src/Scenes/SBMainScene.cpp

@@ -44,8 +44,6 @@ namespace Sandbox
   {
     sceneName = SHSerialization::DeserializeSceneFromFile(sceneAssetID);
 
-  #ifndef SHEDITOR
-
     auto* physicsSystem = SHSystemManager::GetSystem<SHPhysicsSystem>();
     if (!physicsSystem)
     {
@@ -53,6 +51,12 @@ namespace Sandbox
       return;
     }
 
+  #ifdef SHEDITOR
+
+    physicsSystem->ForceBuild(SHSceneManager::GetCurrentSceneGraph());
+
+  #else
+
     physicsSystem->BuildScene(SHSceneManager::GetCurrentSceneGraph());
 
   #endif

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

@@ -69,7 +69,8 @@ namespace SHADE
     if (gfxSystem)
     {
       auto WND = gfxSystem->GetWindow();
-      return WND->Close();
+      if (WND)
+        WND->Destroy();
     }
 
     SHLOG_WARNING("[SHGraphicsSystemInterface] Failed to close window.");

SHADE_Engine/src/Physics/System/SHPhysicsSystem.cpp

@@ -188,6 +188,13 @@ namespace SHADE
     objectManager.UpdateCommands();
   }
 
+  void SHPhysicsSystem::ForceBuild(SHSceneGraph& sceneGraph)
+  {
+    // HACK: Band-aid fix. To be removed.
+    objectManager.UpdateCommands();
+  }
+
+
   void SHPhysicsSystem::ForceUpdate()
   {
     if (!worldState.world)
@@ -419,7 +426,6 @@ namespace SHADE
         for (size_t i = 0; i < COLLIDER->GetCollisionShapes().size(); ++i)
           objectManager.AddCollisionShape(EID, i);
       }
-        
     };
 
     ////////////////////////////////

SHADE_Engine/src/Physics/System/SHPhysicsSystem.h

@@ -78,9 +78,9 @@ namespace SHADE
     void  Exit        () override;
 
     void  BuildScene  (SHSceneGraph& sceneGraph);
+    void  ForceBuild  (SHSceneGraph& sceneGraph);
     void  ForceUpdate ();
 
-
     /**
      * @brief Casts a ray into the world.
      * @param ray The ray to cast.