From 5b248d068a94902be9ca4d00fe07d551f64c49b9 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Tue, 5 Nov 2024 16:14:32 +0100 Subject: `make format` --- src/crepe/system/RenderSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/crepe/system/RenderSystem.cpp') diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp index 96c94e9..5a07cc2 100644 --- a/src/crepe/system/RenderSystem.cpp +++ b/src/crepe/system/RenderSystem.cpp @@ -2,9 +2,9 @@ #include #include "../ComponentManager.h" -#include "../facade/SDLContext.h" #include "../api/Sprite.h" #include "../api/Transform.h" +#include "../facade/SDLContext.h" #include "../util/log.h" #include "RenderSystem.h" -- cgit v1.2.3 From 96ef24654d2ee26184ebcb5b9092649e67afe5d9 Mon Sep 17 00:00:00 2001 From: max-001 Date: Thu, 7 Nov 2024 12:33:37 +0100 Subject: Made game_object_id const --- src/crepe/Component.cpp | 2 +- src/crepe/Component.h | 2 +- src/crepe/api/Script.hpp | 2 +- src/crepe/system/PhysicsSystem.cpp | 4 ++-- src/crepe/system/RenderSystem.cpp | 2 +- src/example/ecs.cpp | 4 ++-- src/example/scene_manager.cpp | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/crepe/system/RenderSystem.cpp') diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp index 230bb70..cdbda67 100644 --- a/src/crepe/Component.cpp +++ b/src/crepe/Component.cpp @@ -2,4 +2,4 @@ using namespace crepe; -Component::Component(uint32_t id) : game_object_id(id) {} +Component::Component(uint32_t id) : GAME_OBJECT_ID(id) {} diff --git a/src/crepe/Component.h b/src/crepe/Component.h index 02a4e7e..41badc3 100644 --- a/src/crepe/Component.h +++ b/src/crepe/Component.h @@ -36,7 +36,7 @@ public: public: //! The id of the GameObject this component belongs to - uint32_t game_object_id; + const uint32_t GAME_OBJECT_ID; //! Whether the component is active bool active = true; }; diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp index d96c0e8..6d111af 100644 --- a/src/crepe/api/Script.hpp +++ b/src/crepe/api/Script.hpp @@ -19,7 +19,7 @@ T & Script::get_component() { template std::vector> Script::get_components() { ComponentManager & mgr = ComponentManager::get_instance(); - return mgr.get_components_by_id(this->parent->game_object_id); + return mgr.get_components_by_id(this->parent->GAME_OBJECT_ID); } } // namespace crepe diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp index cea8062..dd80312 100644 --- a/src/crepe/system/PhysicsSystem.cpp +++ b/src/crepe/system/PhysicsSystem.cpp @@ -23,12 +23,12 @@ void PhysicsSystem::update() { switch (rigidbody.body_type) { case BodyType::DYNAMIC: for (Transform & transform : transforms) { - if (transform.game_object_id == rigidbody.game_object_id) { + if (transform.GAME_OBJECT_ID == rigidbody.GAME_OBJECT_ID) { rigidbody.velocity_x = 0; rigidbody.velocity_y = 0; std::vector> forces = mgr.get_components_by_id( - rigidbody.game_object_id); + rigidbody.GAME_OBJECT_ID); rigidbody.velocity_y += rigidbody.gravity_scale * 1 * rigidbody.mass; diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp index 5a07cc2..2003eaf 100644 --- a/src/crepe/system/RenderSystem.cpp +++ b/src/crepe/system/RenderSystem.cpp @@ -32,7 +32,7 @@ void RenderSystem::update() { for (const Sprite & sprite : sprites) { std::vector> transforms - = mgr.get_components_by_id(sprite.game_object_id); + = mgr.get_components_by_id(sprite.GAME_OBJECT_ID); for (const Transform & transform : transforms) { render.draw(sprite, transform); } diff --git a/src/example/ecs.cpp b/src/example/ecs.cpp index 0c64373..dfd3595 100644 --- a/src/example/ecs.cpp +++ b/src/example/ecs.cpp @@ -38,7 +38,7 @@ int main() { // Print the Metadata and Transform components for (auto & m : metadata) { - cout << "Id: " << m.get().game_object_id << " Name: " << m.get().name + cout << "Id: " << m.get().GAME_OBJECT_ID << " Name: " << m.get().name << " Tag: " << m.get().tag << " Parent: " << m.get().parent << " Children: "; for (auto & c : m.get().children) { @@ -47,7 +47,7 @@ int main() { cout << endl; } for (auto & t : transform) { - cout << "Id: " << t.get().game_object_id << " Position: [" + cout << "Id: " << t.get().GAME_OBJECT_ID << " Position: [" << t.get().position.x << ", " << t.get().position.y << "]" << endl; } diff --git a/src/example/scene_manager.cpp b/src/example/scene_manager.cpp index efbf2c2..471c400 100644 --- a/src/example/scene_manager.cpp +++ b/src/example/scene_manager.cpp @@ -52,7 +52,7 @@ int main() { cout << "Metadata components of Scene1:" << endl; // Print the Metadata for (auto & m : metadata) { - cout << "Id: " << m.get().game_object_id << " Name: " << m.get().name + cout << "Id: " << m.get().GAME_OBJECT_ID << " Name: " << m.get().name << " Tag: " << m.get().tag << endl; } @@ -67,7 +67,7 @@ int main() { cout << "Metadata components of Scene2:" << endl; // Print the Metadata for (auto & m : metadata) { - cout << "Id: " << m.get().game_object_id << " Name: " << m.get().name + cout << "Id: " << m.get().GAME_OBJECT_ID << " Name: " << m.get().name << " Tag: " << m.get().tag << endl; } -- cgit v1.2.3 From 156906dca0b84d3fd3c889e1bcda12308b8fe793 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 7 Nov 2024 15:32:49 +0100 Subject: update clang-tidy configuration --- .clang-tidy | 2 ++ src/crepe/Component.cpp | 2 +- src/crepe/Component.h | 2 +- src/crepe/api/GameObject.cpp | 14 +++++++------- src/crepe/api/GameObject.h | 2 +- src/crepe/api/GameObject.hpp | 2 +- src/crepe/api/Metadata.cpp | 2 +- src/crepe/api/Metadata.h | 4 ++-- src/crepe/api/Script.hpp | 2 +- src/crepe/system/PhysicsSystem.cpp | 4 ++-- src/crepe/system/RenderSystem.cpp | 2 +- src/example/ecs.cpp | 6 +++--- src/example/scene_manager.cpp | 8 ++++---- 13 files changed, 27 insertions(+), 25 deletions(-) (limited to 'src/crepe/system/RenderSystem.cpp') diff --git a/.clang-tidy b/.clang-tidy index 3408f75..4d8170b 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -20,6 +20,8 @@ CheckOptions: value: '_.*' - key: 'readability-identifier-naming.ConstantParameterCase' value: 'lower_case' + - key: 'readability-identifier-naming.ConstantMemberCase' + value: 'lower_case' - key: 'readability-identifier-naming.VariableCase' value: 'lower_case' - key: 'readability-identifier-naming.VariableIgnoredRegexp' diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp index af439ed..73c2d07 100644 --- a/src/crepe/Component.cpp +++ b/src/crepe/Component.cpp @@ -3,4 +3,4 @@ using namespace crepe; -Component::Component(game_object_id_t id) : GAME_OBJECT_ID(id) {} +Component::Component(game_object_id_t id) : game_object_id(id) {} diff --git a/src/crepe/Component.h b/src/crepe/Component.h index ee795f4..0fe60b2 100644 --- a/src/crepe/Component.h +++ b/src/crepe/Component.h @@ -38,7 +38,7 @@ public: public: //! The id of the GameObject this component belongs to - const game_object_id_t GAME_OBJECT_ID; + const game_object_id_t game_object_id; //! Whether the component is active bool active = true; }; 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(this->ID, position, rotation, scale); - mgr.add_component(this->ID, name, tag); + mgr.add_component(this->id, position, rotation, scale); + mgr.add_component(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> this_metadata - = mgr.get_components_by_id(this->ID); - this_metadata.at(0).get().parent = parent.ID; + = mgr.get_components_by_id(this->id); + this_metadata.at(0).get().parent = parent.id; // Add own id to children list of parent's Metadata component vector> parent_metadata - = mgr.get_components_by_id(parent.ID); - parent_metadata.at(0).get().children.push_back(this->ID); + = mgr.get_components_by_id(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 T & GameObject::add_component(Args &&... args) { ComponentManager & mgr = ComponentManager::get_instance(); - return mgr.add_component(this->ID, std::forward(args)...); + return mgr.add_component(this->id, std::forward(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 std::vector> Script::get_components() { ComponentManager & mgr = ComponentManager::get_instance(); - return mgr.get_components_by_id(this->parent->GAME_OBJECT_ID); + return mgr.get_components_by_id(this->parent->game_object_id); } } // namespace crepe diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp index dd80312..cea8062 100644 --- a/src/crepe/system/PhysicsSystem.cpp +++ b/src/crepe/system/PhysicsSystem.cpp @@ -23,12 +23,12 @@ void PhysicsSystem::update() { switch (rigidbody.body_type) { case BodyType::DYNAMIC: for (Transform & transform : transforms) { - if (transform.GAME_OBJECT_ID == rigidbody.GAME_OBJECT_ID) { + if (transform.game_object_id == rigidbody.game_object_id) { rigidbody.velocity_x = 0; rigidbody.velocity_y = 0; std::vector> forces = mgr.get_components_by_id( - rigidbody.GAME_OBJECT_ID); + rigidbody.game_object_id); rigidbody.velocity_y += rigidbody.gravity_scale * 1 * rigidbody.mass; diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp index 2003eaf..5a07cc2 100644 --- a/src/crepe/system/RenderSystem.cpp +++ b/src/crepe/system/RenderSystem.cpp @@ -32,7 +32,7 @@ void RenderSystem::update() { for (const Sprite & sprite : sprites) { std::vector> transforms - = mgr.get_components_by_id(sprite.GAME_OBJECT_ID); + = mgr.get_components_by_id(sprite.game_object_id); for (const Transform & transform : transforms) { render.draw(sprite, transform); } diff --git a/src/example/ecs.cpp b/src/example/ecs.cpp index 7593faf..0c64373 100644 --- a/src/example/ecs.cpp +++ b/src/example/ecs.cpp @@ -38,8 +38,8 @@ int main() { // Print the Metadata and Transform components for (auto & m : metadata) { - cout << "Id: " << m.get().GAME_OBJECT_ID << " Name: " << m.get().NAME - << " Tag: " << m.get().TAG << " Parent: " << m.get().parent + cout << "Id: " << m.get().game_object_id << " Name: " << m.get().name + << " Tag: " << m.get().tag << " Parent: " << m.get().parent << " Children: "; for (auto & c : m.get().children) { cout << c << " "; @@ -47,7 +47,7 @@ int main() { cout << endl; } for (auto & t : transform) { - cout << "Id: " << t.get().GAME_OBJECT_ID << " Position: [" + cout << "Id: " << t.get().game_object_id << " Position: [" << t.get().position.x << ", " << t.get().position.y << "]" << endl; } diff --git a/src/example/scene_manager.cpp b/src/example/scene_manager.cpp index bfa9479..efbf2c2 100644 --- a/src/example/scene_manager.cpp +++ b/src/example/scene_manager.cpp @@ -52,8 +52,8 @@ int main() { cout << "Metadata components of Scene1:" << endl; // Print the Metadata for (auto & m : metadata) { - cout << "Id: " << m.get().GAME_OBJECT_ID << " Name: " << m.get().NAME - << " Tag: " << m.get().TAG << endl; + cout << "Id: " << m.get().game_object_id << " Name: " << m.get().name + << " Tag: " << m.get().tag << endl; } // Set scene2 as the next scene @@ -67,8 +67,8 @@ int main() { cout << "Metadata components of Scene2:" << endl; // Print the Metadata for (auto & m : metadata) { - cout << "Id: " << m.get().GAME_OBJECT_ID << " Name: " << m.get().NAME - << " Tag: " << m.get().TAG << endl; + cout << "Id: " << m.get().game_object_id << " Name: " << m.get().name + << " Tag: " << m.get().tag << endl; } return 0; -- cgit v1.2.3