diff options
Diffstat (limited to 'src/crepe')
-rw-r--r-- | src/crepe/api/GameObject.cpp | 14 | ||||
-rw-r--r-- | src/crepe/api/GameObject.h | 2 | ||||
-rw-r--r-- | src/crepe/api/GameObject.hpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index b24b980..b1b8f85 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -9,11 +9,11 @@ using namespace std; GameObject::GameObject(uint32_t id, const std::string & name, const std::string & tag, const Point & position, double rotation, double scale) - : id(id) { + : ID(id) { // Add Transform and Metadata components ComponentManager & mgr = ComponentManager::get_instance(); - mgr.add_component<Transform>(this->id, position, rotation, scale); - mgr.add_component<Metadata>(this->id, name, tag); + mgr.add_component<Transform>(this->ID, position, rotation, scale); + mgr.add_component<Metadata>(this->ID, name, tag); } void GameObject::set_parent(const GameObject & parent) { @@ -21,11 +21,11 @@ void GameObject::set_parent(const GameObject & parent) { // Set parent on own Metadata component vector<reference_wrapper<Metadata>> this_metadata - = mgr.get_components_by_id<Metadata>(this->id); - this_metadata.at(0).get().parent = parent.id; + = mgr.get_components_by_id<Metadata>(this->ID); + this_metadata.at(0).get().parent = parent.ID; // Add own id to children list of parent's Metadata component vector<reference_wrapper<Metadata>> parent_metadata - = mgr.get_components_by_id<Metadata>(parent.id); - parent_metadata.at(0).get().children.push_back(this->id); + = mgr.get_components_by_id<Metadata>(parent.ID); + parent_metadata.at(0).get().children.push_back(this->ID); } diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index 2a82258..2992787 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -55,7 +55,7 @@ public: public: //! The id of the GameObject - uint32_t id; + const uint32_t ID; }; } // namespace crepe diff --git a/src/crepe/api/GameObject.hpp b/src/crepe/api/GameObject.hpp index bfba7fe..7e6148c 100644 --- a/src/crepe/api/GameObject.hpp +++ b/src/crepe/api/GameObject.hpp @@ -9,7 +9,7 @@ namespace crepe { template <typename T, typename... Args> T & GameObject::add_component(Args &&... args) { ComponentManager & mgr = ComponentManager::get_instance(); - return mgr.add_component<T>(this->id, std::forward<Args>(args)...); + return mgr.add_component<T>(this->ID, std::forward<Args>(args)...); } } // namespace crepe |