diff options
Diffstat (limited to 'src/crepe')
-rw-r--r-- | src/crepe/Component.cpp | 1 | ||||
-rw-r--r-- | src/crepe/Metadata.cpp | 4 | ||||
-rw-r--r-- | src/crepe/Metadata.h | 3 | ||||
-rw-r--r-- | src/crepe/api/GameObject.cpp | 11 | ||||
-rw-r--r-- | src/crepe/api/GameObject.h | 3 | ||||
-rw-r--r-- | src/crepe/api/Transform.cpp | 4 | ||||
-rw-r--r-- | src/crepe/system/System.h | 4 |
7 files changed, 17 insertions, 13 deletions
diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp index 41e7273..358ce31 100644 --- a/src/crepe/Component.cpp +++ b/src/crepe/Component.cpp @@ -3,4 +3,3 @@ using namespace crepe; Component::Component(uint32_t id) : game_object_id(id), active(true) {} - diff --git a/src/crepe/Metadata.cpp b/src/crepe/Metadata.cpp index 1ba150a..53d93da 100644 --- a/src/crepe/Metadata.cpp +++ b/src/crepe/Metadata.cpp @@ -3,6 +3,6 @@ using namespace crepe; using namespace std; -Metadata::Metadata(uint32_t game_object_id, const string & name, const string & tag) +Metadata::Metadata(uint32_t game_object_id, const string & name, + const string & tag) : Component(game_object_id), name(name), tag(tag) {} - diff --git a/src/crepe/Metadata.h b/src/crepe/Metadata.h index b946fd0..1577987 100644 --- a/src/crepe/Metadata.h +++ b/src/crepe/Metadata.h @@ -9,7 +9,8 @@ namespace crepe { class Metadata : public Component { public: - Metadata(uint32_t game_object_id, const std::string & name, const std::string & tag); + Metadata(uint32_t game_object_id, const std::string & name, + const std::string & tag); virtual int get_instances_max() const { return 1; } public: diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index 8a1a235..51cd08f 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -6,7 +6,9 @@ using namespace crepe; using namespace std; -GameObject::GameObject(uint32_t id, std::string name, std::string tag, const Point & position, double rotation, double scale) : id(id) { +GameObject::GameObject(uint32_t id, std::string name, std::string tag, + const Point & position, double rotation, double scale) + : id(id) { ComponentManager & mgr = ComponentManager::get_instance(); mgr.add_component<Transform>(this->id, position, rotation, scale); mgr.add_component<Metadata>(this->id, name, tag); @@ -16,11 +18,12 @@ void GameObject::set_parent(const GameObject & parent) { auto & mgr = ComponentManager::get_instance(); // set parent on own Metadata component - vector<reference_wrapper<Metadata>> this_metadata = mgr.get_components_by_id<Metadata>(this->id); + vector<reference_wrapper<Metadata>> this_metadata + = 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); + vector<reference_wrapper<Metadata>> parent_metadata + = 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 4c87639..602f33c 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -9,7 +9,8 @@ namespace crepe { class GameObject { public: - GameObject(uint32_t id, std::string name, std::string tag, const Point & position, double rotation, double scale); + GameObject(uint32_t id, std::string name, std::string tag, + const Point & position, double rotation, double scale); void set_parent(const GameObject & parent); template <typename T, typename... Args> diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp index 9c9bb06..1d8d401 100644 --- a/src/crepe/api/Transform.cpp +++ b/src/crepe/api/Transform.cpp @@ -8,10 +8,10 @@ using namespace crepe; -Transform::Transform(uint32_t game_id, const Point & point, double rot, double scale) +Transform::Transform(uint32_t game_id, const Point & point, double rot, + double scale) : Component(game_id), position(point), rotation(rot), scale(scale) { dbg_trace(); } Transform::~Transform() { dbg_trace(); } - diff --git a/src/crepe/system/System.h b/src/crepe/system/System.h index 8744920..ecbb7f5 100644 --- a/src/crepe/system/System.h +++ b/src/crepe/system/System.h @@ -8,8 +8,8 @@ public: virtual void update() = 0; protected: - System(){}; - virtual ~System(){}; + System() {}; + virtual ~System() {}; private: // singleton |