Removed world stack

Include/Assets/Level.h

@@ -33,9 +33,13 @@ namespace CE
 		Level& operator=(const Level&) = delete;
 
 		void CreateFromWorld(const World& world);
-		World CreateWorld(bool callBeginPlayImmediately) const;
+		void LoadIntoWorld(World& world) const;
 
-		static World CreateDefaultWorld();
+		// Will never return nullptr
+		std::unique_ptr<World> CreateWorld(bool callBeginPlayImmediately) const;
+
+		// Will never return nullptr
+		static std::unique_ptr<World> CreateDefaultWorld();
 
 	protected:
 		void OnSave(AssetSaveInfo& saveInfo) const override;
@@ -71,7 +75,7 @@ namespace CE
 		// when loading the level. Instead of
 		// discarding the world, we return this
 		// one on the first call to CreateWorld
-		mutable std::optional<World> mWorld{};
+		mutable std::unique_ptr<World> mWorld{};
 		mutable std::optional<BinaryGSONObject> mSerializedWorld{};
 
 		friend ReflectAccess;

Include/Assets/Script.h

@@ -96,9 +96,10 @@ namespace CE
 		// so if this ever changes, you'll know exactly where you need to start fixing things.
 		static constexpr bool sIsTypeIdTheSameAsNameHash = true;
 
-		// Each component script secretly gets assigned a field of type entt::entity with this name.
-		// Upon constructing the component, the correct entity id is assigned.
+		// Each component script secretly gets assigned a field of type entt::entity and World* with these names.
+		// Upon constructing the component, the correct entity id and world is assigned.
 		static constexpr Name sNameOfOwnerField = "Owner"_Name;
+		static constexpr Name sNameOfWorldField = "World"_Name;
 
 		void CollectErrors(ScriptErrorInserter inserter) const;
 

Include/Components/GridSpawnerComponent.h

@@ -10,10 +10,10 @@ namespace CE
 	{
 	public:
 		void OnConstruct(World&, entt::entity owner);
-		void OnBeginPlay(World&, entt::entity);
+		void OnBeginPlay(World& world, entt::entity);
 
-		void ClearGrid();
-		void SpawnGrid();
+		void ClearGrid(World& world);
+		void SpawnGrid(World& world);
 
 		std::vector<AssetHandle<Prefab>> mTiles{};
 

Include/EditorSystems/ThumbnailEditorSystem.h

@@ -12,7 +12,7 @@ namespace CE
 	class Texture;
 	class World;
 
-	using GetThumbnailRet = std::variant<AssetHandle<Texture>, World>;
+	using GetThumbnailRet = std::variant<AssetHandle<Texture>, std::unique_ptr<World>>;
 
 	class ThumbnailEditorSystem final :
 		public EditorSystem
@@ -72,9 +72,7 @@ namespace CE
 
 		struct CurrentlyGenerating
 		{
-			CurrentlyGenerating(World&& world, WeakAssetHandle<> forAsset);
-
-			World mWorld;
+			std::unique_ptr<World> mWorld{};
 			WeakAssetHandle<> mForAsset{};
 			FrameBuffer mFrameBuffer{ sGeneratedThumbnailResolution };
 			Timer mNumSecondsSinceLastRequested{};

Include/Scripting/ScriptPin.h

@@ -1,17 +1,10 @@
 #pragma once
 #include "ScriptIds.h"
-#include "imnodes/imgui_node_editor.h"
 
-#include "Meta/MetaAny.h"
-#include "Meta/MetaTypeTraits.h"
 #include "Meta/Fwd/MetaFuncFwd.h"
+#include "Meta/MetaTypeTraits.h"
 #include "Scripting/ScriptErrors.h"
 
-namespace CE
-{
-	struct MetaFuncNamedParam;
-}
-
 namespace CE
 {
 	enum class ScriptPinKind : bool

Include/Utilities/Imgui/WorldInspect.h

@@ -21,7 +21,7 @@ namespace CE
 		The provided doUndoStack must remain alive for the duration of this
 		objects lifetime.
 		*/
-		WorldInspectHelper(World&& worldThatHasNotYetBegunPlay);
+		WorldInspectHelper(std::unique_ptr<World> worldThatHasNotYetBegunPlay);
 		~WorldInspectHelper();
 
 		/*

Include/Utilities/Reflect/ReflectComponentType.h

@@ -36,12 +36,10 @@ namespace CE
 		MetaFunc& addComponentFunc = entityType.AddFunc(
 			[](MetaFunc::DynamicArgs args, MetaFunc::RVOBuffer) -> FuncResult
 			{
-				World* world = World::TryGetWorldAtTopOfStack();
-				ASSERT(world != nullptr && "Reached a scripting context without pushing a world");
+				World& world = *static_cast<World*>(args[0].GetData());
+				const entt::entity entity = *static_cast<entt::entity*>(args[1].GetData());
 
-				entt::entity entity = *static_cast<entt::entity*>(args[0].GetData());
-
-				Registry& reg = world->GetRegistry();
+				Registry& reg = world.GetRegistry();
 
 				if (reg.HasComponent<T>(entity))
 				{
@@ -61,7 +59,7 @@ namespace CE
 			},
 			Internal::GetAddComponentFuncName(type.GetName()),
 			MetaFunc::Return{ isEmpty ? MakeTypeTraits<void>() : MakeTypeTraits<T&>() },
-			MetaFunc::Params{ { MakeTypeTraits<const entt::entity&>(), "Entity" } });
+			MetaFunc::Params{ { MakeTypeTraits<World&>() }, { MakeTypeTraits<entt::entity>() } });
 
 		if (type.GetProperties().Has(Props::sIsScriptableTag))
 		{

Include/World/EventManager.h

@@ -29,8 +29,6 @@ namespace CE
 			MetaFunc::DynamicArgs argsProvided, 
 			std::span<TypeForm> argFormsProvided);
 
-		// mWorld needs to be updated in World::World(World&&), so we give access to World to do so.
-		friend class World;
 		std::reference_wrapper<World> mWorld;
 
 		std::unordered_map<std::string_view, std::vector<BoundEvent>> mBoundEvents{};

Include/World/Physics.h

@@ -52,8 +52,6 @@ namespace CE
 		static MetaType Reflect();
 		REFLECT_AT_START_UP(Physics);
 
-		// mWorld needs to be updated in World::World(World&&), so we give access to World to do so.
-		friend class World;
 		std::reference_wrapper<World> mWorld;
 
 		BVHS mBVHs;

Include/World/Registry.h

@@ -157,9 +157,6 @@ namespace CE
 
 		void CallEndPlayEventsForEntity(entt::sparse_set& storage, entt::entity entity, const BoundEvent& endPlayEvent);
 
-		// mWorld needs to be updated in World::World(World&&), so we give access to World to do so.
-		friend World;
-
 		std::reference_wrapper<World> mWorld; 
 
 		entt::registry mRegistry{};
@@ -217,8 +214,6 @@ namespace CE
 				}
 			}();
 
-		World::PushWorld(mWorld);
-
 		if constexpr (isEmpty)
 		{
 			mRegistry.emplace<ComponentType>(toEntity, std::forward<AdditonalArgs>(additionalArgs)...);
@@ -236,8 +231,6 @@ namespace CE
 					events.mOnBeginPlay->mFunc.get().InvokeUncheckedUnpacked(GetWorld(), toEntity);
 				}
 			}
-
-			World::PopWorld();
 		}
 		else
 		{
@@ -271,8 +264,6 @@ namespace CE
 				}
 			}
 
-			World::PopWorld();
-
 			return component;
 		}
 	}
@@ -307,7 +298,6 @@ namespace CE
 	template<typename ComponentType>
 	void Registry::RemoveComponent(entt::entity fromEntity)
 	{
-		World::PushWorld(mWorld);
 		static constexpr TypeId componentClassTypeId = MakeStrippedTypeId<ComponentType>();
 		entt::sparse_set* storage = Storage(componentClassTypeId);
 		ASSERT(storage != nullptr);
@@ -335,7 +325,6 @@ namespace CE
 		}
 
 		storage->erase(fromEntity);
-		World::PopWorld();
 	}
 
 	template <typename ComponentType, typename It>
@@ -358,8 +347,6 @@ namespace CE
 			return;
 		}
 
-		World::PushWorld(mWorld);
-
 		if constexpr (sIsReflectable<ComponentType>)
 		{
 			static std::optional<BoundEvent> endPlayEvent =
@@ -379,7 +366,6 @@ namespace CE
 			{
 				if (!storage->contains(fromEntity))
 				{
-					World::PopWorld();
 					return;
 				}
 
@@ -388,7 +374,6 @@ namespace CE
 		}
 
 		storage->remove(fromEntity);
-		World::PopWorld();
 	}
 
 	template<typename It>

Include/World/World.h

@@ -18,14 +18,15 @@ namespace CE
 	{
 	public:
 		World(bool beginPlayImmediately);
-		World(World&& other) noexcept;
-		World(const World&) = delete;
 
-		~World();
+		World(World&&) = delete;
+		World(const World&) = delete;
 
-		World& operator=(World&& other) noexcept;
+		World& operator=(World&&) noexcept = delete;
 		World& operator=(const World&) = delete;
 
+		~World();
+
 		void Tick(float deltaTime);
 		void Render(FrameBuffer* renderTarget = nullptr);
 
@@ -75,11 +76,6 @@ namespace CE
 
 		void RequestEndplay();
 
-		static void PushWorld(World& world);
-		static void PopWorld();
-
-		static World* TryGetWorldAtTopOfStack();
-
 		/**
 		 * \brief Will request a transition to a different level.
 		 *

Include/World/WorldViewport.h

@@ -23,8 +23,6 @@ namespace CE
 		glm::vec3 ScreenToWorldPlane(glm::vec2 screenPosition, float planeHeight) const;
 
 	private:
-		// mWorld needs to be updated in World::World(World&&), so we give access to World to do so.
-		friend class World;
 		std::reference_wrapper<const World> mWorld;
 
 		// In pixels

Source/Assets/Level.cpp

@@ -44,7 +44,7 @@ CE::Level::Level(std::string_view name) :
 
 CE::Level::Level(AssetLoadInfo& loadInfo) :
 	Asset(loadInfo),
-	mWorld(false)
+	mWorld(std::make_unique<World>(false))
 {
 	BinaryGSONObject savedData{};
 	savedData.LoadFromBinary(loadInfo.GetStream());
@@ -178,7 +178,7 @@ void CE::Level::OnSave(AssetSaveInfo& saveInfo) const
 {
 	if (!mSerializedWorld.has_value())
 	{
-		if (!mWorld.has_value())
+		if (mWorld == nullptr)
 		{
 			LOG(LogAssets, Error, "Cannot save level {}, mSerializedComponents and mWorld are null",
 				GetName());
@@ -213,49 +213,49 @@ void CE::Level::CreateFromWorld(const World& world)
 	mSerializedWorld.emplace(Archiver::Serialize(world));
 }
 
-CE::World CE::Level::CreateWorld(const bool callBeginPlayImmediately) const
+void CE::Level::LoadIntoWorld(World& world) const
 {
-	if (mWorld.has_value())
+	if (!mSerializedWorld.has_value())
 	{
-		World world = std::move(*mWorld);
-		mWorld.reset();
+		LOG(LogAssets, Warning, "Failed to load {} into world, mSerializedWorld was null", GetName());
+		return;
+	}
 
+	Archiver::Deserialize(world, *mSerializedWorld);
+}
+
+std::unique_ptr<CE::World> CE::Level::CreateWorld(const bool callBeginPlayImmediately) const
+{
+	if (mWorld != nullptr)
+	{
 		if (!mSerializedWorld.has_value())
 		{
-			mSerializedWorld.emplace(Archiver::Serialize(world));
+			mSerializedWorld.emplace(Archiver::Serialize(*mWorld));
 		}
 
 		if (callBeginPlayImmediately)
 		{
-			world.BeginPlay();
+			mWorld->BeginPlay();
 		}
 
-		return world;
+		return std::move(mWorld);
 	}
 
-	World world{ false };
-
-	if (mSerializedWorld.has_value())
-	{
-		Archiver::Deserialize(world, *mSerializedWorld);
-	}
-	else
-	{
-		LOG(LogAssets, Warning, "mWorld and mSerializedWorld were both null for {}", GetName());
-	}
+	std::unique_ptr<World> world = std::make_unique<World>(false);
+	LoadIntoWorld(*world);
 
 	if (callBeginPlayImmediately)
 	{
-		world.BeginPlay();
+		world->BeginPlay();
 	}
 
 	return world;
 }
 
-CE::World CE::Level::CreateDefaultWorld()
+std::unique_ptr<CE::World> CE::Level::CreateDefaultWorld()
 {
-	World world{ false };
-	Registry& reg = world.GetRegistry();
+	std::unique_ptr<World> world = std::make_unique<World>(false);
+	Registry& reg = world->GetRegistry();
 
 	{
 		const entt::entity camera = reg.Create();