scene queue

cfg.json

@@ -1 +1,4 @@
-{"game_file":"lvl.json","start_scene":"lvl_1"}
+{
+	"game_file":"lvl.json",
+	"scene_queue":["lvl_1", "lvl_2"]
+}

components/PlayerInput.cpp

@@ -77,7 +77,7 @@ void PlayerInput::update(float dt)
 // Collision callbacks
 void PlayerInput::onCollisionEnter(goop::Entity other)
 {
-	//...
+	std::cout << "Collision enter with entity " << other.getUID() << std::endl;
 }
 
 void PlayerInput::onCollisionExit(goop::Entity other)

components/WindowsTest.cpp

@@ -1,5 +1,6 @@
 #include "WindowsTest.h"
 #include <iostream>
+#include <goop/Input.h>
 
 // Gets called when the game starts
 void WindowsTest::init()
@@ -14,6 +15,11 @@ void WindowsTest::init()
 void WindowsTest::update(float dt)
 {
     //...
+	if (goop::isKeyPressed(ImGuiKey_T))
+	{
+		std::cout << "T was pressed" << std::endl;
+		nextScene();
+	}
 }
 
 // Collision callbacks

game/GameApp.cpp

@@ -4,11 +4,11 @@
 #include <imgui.h>
 #include <iostream>
 
+#include "components/CustomComponents.h"
 #include <goop/Core.h>
 #include <goop/sys/Renderer.h>
 #include <goop/sys/Sfx.h>
 #include <json.hpp>
-#include "components/CustomComponents.h"
 using json = nlohmann::json;
 
 goop::App* goop::createGame(int argc, char** argv, Scene* scene) { return new GameApp(scene); }
@@ -33,19 +33,24 @@ void GameApp::init()
 	}
 	json lvl = lvlOpt.value();
 
-	json startScene;
-
-	// find starting scene
-	for (json& scene : lvl["scenes"])
+	int size = cfg["scene_queue"].size();
+	std::cout << "Loading " << size << " scenes" << std::endl;
+	for (int i = 0; i < cfg["scene_queue"].size(); i++)
 	{
-		if (scene["name"] == cfg["start_scene"])
+		std::string sceneName = cfg["scene_queue"][i];
+		std::cout << "Loading scene: " << sceneName << std::endl;
+		for (auto& sceneJson : lvl["scenes"])
 		{
-			startScene = scene;
-			break;
+			if (sceneJson["name"] == sceneName)
+			{
+				std::cout << "Found scene: " << sceneName << std::endl;
+				std::cout << sceneJson.dump(4) << std::endl;
+				scene->queueScene(sceneJson);
+				break;
+			}
 		}
 	}
-
-	scene->loadScene(startScene);
+	scene->loadScene();
 
 	/* TODO -------------
 	   - store EVERYTHING contiguously - decide on a data structure - (week 7)

goop/Components.h

@@ -113,6 +113,11 @@ class CustomComponent
 			return e;
 		}
 	}
+	void nextScene()
+	{
+		auto scene = entity.getScene();
+		scene->nextScene();
+	}
 	std::string name;
 	goop::Entity entity;
 

goop/Core.cpp

@@ -34,27 +34,6 @@ Core::Core(int argc, char** argv) : app(createGame(argc, argv, &scene))
 	sys::gRenderer->setScene(&scene);
 	rm->initialize();
 	app->init();
-#ifndef GOOP_APPTYPE_EDITOR
-	sys::gPhysics->initialize();
-	// initialize rigid bodies
-	auto rbView = scene.view<RigidbodyComponent>();
-	auto tcView = scene.view<TransformComponent>();
-	for (auto entity : rbView)
-	{
-		RigidbodyComponent* rbc = &rbView.get<RigidbodyComponent>(entity);
-		TransformComponent* tc = &tcView.get<TransformComponent>(entity);
-		sys::gPhysics->addRigidBody(rbc, tc);
-	}
-#endif
-
-	// load meshes from components
-	auto mcView = scene.view<MeshComponent>();
-	for (auto entity : mcView)
-	{
-		MeshComponent& mesh = mcView.get<MeshComponent>(entity);
-		rm->loadMesh(&mesh);
-		rm->loadTexture(&mesh);
-	}
 }
 
 void Core::run()

goop/Scene.cpp

@@ -29,9 +29,9 @@ std::optional<Entity> Scene::getEntity(const std::string& tag)
 	return std::nullopt;
 }
 
-void Scene::loadScene(nlohmann::json& startScene)
+void Scene::loadScene()
 {
-	sceneJson = startScene;
+	json startScene = sceneQueue.front();
 	if (startScene["entities"].is_null())
 	{
 		return;
@@ -96,12 +96,36 @@ void Scene::loadScene(nlohmann::json& startScene)
 			}
 		}
 	}
+
+	// load meshes from components
+	auto mcView = view<MeshComponent>();
+	for (auto entity : mcView)
+	{
+		MeshComponent& mesh = mcView.get<MeshComponent>(entity);
+		rm->loadMesh(&mesh);
+		rm->loadTexture(&mesh);
+	}
+
+	// initialize rigid bodies
+	if (sys::gPhysics != nullptr && !sys::gPhysics->isInitialized())
+	{
+		sys::gPhysics->initialize();
+	}
+	auto rbView = view<RigidbodyComponent>();
+	auto tcView = view<TransformComponent>();
+	for (auto entity : rbView)
+	{
+		RigidbodyComponent* rbc = &rbView.get<RigidbodyComponent>(entity);
+		TransformComponent* tc = &tcView.get<TransformComponent>(entity);
+		sys::gPhysics->addRigidBody(rbc, tc);
+	}
 }
 
-nlohmann::json Scene::getScene() const { return sceneJson; }
+nlohmann::json Scene::getScene() const { return sceneQueue.front(); }
 
 nlohmann::json Scene::saveScene()
 {
+	json sceneJson = sceneQueue.front();
 	sceneJson["entities"] = json::array();
 	auto view = registry.view<TagComponent>();
 	for (auto& entity : view)
@@ -191,9 +215,9 @@ void Scene::destroyEntity(Entity entity)
 	registry.destroy((entt::entity)entity.getUID());
 }
 
-#ifdef GOOP_APPTYPE_EDITOR
 void Scene::resetScene()
 {
+	json sceneJson = sceneQueue.front();
 	if (sceneJson["entities"].is_null())
 	{
 		return;
@@ -237,4 +261,21 @@ void Scene::resetScene()
 	}
 	spawnedEntities.clear();
 }
-#endif
+
+void Scene::clearScene()
+{
+	for (auto e : spawnedEntities)
+	{
+		destroyEntity(goop::Entity(e, this));
+	}
+	spawnedEntities.clear();
+
+	auto view = registry.view<TagComponent>();
+	for (auto entity : view)
+	{
+		destroyEntity(goop::Entity(entity, this));
+	}
+
+	currentCamera->setPosition(glm::vec3(0.f, 0.f, 5.f));
+	currentCamera->setRotation(glm::vec3(0.f, 0.f, 0.f));
+}

goop/Scene.h

@@ -5,6 +5,7 @@
 #include <entt.hpp>
 
 #include <json.hpp>
+#include <queue>
 using json = nlohmann::json;
 
 namespace goop
@@ -15,7 +16,7 @@ class Scene
   public:
 	Entity createEntity(const std::string& tag = "Entity");
 	void destroyEntity(Entity entity);
-	void loadScene(nlohmann::json& scene);
+	void loadScene();
 	nlohmann::json getScene() const;
 	nlohmann::json saveScene();
 
@@ -30,18 +31,28 @@ class Scene
 
 	void addSpawnedEntity(entt::entity entity) { spawnedEntities.push_back(entity); }
 
-#ifdef GOOP_APPTYPE_EDITOR
 	void resetScene();
-#endif
+	void clearScene();
+	void nextScene()
+	{
+		if (sceneQueue.empty())
+		{
+			return;
+		}
+		clearScene();
+		sceneQueue.pop();
+		loadScene();
+	}
+	void queueScene(nlohmann::json scene) { sceneQueue.push(scene); }
 
   private:
 	entt::registry registry;
 	friend class Entity;
 
-	nlohmann::json sceneJson;
-
 	Camera* currentCamera = nullptr;
 
 	std::vector<entt::entity> spawnedEntities;
+
+	std::queue<nlohmann::json> sceneQueue;
 };
 } // namespace goop