Game objects can now be removed from scene (complexity of O(3N)

xam4lor · xam4lor · commit cc1d5a86ab03 · 2022-04-16T23:59:08.000+02:00
diff --git a/src/WaterDropEngine/WdeCore/Core/WdeInstance.cpp b/src/WaterDropEngine/WdeCore/Core/WdeInstance.cpp
@@ -66,7 +66,7 @@ namespace wde {
 			auto camModule = camera->addModule<scene::CameraModule>();
 			camModule->setAsActive();
 			camModule->setFarPlane(std::numeric_limits<float>::max());
-			_scene->_activeCameraID = static_cast<int>(camera->getID());
+			_scene->setActiveCamera(camera.get());
 			camera->addModule<scene::ControllerModule>();
 			camera->transform->position = glm::vec3 {0.0f, 0.0f, 0.0f};
 			camera->transform->rotation = glm::vec3 {0.0f, 0.0f, 0.0f};
diff --git a/src/WaterDropEngine/WdeScene/GameObject.cpp b/src/WaterDropEngine/WdeScene/GameObject.cpp
@@ -103,7 +103,7 @@ namespace wde::scene {
 				ImGui::PushStyleColor(ImGuiCol_ButtonActive, gui::GUITheme::colorRedMinor);
 				ImGui::PushStyleColor(ImGuiCol_ButtonHovered, gui::GUITheme::colorRedMinor);
 				if (ImGui::Button("Delete")) {
-					// TODO
+					WaterDropEngine::get().getInstance().getScene()->removeGameObject(this);
 					ImGui::CloseCurrentPopup();
 				}
 				ImGui::PopStyleColor(3);
@@ -197,8 +197,8 @@ namespace wde::scene {
 					bool moduleRemoved = false;
 					if (module->getName() != "Transform" && ImGui::BeginPopupContextItem()) {
 						if (ImGui::Button("Remove Module")) {
-							if (module->getName() == "Camera" && WaterDropEngine::get().getInstance().getScene()->getActiveCamera().get() == this)
-								WaterDropEngine::get().getInstance().getScene()->_activeCameraID = -1;
+							if (module->getName() == "Camera" && WaterDropEngine::get().getInstance().getScene()->getActiveCamera() == this)
+								WaterDropEngine::get().getInstance().getScene()->setActiveCamera(nullptr);
 							moduleRemoved = true;
 							ModuleSerializer::removeModuleFromName(module->getName(), *this);
 						}
diff --git a/src/WaterDropEngine/WdeScene/WdeScene.cpp b/src/WaterDropEngine/WdeScene/WdeScene.cpp
@@ -123,6 +123,7 @@ namespace wde::scene {
 
 		// Load game objects
 		uint32_t currentGOID = scene->getGameObjects().size();
+		std::unordered_map<int, int> oldToNewIds {}; // <oldID, newID>
 		for (const auto& goIDs : fileData["data"]["gameObjects"]) {
 			const auto& goData = json::parse(WdeFileUtils::readFile(path + "gameObjects/go_" + std::to_string(goIDs.get<uint32_t>()) + ".json"));
 			if (goData["type"] != "gameObject")
@@ -132,18 +133,19 @@ namespace wde::scene {
 			auto go = scene->createGameObject(goData["name"], goData["data"]["static"].get<bool>());
 			go->active = goData["data"]["active"].get<bool>();
 
+			// Add parent id to list
+			oldToNewIds.emplace(goIDs.get<int>(), go->getID());
+
 			// Create game object modules
-			for (const auto& modData : goData["modules"]) {
+			for (const auto& modData : goData["modules"])
 				ModuleSerializer::addModuleFromName(modData["name"], to_string(modData["data"]), *go);
-			}
 		}
 
 		// Set game object parents and children
 		for (const auto& goIDs : fileData["data"]["gameObjects"]) {
 			const auto& goData = json::parse(WdeFileUtils::readFile(path + "gameObjects/go_" + std::to_string(goIDs.get<uint32_t>()) + ".json"));
-			if (goData["modules"][0]["name"] == "Transform"
-					&& goData["modules"][0]["data"]["parentID"].get<int>() != -1) // First module should always be the transform module
-				scene->getGameObject((int)currentGOID)->transform->setParent(scene->getGameObject(goData["modules"][0]["data"]["parentID"].get<int>())->transform);
+			if (goData["modules"][0]["name"] == "Transform" && goData["modules"][0]["data"]["parentID"].get<int>() != -1) // First module should always be the transform module
+				scene->getGameObjects()[(int) currentGOID]->transform->setParent(scene->getGameObjects()[oldToNewIds.at(goData["modules"][0]["data"]["parentID"].get<int>())]->transform);
 			currentGOID++;
 		}
 	}
diff --git a/src/WaterDropEngine/WdeScene/WdeSceneInstance.cpp b/src/WaterDropEngine/WdeScene/WdeSceneInstance.cpp
@@ -9,15 +9,33 @@ namespace wde::scene {
 		logger::log(LogLevel::DEBUG, LogChannel::SCENE) << "Removing deleted game objects." << logger::endl;
 		{
 			WDE_PROFILE_SCOPE("wde::scene::WdeSceneInstance::tick::deleteGameObjects");
-			for (auto& go : _gameObjectsToDelete) {
-				/*_selectedGameObjectID = -1;
-				 * TODO
+
+			if (!_gameObjectsToDelete.empty()) {
+				// Remove selected and active camera
+				for (GameObject* go : _gameObjectsToDelete) {
+					if (_selectedGameObject == go)
+						_selectedGameObject = nullptr;
+					if (_activeCamera == go)
+						_activeCamera = nullptr;
+				}
 
 				// Remove from static list
-				if (go->isStatic()) {
-					for (auto& go : _gameObjectsStatic)
-					_gameObjectsStatic.r
-				}*/
+				_gameObjectsStatic.erase(std::remove_if(_gameObjectsStatic.begin(), _gameObjectsStatic.end(), [this](const auto&x) {
+					return std::find(_gameObjectsToDelete.begin(), _gameObjectsToDelete.end(), x.get()) != _gameObjectsToDelete.end();
+				}), _gameObjectsStatic.end());
+
+				// Remove from dynamic list
+				_gameObjectsDynamic.erase(std::remove_if(_gameObjectsDynamic.begin(), _gameObjectsDynamic.end(), [this](const auto&x) {
+					return std::find(_gameObjectsToDelete.begin(), _gameObjectsToDelete.end(), x.get()) != _gameObjectsToDelete.end();
+				}), _gameObjectsDynamic.end());
+
+				// Remove from game objects
+				_gameObjects.erase(std::remove_if(_gameObjects.begin(), _gameObjects.end(), [this](const auto&x) {
+					return std::find(_gameObjectsToDelete.begin(), _gameObjectsToDelete.end(), x.get()) != _gameObjectsToDelete.end();
+				}), _gameObjects.end());
+
+				// Clear game objects to delete
+				_gameObjectsToDelete.clear();
 			}
 		}
 
@@ -38,6 +56,11 @@ namespace wde::scene {
 	}
 
 	void WdeSceneInstance::cleanUpInstance() {
+		// Remove references
+		_selectedGameObject = nullptr;
+		_activeCamera = nullptr;
+
+		// Remove game objects
 		_gameObjectsDynamic.clear();
 		_gameObjectsStatic.clear();
 		_gameObjects.clear();
@@ -88,25 +111,24 @@ namespace wde::scene {
 
 			// Scene game objects
 			ImGuiTableFlags flags = ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingStretchProp | ImGuiTableFlags_NoClip;
-			static int selected = -1;
+			GameObject* oldSelected = _selectedGameObject;
 			if (ImGui::BeginTable("Game Objects List", 3, flags)) {
 				// Draw game objects list
 				for (auto& go : _gameObjects) {
 					if (go->transform->getParent() == nullptr) {
 						ImGui::TableNextRow();
-						drawGUIForGo(go, &selected);
+						drawGUIForGo(go, _selectedGameObject);
 					}
 				}
 				ImGui::EndTable();
 			}
 
 			// Selected game object changed
-			if (selected != _selectedGameObjectID) {
-				if (_selectedGameObjectID >= 0)
-					_gameObjects[_selectedGameObjectID]->setSelected(false);
-				_selectedGameObjectID = selected;
-				if (_selectedGameObjectID >= 0)
-					_gameObjects[_selectedGameObjectID]->setSelected(true);
+			if (oldSelected != _selectedGameObject) {
+				if (oldSelected != nullptr)
+					oldSelected->setSelected(false);
+				if (_selectedGameObject != nullptr)
+					_selectedGameObject->setSelected(true);
 			}
 
 			ImGui::EndChild();
@@ -120,15 +142,15 @@ namespace wde::scene {
 			gui::GUIRenderer::popWindowTabStyle();
 			ImGui::PushFont(ImGui::GetIO().FontDefault);
 			ImGui::Dummy(ImVec2(0.0f, 0.15f));
-			if (_selectedGameObjectID != -1)
-				_gameObjects.at(_selectedGameObjectID)->drawGUI();
+			if (_selectedGameObject != nullptr)
+				_selectedGameObject->drawGUI();
 			ImGui::End();
 			ImGui::PopFont();
 		}
 #endif
 	}
 
-	void WdeSceneInstance::drawGUIForGo(const std::shared_ptr<GameObject> &go, int* selected) const {
+	void WdeSceneInstance::drawGUIForGo(const std::shared_ptr<GameObject> &go, GameObject*& selected) const {
 #ifdef WDE_GUI_ENABLED
 		std::string typeName;
 		if (go->getModule<MeshRendererModule>())
@@ -173,8 +195,8 @@ namespace wde::scene {
 			// Draw tree node
 			ImGui::SameLine();
 			ImGui::PushID(static_cast<int>(go->getID()) + 216846353);
-			if (ImGui::Selectable(buf3, *selected == go->getID(), ImGuiSelectableFlags_SpanAllColumns))
-				*selected = static_cast<int>(go->getID());
+			if (ImGui::Selectable(buf3, selected == go.get(), ImGuiSelectableFlags_SpanAllColumns))
+				selected = go.get();
 			ImGui::PopID();
 			ImGui::PopFont();
 
@@ -210,8 +232,8 @@ namespace wde::scene {
 
 			ImGui::SameLine();
 			ImGui::PushID(static_cast<int>(go->getID()) + 216846354);
-			if (ImGui::Selectable(buf2, *selected == go->getID(), ImGuiSelectableFlags_SpanAllColumns))
-				*selected = static_cast<int>(go->getID());
+			if (ImGui::Selectable(buf2, selected == go.get(), ImGuiSelectableFlags_SpanAllColumns))
+				selected = go.get();
 			ImGui::PopID();
 			ImGui::PopFont();
 
diff --git a/src/WaterDropEngine/WdeScene/WdeSceneInstance.hpp b/src/WaterDropEngine/WdeScene/WdeSceneInstance.hpp
@@ -11,9 +11,6 @@ namespace wde::scene {
 	 */
 	class WdeSceneInstance : public core::Observer {
 		public:
-			/** Active camera ID (none = -1) */
-			int _activeCameraID = -1;
-
 			// Scene engine override methods
 			virtual void setup() {};
 			virtual void update() {};
@@ -31,28 +28,23 @@ namespace wde::scene {
 			const std::string& getPath() const { return _scenePath; }
 			void setName(const std::string& name) { _sceneName = name; }
 			const std::string& getName() const { return _sceneName; }
-			const std::shared_ptr<GameObject>& getGameObject(int goID) { return _gameObjects[goID]; }
+
 			std::vector<std::shared_ptr<GameObject>>& getGameObjects() { return _gameObjects; }
 			std::vector<std::shared_ptr<GameObject>>& getStaticGameObjects()  { return _gameObjectsStatic; }
 			std::vector<std::shared_ptr<GameObject>>& getDynamicGameObjects() { return _gameObjectsDynamic; }
-			std::shared_ptr<GameObject> getActiveGameObject() const {
-				if (_selectedGameObjectID == -1)
-					return nullptr;
-				return _gameObjects[_selectedGameObjectID];
-			}
-			std::shared_ptr<GameObject> getFirstGameCamera() const {
-				for (auto& go : _gameObjects) {
+
+			GameObject* getActiveGameObject() const { return _selectedGameObject; }
+			/** @return The first camera in the scene that is not the editor camera */
+			GameObject* getFirstGameCamera() {
+				for (auto& go : _gameObjectsDynamic) {
 					auto mod = go->getModule<CameraModule>();
 					if (mod != nullptr && mod->getName() != "Editor Camera")
-						return go;
+						return go.get();
 				}
 				return nullptr;
 			}
-			std::shared_ptr<GameObject> getActiveCamera() const {
-				if (_activeCameraID == -1)
-					return nullptr;
-				return _gameObjects[_activeCameraID];
-			}
+			void setActiveCamera(GameObject* camera) { _activeCamera = camera; }
+			GameObject* getActiveCamera() const { return _activeCamera; }
 
 
 			/**
@@ -61,21 +53,22 @@ namespace wde::scene {
 			 * @param isStatic True if the game object is a static one (default false)
 			 */
 			std::shared_ptr<GameObject> createGameObject(const std::string& name, bool isStatic = false) {
-				_gameObjects.push_back(std::make_shared<GameObject>(_gameObjectsIDCurr++, name, isStatic));
+				auto goPtr = std::make_shared<GameObject>(_gameObjectsIDCurr++, name, isStatic);
+				_gameObjects.push_back(goPtr);
 				if (isStatic)
-					_gameObjectsStatic.push_back(_gameObjects[_gameObjects.size() - 1]);
+					_gameObjectsStatic.push_back(goPtr);
 				else
-					_gameObjectsDynamic.push_back(_gameObjects[_gameObjects.size() - 1]);
-				return _gameObjects[_gameObjects.size() - 1];
+					_gameObjectsDynamic.push_back(goPtr);
+				return goPtr;
 			}
 
 			/**
 			 * Remove a given GameObject
 			 * @param go
 			 */
-			void removeGameObject(GameObject& go) {
+			void removeGameObject(GameObject* go) {
 				// Remove GameObject
-				_gameObjectsToDelete.push_back(&go);
+				_gameObjectsToDelete.push_back(go);
 			}
 
 
@@ -95,12 +88,16 @@ namespace wde::scene {
 			std::string _scenePath;
 			/** Name of the scene object */
 			std::string _sceneName;
-			/** Selected game object ID for GUI (default : 0) */
-			int _selectedGameObjectID = 0;
 			/** Last create game object ID */
 			uint32_t _gameObjectsIDCurr = 0;
 
+			// Selected game objects
+			/** Selected game object for GUI (none : nullptr) */
+			GameObject* _selectedGameObject = nullptr;
+			/** Active camera (none = nullptr) */
+			GameObject* _activeCamera = nullptr;
+
 			// Helper functions
-			void drawGUIForGo(const std::shared_ptr<GameObject>& go, int* selected) const;
+			void drawGUIForGo(const std::shared_ptr<GameObject>& go, GameObject*& selected) const;
 	};
 }
diff --git a/src/WaterDropEngine/WdeScene/culling/CullingInstance.cpp b/src/WaterDropEngine/WdeScene/culling/CullingInstance.cpp
@@ -205,7 +205,7 @@ namespace wde::scene {
 		_gpuRenderBatches->unmap();
 	}
 
-	void CullingInstance::cull(const std::shared_ptr<GameObject> &cullingCamera) {
+	void CullingInstance::cull(GameObject* cullingCamera) {
 		WDE_PROFILE_FUNCTION();
 		if (cullingCamera == nullptr)
 			return;
@@ -278,7 +278,7 @@ namespace wde::scene {
 
 
 	// Helper functions
-	void CullingInstance::updateScene(const std::shared_ptr<GameObject> &cullingCamera) {
+	void CullingInstance::updateScene(GameObject* cullingCamera) {
 		WDE_PROFILE_FUNCTION();
 		if (cullingCamera == nullptr)
 			throw WdeException(LogChannel::SCENE, "Trying to run culling without a camera set.");
diff --git a/src/WaterDropEngine/WdeScene/culling/CullingInstance.hpp b/src/WaterDropEngine/WdeScene/culling/CullingInstance.hpp
@@ -72,7 +72,7 @@ namespace wde::scene {
 			 * Do culling based on it's batches for a specific scene camera
 			 * @param cullingCamera
 			 */
-			void cull(const std::shared_ptr<GameObject>& cullingCamera);
+			void cull(GameObject* cullingCamera);
 
 			 /**
 			  * Draws the objects in the culled buffers
@@ -111,7 +111,7 @@ namespace wde::scene {
 
 			// Helper functions
 			/** Update the culling scene parameters based on the scene and on it's configured camera */
-			void updateScene(const std::shared_ptr<GameObject>& cullingCamera);
+			void updateScene(GameObject* cullingCamera);
 
 			inline static glm::vec4 normalizePlane(glm::vec4 p) {
 				return p / glm::length(glm::vec3(p));
diff --git a/src/WaterDropEngine/WdeScene/modules/CameraModule.cpp b/src/WaterDropEngine/WdeScene/modules/CameraModule.cpp
@@ -140,7 +140,7 @@ namespace wde::scene {
 
 	void CameraModule::drawGizmo(Gizmo& gizmo, render::CommandBuffer& commandBuffer) {
 		// Active camera, do not draw gizmo
-		if (WaterDropEngine::get().getInstance().getScene()->_activeCameraID == static_cast<int>(_gameObject.getID()))
+		if (WaterDropEngine::get().getInstance().getScene()->getActiveCamera() == &_gameObject)
 			return;
 
 		// Draw camera frustum gizmo
@@ -215,7 +215,7 @@ namespace wde::scene {
 	}
 
 	void CameraModule::setAsActive() {
-		WaterDropEngine::get().getInstance().getScene()->_activeCameraID = static_cast<int>(_gameObject.getID());
+		WaterDropEngine::get().getInstance().getScene()->setActiveCamera(&_gameObject);
 	}
 
 	void CameraModule::setFarPlane(float farPlane) {

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ namespace wde::scene {`
`140`	`140`
`141`	`141`	`void CameraModule::drawGizmo(Gizmo& gizmo, render::CommandBuffer& commandBuffer) {`
`142`	`142`	`// Active camera, do not draw gizmo`
`143`		`- if (WaterDropEngine::get().getInstance().getScene()->_activeCameraID == static_cast<int>(_gameObject.getID()))`
	`143`	`+ if (WaterDropEngine::get().getInstance().getScene()->getActiveCamera() == &_gameObject)`
`144`	`144`	`return;`
`145`	`145`
`146`	`146`	`// Draw camera frustum gizmo`
`@@ -215,7 +215,7 @@ namespace wde::scene {`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`void CameraModule::setAsActive() {`
`218`		`- WaterDropEngine::get().getInstance().getScene()->_activeCameraID = static_cast<int>(_gameObject.getID());`
	`218`	`+ WaterDropEngine::get().getInstance().getScene()->setActiveCamera(&_gameObject);`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`void CameraModule::setFarPlane(float farPlane) {`