From 08fee6eff251337dd4dca2b514a9c06d57ede0af Mon Sep 17 00:00:00 2001 From: max-001 Date: Fri, 22 Nov 2024 11:14:13 +0100 Subject: Implemented persistent objects --- src/crepe/ComponentManager.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/crepe/ComponentManager.h') diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h index 0956d1e..8fc7d6c 100644 --- a/src/crepe/ComponentManager.h +++ b/src/crepe/ComponentManager.h @@ -101,6 +101,15 @@ protected: * This method deletes all components. */ void delete_all_components(); + /** + * \brief Set a GameObject as persistent + * + * This method sets a GameObject as persistent. If a GameObject is persistent, its + * components will not be deleted. + * + * \param id The id of the GameObject to set as persistent + */ + void set_persistent(game_object_id_t id); public: /** @@ -139,6 +148,9 @@ private: std::unordered_map>>> components; + //! Persistent flag for each GameObject + std::vector persistent = {false}; + //! ID of next GameObject allocated by \c ComponentManager::new_object game_object_id_t next_id = 0; }; -- cgit v1.2.3 From f52e7e1450d47604983dba5f3cbab364ffd77cdc Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 26 Nov 2024 09:20:55 +0100 Subject: Replaced vector by unordered_map --- src/crepe/ComponentManager.cpp | 8 -------- src/crepe/ComponentManager.h | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'src/crepe/ComponentManager.h') diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp index a90502d..e99419e 100644 --- a/src/crepe/ComponentManager.cpp +++ b/src/crepe/ComponentManager.cpp @@ -39,19 +39,11 @@ GameObject ComponentManager::new_object(const string & name, const string & tag, // Find the first available id (taking persistent objects into account) while (this->persistent[this->next_id]) { this->next_id++; - // Make sure that the persistent vector is large enough - if (persistent.size() <= next_id) { - this->persistent.resize(next_id + 1, false); - } } GameObject object{*this, this->next_id, name, tag, position, rotation, scale}; this->next_id++; - // Make sure that the persistent vector is large enough - if (persistent.size() <= next_id) { - this->persistent.resize(next_id + 1, false); - } return object; } diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h index 810bc38..8462698 100644 --- a/src/crepe/ComponentManager.h +++ b/src/crepe/ComponentManager.h @@ -147,7 +147,7 @@ private: components; //! Persistent flag for each GameObject - std::vector persistent = {false}; + std::unordered_map persistent; //! ID of next GameObject allocated by \c ComponentManager::new_object game_object_id_t next_id = 0; -- cgit v1.2.3 From 07ac07ce4cafe8ec454a1e53b1541dcaab10cf40 Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 26 Nov 2024 09:28:12 +0100 Subject: It is now possible to reset the persistent flag --- src/crepe/ComponentManager.cpp | 4 +++- src/crepe/ComponentManager.h | 3 ++- src/crepe/api/GameObject.cpp | 4 ++-- src/crepe/api/GameObject.h | 4 +++- 4 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/crepe/ComponentManager.h') diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp index e99419e..af4b9f4 100644 --- a/src/crepe/ComponentManager.cpp +++ b/src/crepe/ComponentManager.cpp @@ -47,4 +47,6 @@ GameObject ComponentManager::new_object(const string & name, const string & tag, return object; } -void ComponentManager::set_persistent(game_object_id_t id) { this->persistent[id] = true; } +void ComponentManager::set_persistent(game_object_id_t id, bool persistent) { + this->persistent[id] = persistent; +} diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h index 8462698..480124f 100644 --- a/src/crepe/ComponentManager.h +++ b/src/crepe/ComponentManager.h @@ -106,8 +106,9 @@ protected: * components will not be deleted. * * \param id The id of the GameObject to set as persistent + * \param persistent The persistent flag */ - void set_persistent(game_object_id_t id); + void set_persistent(game_object_id_t id, bool persistent); public: /** diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index 6c1de12..9ef4682 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -31,8 +31,8 @@ void GameObject::set_parent(const GameObject & parent) { parent_metadata.at(0).get().children.push_back(this->id); } -void GameObject::set_persistent() { +void GameObject::set_persistent(bool persistent) { ComponentManager & mgr = this->component_manager; - mgr.set_persistent(this->id); + mgr.set_persistent(this->id, persistent); } diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index a30dce3..4cd2bc0 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -63,8 +63,10 @@ public: * * This method sets the persistent flag of the GameObject to true. If the persistent * flag is set to true, the GameObject will not be deleted when the scene is changed. + * + * \param persistent The persistent flag */ - void set_persistent(); + void set_persistent(bool persistent = true); public: //! The id of the GameObject -- cgit v1.2.3