diff options
Diffstat (limited to 'src/crepe/api')
| -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 | ||||
| -rw-r--r-- | src/crepe/api/Metadata.cpp | 2 | ||||
| -rw-r--r-- | src/crepe/api/Metadata.h | 4 | ||||
| -rw-r--r-- | src/crepe/api/Script.hpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index e009288..15330f3 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -9,11 +9,11 @@ using namespace std; GameObject::GameObject(game_object_id_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 223d72e..8389e6c 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -57,7 +57,7 @@ public: public: //! The id of the GameObject - const game_object_id_t ID; + const game_object_id_t id; }; } // namespace crepe diff --git a/src/crepe/api/GameObject.hpp b/src/crepe/api/GameObject.hpp index 7e6148c..bfba7fe 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 diff --git a/src/crepe/api/Metadata.cpp b/src/crepe/api/Metadata.cpp index ab9612b..76f11d7 100644 --- a/src/crepe/api/Metadata.cpp +++ b/src/crepe/api/Metadata.cpp @@ -4,4 +4,4 @@ using namespace crepe; using namespace std; Metadata::Metadata(game_object_id_t id, const string & name, const string & tag) - : Component(id), NAME(name), TAG(tag) {} + : Component(id), name(name), tag(tag) {} diff --git a/src/crepe/api/Metadata.h b/src/crepe/api/Metadata.h index f5e5c55..c61e006 100644 --- a/src/crepe/api/Metadata.h +++ b/src/crepe/api/Metadata.h @@ -31,9 +31,9 @@ public: public: //! The name of the GameObject - const std::string NAME; + const std::string name; //! The tag of the GameObject - const std::string TAG; + const std::string tag; //! The id of the parent GameObject (-1 if no parent) game_object_id_t parent = -1; //! The ids of the children GameObjects diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp index 6d111af..d96c0e8 100644 --- a/src/crepe/api/Script.hpp +++ b/src/crepe/api/Script.hpp @@ -19,7 +19,7 @@ T & Script::get_component() { template <typename T> std::vector<std::reference_wrapper<T>> Script::get_components() { ComponentManager & mgr = ComponentManager::get_instance(); - return mgr.get_components_by_id<T>(this->parent->GAME_OBJECT_ID); + return mgr.get_components_by_id<T>(this->parent->game_object_id); } } // namespace crepe |