From db280c2787cfc77641082f94d40d9231fbc62d56 Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 5 Nov 2024 12:07:10 +0100 Subject: Replaced Point references with Point copy by value --- src/crepe/api/Transform.cpp | 2 +- src/crepe/api/Transform.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp index c76bc72..2a36e67 100644 --- a/src/crepe/api/Transform.cpp +++ b/src/crepe/api/Transform.cpp @@ -8,7 +8,7 @@ using namespace crepe::api; -Transform::Transform(uint32_t game_id, const Point & point, double rot, +Transform::Transform(uint32_t game_id, Point point, double rot, double scale) : Component(game_id), position(point), rotation(rot), scale(scale) { dbg_trace(); diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h index c451c16..5d45060 100644 --- a/src/crepe/api/Transform.h +++ b/src/crepe/api/Transform.h @@ -14,7 +14,7 @@ class Transform : public Component { // works similar (or the same) as those found in GLSL? public: - Transform(uint32_t id, const Point &, double, double); + Transform(uint32_t id, Point, double, double); ~Transform(); //! Translation (shift) Point position; -- cgit v1.2.3 From 6aa2084b52e632447267bdff5342aa7af224f1d4 Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 5 Nov 2024 13:01:23 +0100 Subject: Modified GameObject according to class diagram (design document) --- src/crepe/api/GameObject.cpp | 18 ++++++++++++++++-- src/crepe/api/GameObject.h | 9 ++++----- 2 files changed, 20 insertions(+), 7 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index b167187..708ff71 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -1,7 +1,21 @@ +#include "api/Transform.h" + +#include "Metadata.h" #include "GameObject.h" using namespace crepe::api; using namespace std; -GameObject::GameObject(uint32_t id, string name, string tag, int layer) - : id(id), name(name), tag(tag), active(true), layer(layer) {} +GameObject::GameObject(uint32_t id, std::string name, std::string tag, Point position, double rotation, double scale) : id(id) { + auto & mgr = ComponentManager::get_instance(); + mgr.add_component(this->id, position, rotation, scale); + mgr.add_component(this->id, name, tag); +} + +void GameObject::set_parent(GameObject & parent) { + auto & mgr = ComponentManager::get_instance(); + vector> thisMetadata = mgr.get_components_by_id(this->id); + vector> parentMetadata = mgr.get_components_by_id(parent.id); + thisMetadata.at(0).get().parent = parent.id; + parentMetadata.at(0).get().children.push_back(this->id); +} diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index 57508c5..fd513ec 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -3,20 +3,19 @@ #include #include +#include "api/Point.h" + namespace crepe::api { class GameObject { public: - GameObject(uint32_t id, std::string name, std::string tag, int layer); + GameObject(uint32_t id, std::string name, std::string tag, Point position, double rotation, double scale); + void set_parent(GameObject & parent); template T & add_component(Args &&... args); uint32_t id; - std::string name; - std::string tag; - bool active; - int layer; }; } // namespace crepe::api -- cgit v1.2.3 From efc5795029a6da3db116ef96676596832c6b8754 Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 5 Nov 2024 13:27:12 +0100 Subject: Replaced auto with concrete type --- src/crepe/api/GameObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index 708ff71..388f1c4 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -7,7 +7,7 @@ using namespace crepe::api; using namespace std; GameObject::GameObject(uint32_t id, std::string name, std::string tag, Point position, double rotation, double scale) : id(id) { - auto & mgr = ComponentManager::get_instance(); + ComponentManager & mgr = ComponentManager::get_instance(); mgr.add_component(this->id, position, rotation, scale); mgr.add_component(this->id, name, tag); } -- cgit v1.2.3 From 154e974a0d553ea8209c3be9b1bd5820fef5e0a3 Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 5 Nov 2024 13:49:20 +0100 Subject: Implemented get_instances_max() at Transform component --- src/crepe/api/Transform.cpp | 5 +++++ src/crepe/api/Transform.h | 1 + 2 files changed, 6 insertions(+) (limited to 'src/crepe/api') diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp index 2a36e67..64ad81c 100644 --- a/src/crepe/api/Transform.cpp +++ b/src/crepe/api/Transform.cpp @@ -13,4 +13,9 @@ Transform::Transform(uint32_t game_id, Point point, double rot, : Component(game_id), position(point), rotation(rot), scale(scale) { dbg_trace(); } + Transform::~Transform() { dbg_trace(); } + +int Transform::get_instances_max() const { + return 1; +} diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h index 5d45060..85e16b4 100644 --- a/src/crepe/api/Transform.h +++ b/src/crepe/api/Transform.h @@ -16,6 +16,7 @@ class Transform : public Component { public: Transform(uint32_t id, Point, double, double); ~Transform(); + int get_instances_max() const; //! Translation (shift) Point position; //! Rotation, in radians -- cgit v1.2.3 From 5b8ec02b6b4f2356e2d688502298274e372b9fad Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 5 Nov 2024 13:57:49 +0100 Subject: Make format --- mwe/events/include/event.h | 2 +- src/crepe/Component.cpp | 4 +-- src/crepe/Metadata.cpp | 7 +++--- src/crepe/System.h | 4 +-- src/crepe/api/GameObject.cpp | 12 ++++++--- src/crepe/api/GameObject.h | 3 ++- src/crepe/api/Transform.cpp | 7 ++---- src/example/ecs.cpp | 58 ++++++++++++++++++++++++++------------------ src/example/physics.cpp | 3 ++- 9 files changed, 55 insertions(+), 45 deletions(-) (limited to 'src/crepe/api') diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h index 16c75bf..3e70201 100644 --- a/mwe/events/include/event.h +++ b/mwe/events/include/event.h @@ -152,7 +152,7 @@ private: }; class ShutDownEvent : public Event { public: - ShutDownEvent() : Event("ShutDownEvent") {}; + ShutDownEvent() : Event("ShutDownEvent"){}; REGISTER_EVENT_TYPE(ShutDownEvent) diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp index 25c6947..78b47fa 100644 --- a/src/crepe/Component.cpp +++ b/src/crepe/Component.cpp @@ -4,6 +4,4 @@ using namespace crepe; Component::Component(uint32_t id) : game_object_id(id), active(true) {} -int Component::get_instances_max() const { - return -1; -} +int Component::get_instances_max() const { return -1; } diff --git a/src/crepe/Metadata.cpp b/src/crepe/Metadata.cpp index 3d1d910..d362e0a 100644 --- a/src/crepe/Metadata.cpp +++ b/src/crepe/Metadata.cpp @@ -3,8 +3,7 @@ using namespace crepe; using namespace std; -Metadata::Metadata(uint32_t gameObjectId, string name, string tag) : Component(gameObjectId), name(name), tag(tag) {} +Metadata::Metadata(uint32_t gameObjectId, string name, string tag) + : Component(gameObjectId), name(name), tag(tag) {} -int Metadata::get_instances_max() const { - return 1; -} +int Metadata::get_instances_max() const { return 1; } diff --git a/src/crepe/System.h b/src/crepe/System.h index ecbb7f5..8744920 100644 --- a/src/crepe/System.h +++ b/src/crepe/System.h @@ -8,8 +8,8 @@ public: virtual void update() = 0; protected: - System() {}; - virtual ~System() {}; + System(){}; + virtual ~System(){}; private: // singleton diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index 388f1c4..5393e39 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -1,12 +1,14 @@ #include "api/Transform.h" -#include "Metadata.h" #include "GameObject.h" +#include "Metadata.h" using namespace crepe::api; using namespace std; -GameObject::GameObject(uint32_t id, std::string name, std::string tag, Point position, double rotation, double scale) : id(id) { +GameObject::GameObject(uint32_t id, std::string name, std::string tag, + Point position, double rotation, double scale) + : id(id) { ComponentManager & mgr = ComponentManager::get_instance(); mgr.add_component(this->id, position, rotation, scale); mgr.add_component(this->id, name, tag); @@ -14,8 +16,10 @@ GameObject::GameObject(uint32_t id, std::string name, std::string tag, Point pos void GameObject::set_parent(GameObject & parent) { auto & mgr = ComponentManager::get_instance(); - vector> thisMetadata = mgr.get_components_by_id(this->id); - vector> parentMetadata = mgr.get_components_by_id(parent.id); + vector> thisMetadata + = mgr.get_components_by_id(this->id); + vector> parentMetadata + = mgr.get_components_by_id(parent.id); thisMetadata.at(0).get().parent = parent.id; parentMetadata.at(0).get().children.push_back(this->id); } diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index fd513ec..862fee8 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -9,7 +9,8 @@ namespace crepe::api { class GameObject { public: - GameObject(uint32_t id, std::string name, std::string tag, Point position, double rotation, double scale); + GameObject(uint32_t id, std::string name, std::string tag, Point position, + double rotation, double scale); void set_parent(GameObject & parent); template diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp index 64ad81c..4b4da8f 100644 --- a/src/crepe/api/Transform.cpp +++ b/src/crepe/api/Transform.cpp @@ -8,14 +8,11 @@ using namespace crepe::api; -Transform::Transform(uint32_t game_id, Point point, double rot, - double scale) +Transform::Transform(uint32_t game_id, Point point, double rot, double scale) : Component(game_id), position(point), rotation(rot), scale(scale) { dbg_trace(); } Transform::~Transform() { dbg_trace(); } -int Transform::get_instances_max() const { - return 1; -} +int Transform::get_instances_max() const { return 1; } diff --git a/src/example/ecs.cpp b/src/example/ecs.cpp index 4c0e07d..2eb09b2 100644 --- a/src/example/ecs.cpp +++ b/src/example/ecs.cpp @@ -1,8 +1,8 @@ #include -#include "../crepe/api/GameObject.h" #include "../crepe/ComponentManager.h" #include "../crepe/Metadata.h" +#include "../crepe/api/GameObject.h" #include "../crepe/api/Transform.h" using namespace crepe::api; @@ -11,33 +11,43 @@ using namespace std; int main() { // Create a few GameObjects - GameObject body(0, "body", "person", Point{0, 0}, 0, 1); - GameObject rightLeg(1, "rightLeg", "person", Point{1, 1}, 0, 1); - GameObject leftLeg(2, "leftLeg", "person", Point{1, 1}, 0, 1); - GameObject rightFoot(3, "rightFoot", "person", Point{2, 2}, 0, 1); - GameObject leftFoot(4, "leftFoot", "person", Point{2, 2}, 0, 1); + try { + GameObject body(0, "body", "person", Point{0, 0}, 0, 1); + GameObject rightLeg(1, "rightLeg", "person", Point{1, 1}, 0, 1); + GameObject leftLeg(2, "leftLeg", "person", Point{1, 1}, 0, 1); + GameObject rightFoot(3, "rightFoot", "person", Point{2, 2}, 0, 1); + GameObject leftFoot(4, "leftFoot", "person", Point{2, 2}, 0, 1); - // Set the parent of each GameObject - rightFoot.set_parent(rightLeg); - leftFoot.set_parent(leftLeg); - rightLeg.set_parent(body); - leftLeg.set_parent(body); + // Set the parent of each GameObject + rightFoot.set_parent(rightLeg); + leftFoot.set_parent(leftLeg); + rightLeg.set_parent(body); + leftLeg.set_parent(body); - // Get the Metadata and Transform components of each GameObject - ComponentManager & mgr = ComponentManager::get_instance(); - vector> metadata = mgr.get_components_by_type(); - vector> transform = mgr.get_components_by_type(); + // Get the Metadata and Transform components of each GameObject + ComponentManager & mgr = ComponentManager::get_instance(); + vector> metadata + = mgr.get_components_by_type(); + vector> transform + = mgr.get_components_by_type(); - // 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 << " Children: "; - for(auto & c : m.get().children) { - cout << c << " "; + // 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 << " Children: "; + for (auto & c : m.get().children) { + cout << c << " "; + } + cout << endl; } - cout << endl; - } - for(auto & t : transform) { - cout << "Id: " << t.get().game_object_id << " Position: [" << t.get().position.x << ", " << t.get().position.y << "]" << endl; + for (auto & t : transform) { + cout << "Id: " << t.get().game_object_id << " Position: [" + << t.get().position.x << ", " << t.get().position.y << "]" + << endl; + } + } catch (const exception & e) { + cerr << e.what() << endl; } return 0; diff --git a/src/example/physics.cpp b/src/example/physics.cpp index 54d1807..1bafdf3 100644 --- a/src/example/physics.cpp +++ b/src/example/physics.cpp @@ -16,7 +16,8 @@ using namespace std; int main(int argc, char * argv[]) { PhysicsSystem physics_system; GameObject * game_object[2]; - game_object[1] = new GameObject(2, "Name", "Tag", Point{0, 0}, 0, 0); // not found not used + // not found not used + game_object[1] = new GameObject(2, "Name", "Tag", Point{0, 0}, 0, 0); game_object[0] = new GameObject(5, "Name", "Tag", Point{0, 0}, 0, 0); game_object[0]->add_component(1, 1, BodyType::DYNAMIC); game_object[0]->add_component(1, 0); -- cgit v1.2.3 From 02c4c796888397496452aaa46c52691eef8707eb Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 5 Nov 2024 16:11:54 +0100 Subject: Added abstract Scene class --- src/crepe/api/Scene.cpp | 5 +++++ src/crepe/api/Scene.h | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 src/crepe/api/Scene.cpp create mode 100644 src/crepe/api/Scene.h (limited to 'src/crepe/api') diff --git a/src/crepe/api/Scene.cpp b/src/crepe/api/Scene.cpp new file mode 100644 index 0000000..189650f --- /dev/null +++ b/src/crepe/api/Scene.cpp @@ -0,0 +1,5 @@ +#include "Scene.h" + +using namespace crepe::api; + +Scene::Scene(std::string name) : name(name) {} diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h new file mode 100644 index 0000000..35fe9db --- /dev/null +++ b/src/crepe/api/Scene.h @@ -0,0 +1,17 @@ +#pragma once + +#include + +namespace crepe::api { + +class Scene { +public: + Scene(std::string name); + virtual ~Scene() = default; + virtual void load_scene() = 0; + +public: + std::string name; +}; + +} // namespace crepe::api -- cgit v1.2.3 From d478c8b76d6155bd9653f81787f73db07c55d9f3 Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 5 Nov 2024 16:12:10 +0100 Subject: Added SceneManager --- src/crepe/api/CMakeLists.txt | 5 +++++ src/crepe/api/SceneManager.cpp | 36 ++++++++++++++++++++++++++++++++++++ src/crepe/api/SceneManager.h | 36 ++++++++++++++++++++++++++++++++++++ src/crepe/api/SceneManager.hpp | 11 +++++++++++ 4 files changed, 88 insertions(+) create mode 100644 src/crepe/api/SceneManager.cpp create mode 100644 src/crepe/api/SceneManager.h create mode 100644 src/crepe/api/SceneManager.hpp (limited to 'src/crepe/api') diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt index 0bb1263..7fd8ffd 100644 --- a/src/crepe/api/CMakeLists.txt +++ b/src/crepe/api/CMakeLists.txt @@ -11,6 +11,8 @@ target_sources(crepe PUBLIC Texture.cpp AssetManager.cpp Sprite.cpp + Scene.cpp + SceneManager.cpp ) target_sources(crepe PUBLIC FILE_SET HEADERS FILES @@ -28,4 +30,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES Texture.h AssetManager.h AssetManager.hpp + Scene.h + SceneManager.h + SceneManager.hpp ) diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp new file mode 100644 index 0000000..773303b --- /dev/null +++ b/src/crepe/api/SceneManager.cpp @@ -0,0 +1,36 @@ +#include "../ComponentManager.h" + +#include "SceneManager.h" + +using namespace crepe::api; + +SceneManager::SceneManager() {} + +SceneManager & SceneManager::get_instance() { + static SceneManager instance; + return instance; +} + +// Push the next scene onto the queue +void SceneManager::load_scene(std::string name) { + next_scene.push(name); +} + +// Load a new scene from the queue (if there is one) +void SceneManager::empty_queue() { + while (!next_scene.empty()) { + string name = next_scene.front(); + next_scene.pop(); + + for (auto & scene : scenes) { + if (scene->name == name) { + // Delete all components of the current scene + ComponentManager & mgr = ComponentManager::get_instance(); + mgr.delete_all_components(); + // Load the new scene + scene->load_scene(); + break; + } + } + } +} diff --git a/src/crepe/api/SceneManager.h b/src/crepe/api/SceneManager.h new file mode 100644 index 0000000..97441a5 --- /dev/null +++ b/src/crepe/api/SceneManager.h @@ -0,0 +1,36 @@ +#pragma once + +#include +#include +#include + +#include "Scene.h" + +namespace crepe::api { + +class SceneManager { +public: + // Singleton + static SceneManager & get_instance(); + SceneManager(const SceneManager &) = delete; + SceneManager(SceneManager &&) = delete; + SceneManager & operator=(const SceneManager &) = delete; + SceneManager & operator=(SceneManager &&) = delete; + +public: + template + void add_scene(std::string name); + void load_scene(std::string name); + void empty_queue(); + +private: + SceneManager(); + +private: + std::vector> scenes; + std::queue next_scene; +}; + +} // namespace crepe::api + +#include "SceneManager.hpp" diff --git a/src/crepe/api/SceneManager.hpp b/src/crepe/api/SceneManager.hpp new file mode 100644 index 0000000..120640f --- /dev/null +++ b/src/crepe/api/SceneManager.hpp @@ -0,0 +1,11 @@ +#include "SceneManager.h" + +using namespace crepe::api; +using namespace std; + +// Add a new concrete scene to the scene manager +template +void SceneManager::add_scene(string name) { + static_assert(is_base_of::value, "T must be derived from Scene"); + scenes.emplace_back(make_unique(name)); +} -- cgit v1.2.3 From 9752e2d27b06db25f0e2bc170341901201b4e4c1 Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 5 Nov 2024 16:42:08 +0100 Subject: Replaced crepe::api to crepe --- src/crepe/api/Scene.cpp | 2 +- src/crepe/api/Scene.h | 4 ++-- src/crepe/api/SceneManager.cpp | 2 +- src/crepe/api/SceneManager.h | 4 ++-- src/crepe/api/SceneManager.hpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/Scene.cpp b/src/crepe/api/Scene.cpp index 189650f..092dc62 100644 --- a/src/crepe/api/Scene.cpp +++ b/src/crepe/api/Scene.cpp @@ -1,5 +1,5 @@ #include "Scene.h" -using namespace crepe::api; +using namespace crepe; Scene::Scene(std::string name) : name(name) {} diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h index 35fe9db..8bb487a 100644 --- a/src/crepe/api/Scene.h +++ b/src/crepe/api/Scene.h @@ -2,7 +2,7 @@ #include -namespace crepe::api { +namespace crepe { class Scene { public: @@ -14,4 +14,4 @@ public: std::string name; }; -} // namespace crepe::api +} // namespace crepe diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp index 773303b..1680dd1 100644 --- a/src/crepe/api/SceneManager.cpp +++ b/src/crepe/api/SceneManager.cpp @@ -2,7 +2,7 @@ #include "SceneManager.h" -using namespace crepe::api; +using namespace crepe; SceneManager::SceneManager() {} diff --git a/src/crepe/api/SceneManager.h b/src/crepe/api/SceneManager.h index 97441a5..76fe92e 100644 --- a/src/crepe/api/SceneManager.h +++ b/src/crepe/api/SceneManager.h @@ -6,7 +6,7 @@ #include "Scene.h" -namespace crepe::api { +namespace crepe { class SceneManager { public: @@ -31,6 +31,6 @@ private: std::queue next_scene; }; -} // namespace crepe::api +} // namespace crepe #include "SceneManager.hpp" diff --git a/src/crepe/api/SceneManager.hpp b/src/crepe/api/SceneManager.hpp index 120640f..7789823 100644 --- a/src/crepe/api/SceneManager.hpp +++ b/src/crepe/api/SceneManager.hpp @@ -1,6 +1,6 @@ #include "SceneManager.h" -using namespace crepe::api; +using namespace crepe; using namespace std; // Add a new concrete scene to the scene manager -- cgit v1.2.3 From bf4c172f2709adf5a6f210bae60e16972e8decad Mon Sep 17 00:00:00 2001 From: max-001 Date: Tue, 5 Nov 2024 16:42:57 +0100 Subject: Make format --- src/crepe/api/SceneManager.cpp | 4 +--- src/crepe/api/SceneManager.h | 2 +- src/example/scene_manager.cpp | 15 ++++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp index 1680dd1..c8061c9 100644 --- a/src/crepe/api/SceneManager.cpp +++ b/src/crepe/api/SceneManager.cpp @@ -12,9 +12,7 @@ SceneManager & SceneManager::get_instance() { } // Push the next scene onto the queue -void SceneManager::load_scene(std::string name) { - next_scene.push(name); -} +void SceneManager::load_scene(std::string name) { next_scene.push(name); } // Load a new scene from the queue (if there is one) void SceneManager::empty_queue() { diff --git a/src/crepe/api/SceneManager.h b/src/crepe/api/SceneManager.h index 76fe92e..87db8d7 100644 --- a/src/crepe/api/SceneManager.h +++ b/src/crepe/api/SceneManager.h @@ -1,8 +1,8 @@ #pragma once -#include #include #include +#include #include "Scene.h" diff --git a/src/example/scene_manager.cpp b/src/example/scene_manager.cpp index 499a727..f1fe86a 100644 --- a/src/example/scene_manager.cpp +++ b/src/example/scene_manager.cpp @@ -1,10 +1,10 @@ #include -#include "../crepe/api/SceneManager.h" -#include "../crepe/api/Scene.h" -#include "../crepe/api/GameObject.h" -#include "../crepe/Metadata.h" #include "../crepe/ComponentManager.h" +#include "../crepe/Metadata.h" +#include "../crepe/api/GameObject.h" +#include "../crepe/api/Scene.h" +#include "../crepe/api/SceneManager.h" using namespace crepe; using namespace std; @@ -46,8 +46,9 @@ int main() { // Get the Metadata components of each GameObject of Scene1 ComponentManager & component_mgr = ComponentManager::get_instance(); - vector> metadata = component_mgr.get_components_by_type(); - + vector> metadata + = component_mgr.get_components_by_type(); + cout << "Metadata components of Scene1:" << endl; // Print the Metadata for (auto & m : metadata) { @@ -62,7 +63,7 @@ int main() { // Get the Metadata components of each GameObject of Scene2 metadata = component_mgr.get_components_by_type(); - + cout << "Metadata components of Scene2:" << endl; // Print the Metadata for (auto & m : metadata) { -- cgit v1.2.3 From 3fe7400de095756362b999908fd2a2ba3b71a848 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Tue, 5 Nov 2024 18:48:46 +0100 Subject: merge #18 --- contributing.md | 31 +++++++++++++++++++++++++++++++ src/crepe/Component.cpp | 1 - src/crepe/Component.h | 2 +- src/crepe/ComponentManager.hpp | 3 ++- src/crepe/Metadata.cpp | 5 ++--- src/crepe/Metadata.h | 6 +++--- src/crepe/api/GameObject.cpp | 21 +++++++++++---------- src/crepe/api/GameObject.h | 5 ++--- src/crepe/api/Transform.cpp | 3 +-- src/crepe/api/Transform.h | 4 ++-- src/example/ecs.cpp | 16 ++++++++-------- src/example/rendering.cpp | 1 - 12 files changed, 63 insertions(+), 35 deletions(-) (limited to 'src/crepe/api') diff --git a/contributing.md b/contributing.md index 2fe46f7..e910dba 100644 --- a/contributing.md +++ b/contributing.md @@ -386,6 +386,37 @@ that you can click on to open them. #endif ``` +-
+ Variables that are being moved always use the fully qualified std::move +
GoodBad
+ + ```cpp + using namespace std; + string foo = "bar"; + ref_fn(std::move(foo)); + ``` + + + ```cpp + using namespace std; + string foo = "bar"; + ref_fn(move(foo)); + ``` +
+-
+ If possible, classes and structs are passed to functions by (const) reference +
GoodBad
+ + ```cpp + void foo(const Point & p); + ``` + + + ```cpp + void foo(Point & p); + void bar(Point p); + ``` +
## CMakeLists-specific diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp index 78b47fa..41e7273 100644 --- a/src/crepe/Component.cpp +++ b/src/crepe/Component.cpp @@ -4,4 +4,3 @@ using namespace crepe; Component::Component(uint32_t id) : game_object_id(id), active(true) {} -int Component::get_instances_max() const { return -1; } diff --git a/src/crepe/Component.h b/src/crepe/Component.h index 039836e..8db9b2a 100644 --- a/src/crepe/Component.h +++ b/src/crepe/Component.h @@ -13,7 +13,7 @@ protected: public: virtual ~Component() = default; - virtual int get_instances_max() const; + virtual int get_instances_max() const { return -1; } public: uint32_t game_object_id; diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp index f469d12..e74f2e9 100644 --- a/src/crepe/ComponentManager.hpp +++ b/src/crepe/ComponentManager.hpp @@ -36,12 +36,13 @@ T & ComponentManager::add_component(uint32_t id, Args &&... args) { // Check if the vector size is not greater than get_instances_max if (instance->get_instances_max() != -1 && components[type][id].size() >= instance->get_instances_max()) { + // TODO: Exception throw std::runtime_error( "Exceeded maximum number of instances for this component type"); } // store its unique_ptr in the vector<> - components[type][id].push_back(move(instance)); + components[type][id].push_back(std::move(instance)); return *instance; } diff --git a/src/crepe/Metadata.cpp b/src/crepe/Metadata.cpp index d362e0a..1ba150a 100644 --- a/src/crepe/Metadata.cpp +++ b/src/crepe/Metadata.cpp @@ -3,7 +3,6 @@ using namespace crepe; using namespace std; -Metadata::Metadata(uint32_t gameObjectId, string name, string tag) - : Component(gameObjectId), name(name), tag(tag) {} +Metadata::Metadata(uint32_t game_object_id, const string & name, const string & tag) + : Component(game_object_id), name(name), tag(tag) {} -int Metadata::get_instances_max() const { return 1; } diff --git a/src/crepe/Metadata.h b/src/crepe/Metadata.h index 2f08476..b946fd0 100644 --- a/src/crepe/Metadata.h +++ b/src/crepe/Metadata.h @@ -9,13 +9,13 @@ namespace crepe { class Metadata : public Component { public: - Metadata(uint32_t game_object_id, std::string name, std::string tag); - int get_instances_max() const; + Metadata(uint32_t game_object_id, const std::string & name, const std::string & tag); + virtual int get_instances_max() const { return 1; } public: std::string name; std::string tag; - uint32_t parent = UINT32_MAX; + uint32_t parent = -1; std::vector children; }; diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index 2592d2d..8a1a235 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -6,20 +6,21 @@ using namespace crepe; using namespace std; -GameObject::GameObject(uint32_t id, std::string name, std::string tag, - 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(this->id, position, rotation, scale); mgr.add_component(this->id, name, tag); } -void GameObject::set_parent(GameObject & parent) { +void GameObject::set_parent(const GameObject & parent) { auto & mgr = ComponentManager::get_instance(); - vector> thisMetadata - = mgr.get_components_by_id(this->id); - vector> parentMetadata - = mgr.get_components_by_id(parent.id); - thisMetadata.at(0).get().parent = parent.id; - parentMetadata.at(0).get().children.push_back(this->id); + + // set parent on own Metadata component + vector> this_metadata = 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); } + diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index dcd33ad..4c87639 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -9,9 +9,8 @@ namespace crepe { class GameObject { public: - GameObject(uint32_t id, std::string name, std::string tag, Point position, - double rotation, double scale); - void set_parent(GameObject & parent); + GameObject(uint32_t id, std::string name, std::string tag, const Point & position, double rotation, double scale); + void set_parent(const GameObject & parent); template T & add_component(Args &&... args); diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp index a80aff3..9c9bb06 100644 --- a/src/crepe/api/Transform.cpp +++ b/src/crepe/api/Transform.cpp @@ -8,11 +8,10 @@ using namespace crepe; -Transform::Transform(uint32_t game_id, 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(); } -int Transform::get_instances_max() const { return 1; } diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h index f918115..557061b 100644 --- a/src/crepe/api/Transform.h +++ b/src/crepe/api/Transform.h @@ -14,9 +14,9 @@ class Transform : public Component { // works similar (or the same) as those found in GLSL? public: - Transform(uint32_t id, Point, double, double); + Transform(uint32_t id, const Point &, double, double); ~Transform(); - int get_instances_max() const; + virtual int get_instances_max() const { return 1; } //! Translation (shift) Point position; //! Rotation, in radians diff --git a/src/example/ecs.cpp b/src/example/ecs.cpp index eb5eeba..6f9752e 100644 --- a/src/example/ecs.cpp +++ b/src/example/ecs.cpp @@ -12,16 +12,16 @@ int main() { // Create a few GameObjects try { GameObject body(0, "body", "person", Point{0, 0}, 0, 1); - GameObject rightLeg(1, "rightLeg", "person", Point{1, 1}, 0, 1); - GameObject leftLeg(2, "leftLeg", "person", Point{1, 1}, 0, 1); - GameObject rightFoot(3, "rightFoot", "person", Point{2, 2}, 0, 1); - GameObject leftFoot(4, "leftFoot", "person", Point{2, 2}, 0, 1); + GameObject right_leg(1, "rightLeg", "person", Point{1, 1}, 0, 1); + GameObject left_leg(2, "leftLeg", "person", Point{1, 1}, 0, 1); + GameObject right_foot(3, "rightFoot", "person", Point{2, 2}, 0, 1); + GameObject left_foot(4, "leftFoot", "person", Point{2, 2}, 0, 1); // Set the parent of each GameObject - rightFoot.set_parent(rightLeg); - leftFoot.set_parent(leftLeg); - rightLeg.set_parent(body); - leftLeg.set_parent(body); + right_foot.set_parent(right_leg); + left_foot.set_parent(left_leg); + right_leg.set_parent(body); + left_leg.set_parent(body); // Adding a second Transform component is not allowed and will invoke an exception body.add_component(Point{10, 10}, 0, 1); diff --git a/src/example/rendering.cpp b/src/example/rendering.cpp index f3d8a7d..3fe43d6 100644 --- a/src/example/rendering.cpp +++ b/src/example/rendering.cpp @@ -17,7 +17,6 @@ using namespace std; using namespace crepe; int main() { - dbg_trace(); auto obj = GameObject(0, "name", "tag", Point{0, 0}, 1, 1); -- cgit v1.2.3 From 452944cd6dc666a58f5f8441b6cde0aaf8cc48aa Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 09:56:59 +0100 Subject: Make format --- src/crepe/Component.cpp | 1 - src/crepe/Metadata.cpp | 4 ++-- src/crepe/Metadata.h | 3 ++- src/crepe/api/GameObject.cpp | 11 +++++++---- src/crepe/api/GameObject.h | 3 ++- src/crepe/api/Transform.cpp | 4 ++-- 6 files changed, 15 insertions(+), 11 deletions(-) (limited to 'src/crepe/api') 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(this->id, position, rotation, scale); mgr.add_component(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> this_metadata = mgr.get_components_by_id(this->id); + vector> this_metadata + = 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); + vector> parent_metadata + = 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 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 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(); } - -- cgit v1.2.3 From 2fce3e3985302544827f6bf4dcc3a46cae3f2fd1 Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 10:06:15 +0100 Subject: Used const references instead of pass by value --- src/crepe/api/Scene.cpp | 2 +- src/crepe/api/Scene.h | 2 +- src/crepe/api/SceneManager.cpp | 3 ++- src/crepe/api/SceneManager.h | 4 ++-- src/crepe/api/SceneManager.hpp | 9 +++++---- 5 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/Scene.cpp b/src/crepe/api/Scene.cpp index 092dc62..933edf4 100644 --- a/src/crepe/api/Scene.cpp +++ b/src/crepe/api/Scene.cpp @@ -2,4 +2,4 @@ using namespace crepe; -Scene::Scene(std::string name) : name(name) {} +Scene::Scene(const std::string & name) : name(name) {} diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h index 8bb487a..f8bcc3d 100644 --- a/src/crepe/api/Scene.h +++ b/src/crepe/api/Scene.h @@ -6,7 +6,7 @@ namespace crepe { class Scene { public: - Scene(std::string name); + Scene(const std::string & name); virtual ~Scene() = default; virtual void load_scene() = 0; diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp index c8061c9..6fc8f9b 100644 --- a/src/crepe/api/SceneManager.cpp +++ b/src/crepe/api/SceneManager.cpp @@ -3,6 +3,7 @@ #include "SceneManager.h" using namespace crepe; +using namespace std; SceneManager::SceneManager() {} @@ -12,7 +13,7 @@ SceneManager & SceneManager::get_instance() { } // Push the next scene onto the queue -void SceneManager::load_scene(std::string name) { next_scene.push(name); } +void SceneManager::load_scene(const std::string & name) { next_scene.push(name); } // Load a new scene from the queue (if there is one) void SceneManager::empty_queue() { diff --git a/src/crepe/api/SceneManager.h b/src/crepe/api/SceneManager.h index 87db8d7..b7d5150 100644 --- a/src/crepe/api/SceneManager.h +++ b/src/crepe/api/SceneManager.h @@ -19,8 +19,8 @@ public: public: template - void add_scene(std::string name); - void load_scene(std::string name); + void add_scene(const std::string & name); + void load_scene(const std::string & name); void empty_queue(); private: diff --git a/src/crepe/api/SceneManager.hpp b/src/crepe/api/SceneManager.hpp index 7789823..82787ed 100644 --- a/src/crepe/api/SceneManager.hpp +++ b/src/crepe/api/SceneManager.hpp @@ -1,11 +1,12 @@ #include "SceneManager.h" -using namespace crepe; -using namespace std; +namespace crepe { // Add a new concrete scene to the scene manager template -void SceneManager::add_scene(string name) { - static_assert(is_base_of::value, "T must be derived from Scene"); +void SceneManager::add_scene(const std::string & name) { + static_assert(std::is_base_of::value, "T must be derived from Scene"); scenes.emplace_back(make_unique(name)); } + +} // namespace crepe -- cgit v1.2.3 From cd7f08320990f1a37e2d012b7e3ae3761c5a7267 Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 10:21:39 +0100 Subject: Renamed methods and replaced the queue with a simple string --- src/crepe/api/SceneManager.cpp | 17 ++++++++--------- src/crepe/api/SceneManager.h | 6 +++--- src/crepe/api/SceneManager.hpp | 8 +++++++- src/example/scene_manager.cpp | 8 ++++---- 4 files changed, 22 insertions(+), 17 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp index 6fc8f9b..08f036d 100644 --- a/src/crepe/api/SceneManager.cpp +++ b/src/crepe/api/SceneManager.cpp @@ -12,17 +12,16 @@ SceneManager & SceneManager::get_instance() { return instance; } -// Push the next scene onto the queue -void SceneManager::load_scene(const std::string & name) { next_scene.push(name); } - -// Load a new scene from the queue (if there is one) -void SceneManager::empty_queue() { - while (!next_scene.empty()) { - string name = next_scene.front(); - next_scene.pop(); +// Set the next scene (this scene will be loaded at the end of the frame) +void SceneManager::set_next_scene(const std::string & name) { + next_scene = name; +} +// Load a new scene (if there is one) +void SceneManager::load_next_scene() { + if (!next_scene.empty()) { for (auto & scene : scenes) { - if (scene->name == name) { + if (scene->name == next_scene) { // Delete all components of the current scene ComponentManager & mgr = ComponentManager::get_instance(); mgr.delete_all_components(); diff --git a/src/crepe/api/SceneManager.h b/src/crepe/api/SceneManager.h index b7d5150..eaf1ba1 100644 --- a/src/crepe/api/SceneManager.h +++ b/src/crepe/api/SceneManager.h @@ -20,15 +20,15 @@ public: public: template void add_scene(const std::string & name); - void load_scene(const std::string & name); - void empty_queue(); + void set_next_scene(const std::string & name); + void load_next_scene(); private: SceneManager(); private: std::vector> scenes; - std::queue next_scene; + std::string next_scene; }; } // namespace crepe diff --git a/src/crepe/api/SceneManager.hpp b/src/crepe/api/SceneManager.hpp index 82787ed..e2ba2da 100644 --- a/src/crepe/api/SceneManager.hpp +++ b/src/crepe/api/SceneManager.hpp @@ -5,8 +5,14 @@ namespace crepe { // Add a new concrete scene to the scene manager template void SceneManager::add_scene(const std::string & name) { - static_assert(std::is_base_of::value, "T must be derived from Scene"); + static_assert(std::is_base_of::value, + "T must be derived from Scene"); scenes.emplace_back(make_unique(name)); + + // The first scene added, is the one that will be loaded at the beginning + if (next_scene.empty()) { + next_scene = name; + } } } // namespace crepe diff --git a/src/example/scene_manager.cpp b/src/example/scene_manager.cpp index f1fe86a..9d832eb 100644 --- a/src/example/scene_manager.cpp +++ b/src/example/scene_manager.cpp @@ -40,9 +40,9 @@ int main() { scene_mgr.add_scene("scene2"); // Load scene1 to the queue - scene_mgr.load_scene("scene1"); + scene_mgr.set_next_scene("scene1"); // Empty the queue (now scene1 is loaded) - scene_mgr.empty_queue(); + scene_mgr.load_next_scene(); // Get the Metadata components of each GameObject of Scene1 ComponentManager & component_mgr = ComponentManager::get_instance(); @@ -57,9 +57,9 @@ int main() { } // Load scene2 to the queue - scene_mgr.load_scene("scene2"); + scene_mgr.set_next_scene("scene2"); // Empty the queue (now scene2 is loaded) - scene_mgr.empty_queue(); + scene_mgr.load_next_scene(); // Get the Metadata components of each GameObject of Scene2 metadata = component_mgr.get_components_by_type(); -- cgit v1.2.3 From b2dea4e5f127e78fe9ff67e2504b8943085fe3b1 Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 10:38:49 +0100 Subject: Make format --- src/crepe/Component.cpp | 1 - src/crepe/Metadata.cpp | 4 ++-- src/crepe/Metadata.h | 3 ++- src/crepe/api/GameObject.cpp | 11 +++++++---- src/crepe/api/GameObject.h | 3 ++- src/crepe/api/Transform.cpp | 4 ++-- 6 files changed, 15 insertions(+), 11 deletions(-) (limited to 'src/crepe/api') 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(this->id, position, rotation, scale); mgr.add_component(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> this_metadata = mgr.get_components_by_id(this->id); + vector> this_metadata + = 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); + vector> parent_metadata + = 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 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 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(); } - -- cgit v1.2.3 From 64ca0a7ae147c7d98ff092e04d86468ace6ea2a1 Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 14:01:27 +0100 Subject: Added public --- src/crepe/api/AudioSource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h index 42add50..1e24ae8 100644 --- a/src/crepe/api/AudioSource.h +++ b/src/crepe/api/AudioSource.h @@ -10,7 +10,7 @@ namespace crepe { class Sound; //! Audio source component -class AudioSource : Component { +class AudioSource : public Component { public: AudioSource(std::unique_ptr audio_clip); virtual ~AudioSource() = default; -- cgit v1.2.3 From db5a3668aa4b3919ee8dce7ed0872aa5707f80ff Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 14:03:34 +0100 Subject: Added Doxygen comments --- src/crepe/Component.h | 21 ++++++++++ src/crepe/ComponentManager.h | 93 +++++++++++++++++++++++++++++++++++++------- src/crepe/Metadata.h | 20 ++++++++++ src/crepe/api/GameObject.h | 41 ++++++++++++++++++- src/crepe/api/Transform.h | 25 +++++++++--- 5 files changed, 179 insertions(+), 21 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/Component.h b/src/crepe/Component.h index 40e6f49..02a4e7e 100644 --- a/src/crepe/Component.h +++ b/src/crepe/Component.h @@ -6,17 +6,38 @@ namespace crepe { class ComponentManager; +/** + * \brief Base class for all components + * + * This class is the base class for all components. It provides a common + * interface for all components. + */ class Component { protected: + //! Only the ComponentManager can create components friend class crepe::ComponentManager; + /** + * \param id The id of the GameObject this component belongs to + */ Component(uint32_t id); public: virtual ~Component() = default; + /** + * \brief Get the maximum number of instances for this component + * + * This method returns -1 by default, which means that there is no limit + * for the number of instances. Concrete components can override this method + * to set a limit. + * + * \return The maximum number of instances for this component + */ virtual int get_instances_max() const { return -1; } public: + //! The id of the GameObject this component belongs to uint32_t game_object_id; + //! Whether the component is active bool active = true; }; diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h index 2b5e1df..850aadc 100644 --- a/src/crepe/ComponentManager.h +++ b/src/crepe/ComponentManager.h @@ -10,35 +10,92 @@ namespace crepe { +/** + * \brief Manages all components + * + * This class manages all components. It provides methods to add, delete and get + * components. + */ class ComponentManager { public: - // Singleton + /** + * \brief Get the instance of the ComponentManager + * + * \return The instance of the ComponentManager + */ static ComponentManager & get_instance(); ComponentManager(const ComponentManager &) = delete; ComponentManager(ComponentManager &&) = delete; ComponentManager & operator=(const ComponentManager &) = delete; ComponentManager & operator=(ComponentManager &&) = delete; -public: - //! Add a component of a specific type + /** + * \brief Add a component to the ComponentManager + * + * This method adds a component to the ComponentManager. The component is + * created with the given arguments and added to the ComponentManager. + * + * \tparam T The type of the component + * \tparam Args The types of the arguments + * \param id The id of the GameObject this component belongs to + * \param args The arguments to create the component + * \return The created component + */ template T & add_component(uint32_t id, Args &&... args); - //! Deletes all components of a specific type and id + /** + * \brief Delete all components of a specific type and id + * + * This method deletes all components of a specific type and id. + * + * \tparam T The type of the component + * \param id The id of the GameObject this component belongs to + */ template void delete_components_by_id(uint32_t id); - //! Deletes all components of a specific type + /** + * \brief Delete all components of a specific type + * + * This method deletes all components of a specific type. + * + * \tparam T The type of the component + */ template void delete_components(); - //! Deletes all components of a specific id + /** + * \brief Delete all components of a specific id + * + * This method deletes all components of a specific id. + * + * \param id The id of the GameObject this component belongs to + */ void delete_all_components_of_id(uint32_t id); - //! Deletes all components + /** + * \brief Delete all components + * + * This method deletes all components. + */ void delete_all_components(); - - //! Get a vector<> of all components at specific type and id + /** + * \brief Get all components of a specific type and id + * + * This method gets all components of a specific type and id. + * + * \tparam T The type of the component + * \param id The id of the GameObject this component belongs to + * \return A vector of all components of the specific type and id + */ template std::vector> get_components_by_id(uint32_t id) const; - //! Get a vector<> of all components of a specific type + /** + * \brief Get all components of a specific type + * + * This method gets all components of a specific type. + * + * \tparam T The type of the component + * \return A vector of all components of the specific type + */ template std::vector> get_components_by_type() const; @@ -46,11 +103,17 @@ private: ComponentManager(); virtual ~ComponentManager(); - /* - * The std::unordered_map>>> below might seem a bit strange, let me explain this structure: - * The std::unordered_map<> has a key and value. The key is a std::type_index and the value is a std::vector. So, a new std::vector will be created for each new std::type_index. - * The first std::vector<> stores another vector<>. This first vector<> is to bind the entity's id to a component. - * The second std::vector<> stores unique_ptrs. Each component can be gathered via an unique_ptr. This second vector<> allows multiple components of the same std::type_index for one entity (id). +private: + /** + * \brief The components + * + * This unordered_map stores all components. The key is the type of the + * component and the value is a vector of vectors of unique pointers to the + * components. + * Every component type has its own vector of vectors of unique pointers to + * the components. The first vector is for the ids of the GameObjects and the + * second vector is for the components (because a GameObject might have multiple + * components). */ std::unordered_map>>> diff --git a/src/crepe/Metadata.h b/src/crepe/Metadata.h index 1577987..d52ab67 100644 --- a/src/crepe/Metadata.h +++ b/src/crepe/Metadata.h @@ -7,16 +7,36 @@ namespace crepe { +/** + * \brief Metadata component + * + * This class represents the Metadata component. It stores the name, tag, parent + * and children of a GameObject. + */ class Metadata : public Component { public: + /** + * \param game_object_id The id of the GameObject this component belongs to + * \param name The name of the GameObject + * \param tag The tag of the GameObject + */ Metadata(uint32_t game_object_id, const std::string & name, const std::string & tag); + /** + * \brief Get the maximum number of instances for this component + * + * \return The maximum number of instances for this component + */ virtual int get_instances_max() const { return 1; } public: + //! The name of the GameObject std::string name; + //! The tag of the GameObject std::string tag; + //! The id of the parent GameObject (-1 if no parent) uint32_t parent = -1; + //! The ids of the children GameObjects std::vector children; }; diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index 602f33c..246c4d4 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -7,15 +7,54 @@ namespace crepe { +/** + * \brief Represents a GameObject + * + * This class represents a GameObject. The GameObject class is only used + * as an interface for the game programmer. The actual implementation is + * done in the ComponentManager. + */ class GameObject { public: + /** + * This constructor creates a new GameObject. It creates a new + * Transform and Metadata component and adds them to the ComponentManager. + * + * \param id The id of the GameObject + * \param name The name of the GameObject + * \param tag The tag of the GameObject + * \param position The position of the GameObject + * \param rotation The rotation of the GameObject + * \param scale The scale of the GameObject + */ GameObject(uint32_t id, std::string name, std::string tag, const Point & position, double rotation, double scale); + /** + * \brief Set the parent of this GameObject + * + * This method sets the parent of this GameObject. It sets the parent + * in the Metadata component of this GameObject and adds this GameObject + * to the children list of the parent GameObject. + * + * \param parent The parent GameObject + */ void set_parent(const GameObject & parent); - + /** + * \brief Add a component to the GameObject + * + * This method adds a component to the GameObject. It forwards the + * arguments to the ComponentManager. + * + * \tparam T The type of the component + * \tparam Args The types of the arguments + * \param args The arguments to create the component + * \return The created component + */ template T & add_component(Args &&... args); +public: + //! The id of the GameObject uint32_t id; }; diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h index 557061b..02125ef 100644 --- a/src/crepe/api/Transform.h +++ b/src/crepe/api/Transform.h @@ -8,15 +8,30 @@ namespace crepe { +/** + * \brief Transform component + * + * This class represents the Transform component. It stores the position, + * rotation and scale of a GameObject. + */ class Transform : public Component { - // FIXME: What's the difference between the `Point` and `Position` - // classes/structs? How about we replace both with a universal `Vec2` that - // works similar (or the same) as those found in GLSL? - public: - Transform(uint32_t id, const Point &, double, double); + /** + * \param id The id of the GameObject this component belongs to + * \param point The position of the GameObject + * \param rot The rotation of the GameObject + * \param scale The scale of the GameObject + */ + Transform(uint32_t id, const Point & point, double rot, double scale); ~Transform(); + /** + * \brief Get the maximum number of instances for this component + * + * \return The maximum number of instances for this component + */ virtual int get_instances_max() const { return 1; } + +public: //! Translation (shift) Point position; //! Rotation, in radians -- cgit v1.2.3 From c6ce7e13c5fe802a7eba35189916023925dbfdc1 Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 14:16:55 +0100 Subject: Added comments and replaced some auto with concrete types --- src/crepe/ComponentManager.hpp | 7 +------ src/crepe/api/GameObject.cpp | 7 ++++--- src/crepe/api/GameObject.hpp | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp index e74f2e9..11c4d15 100644 --- a/src/crepe/ComponentManager.hpp +++ b/src/crepe/ComponentManager.hpp @@ -122,8 +122,6 @@ ComponentManager::get_components_by_type() const { // Create an empty vector<> vector> component_vector; - // Set the id to 0 (the id will also be stored in the returned vector<>) - // uint32_t id = 0; // Find the type (in the unordered_map<>) if (components.find(type) == components.end()) return component_vector; @@ -142,12 +140,9 @@ ComponentManager::get_components_by_type() const { // Ensure that the cast was successful if (casted_component == nullptr) continue; - // Pair the dereferenced raw pointer and the id and add it to the vector<> + // Add the dereferenced raw pointer to the vector<> component_vector.emplace_back(ref(*casted_component)); } - - // Increase the id (the id will also be stored in the returned vector<>) - //++id; } // Return the vector<> diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index 51cd08f..ffc9510 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -9,20 +9,21 @@ using namespace std; GameObject::GameObject(uint32_t id, std::string name, std::string tag, const Point & position, double rotation, double scale) : 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); } void GameObject::set_parent(const GameObject & parent) { - auto & mgr = ComponentManager::get_instance(); + ComponentManager & mgr = ComponentManager::get_instance(); - // set parent on own Metadata component + // Set parent on own Metadata component vector> this_metadata = 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 + // 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); diff --git a/src/crepe/api/GameObject.hpp b/src/crepe/api/GameObject.hpp index 77cf40e..bfba7fe 100644 --- a/src/crepe/api/GameObject.hpp +++ b/src/crepe/api/GameObject.hpp @@ -8,7 +8,7 @@ namespace crepe { template T & GameObject::add_component(Args &&... args) { - auto & mgr = ComponentManager::get_instance(); + ComponentManager & mgr = ComponentManager::get_instance(); return mgr.add_component(this->id, std::forward(args)...); } -- cgit v1.2.3 From 254fe777c9e2ed4a6b8e061c12ac350065d979fe Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 14:32:19 +0100 Subject: Changed include to incomplete decleration --- src/crepe/api/GameObject.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index 246c4d4..13aa681 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -3,10 +3,10 @@ #include #include -#include "api/Point.h" - namespace crepe { +class Point; + /** * \brief Represents a GameObject * -- cgit v1.2.3 From 438e87f038b52c3e985d9acc999c610ba5397e54 Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 14:32:39 +0100 Subject: Removed two unnecessary includes --- src/crepe/api/Transform.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp index 1d8d401..5274b01 100644 --- a/src/crepe/api/Transform.cpp +++ b/src/crepe/api/Transform.cpp @@ -1,9 +1,7 @@ #include -#include "api/Point.h" #include "util/log.h" -#include "Component.h" #include "Transform.h" using namespace crepe; -- cgit v1.2.3 From 3617f5c22621be4780bb30021b920fd72189b72b Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 14:45:01 +0100 Subject: Made std::string const reference (instead of copy by value) --- src/crepe/api/GameObject.cpp | 5 +++-- src/crepe/api/GameObject.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index ffc9510..b24b980 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -6,8 +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) +GameObject::GameObject(uint32_t id, const std::string & name, + const std::string & tag, const Point & position, + double rotation, double scale) : id(id) { // Add Transform and Metadata components ComponentManager & mgr = ComponentManager::get_instance(); diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index 13aa681..2a82258 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -27,7 +27,7 @@ public: * \param rotation The rotation of the GameObject * \param scale The scale of the GameObject */ - GameObject(uint32_t id, std::string name, std::string tag, + GameObject(uint32_t id, const std::string & name, const std::string & tag, const Point & position, double rotation, double scale); /** * \brief Set the parent of this GameObject -- cgit v1.2.3 From 6296b85846b21083e4f545b209f1d9edce2b06f9 Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 6 Nov 2024 15:20:25 +0100 Subject: Moved Matadata to api folder (because it may be used by the game programmer) --- src/crepe/CMakeLists.txt | 2 -- src/crepe/Metadata.cpp | 8 -------- src/crepe/Metadata.h | 43 ------------------------------------------- src/crepe/api/CMakeLists.txt | 2 ++ src/crepe/api/Metadata.cpp | 8 ++++++++ src/crepe/api/Metadata.h | 43 +++++++++++++++++++++++++++++++++++++++++++ src/example/ecs.cpp | 2 +- src/makefile | 4 ++-- 8 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 src/crepe/Metadata.cpp delete mode 100644 src/crepe/Metadata.h create mode 100644 src/crepe/api/Metadata.cpp create mode 100644 src/crepe/api/Metadata.h (limited to 'src/crepe/api') diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt index 867329f..8830e05 100644 --- a/src/crepe/CMakeLists.txt +++ b/src/crepe/CMakeLists.txt @@ -4,7 +4,6 @@ target_sources(crepe PUBLIC ComponentManager.cpp Component.cpp Collider.cpp - Metadata.cpp ) target_sources(crepe PUBLIC FILE_SET HEADERS FILES @@ -13,7 +12,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES ComponentManager.hpp Component.h Collider.h - Metadata.h ) add_subdirectory(api) diff --git a/src/crepe/Metadata.cpp b/src/crepe/Metadata.cpp deleted file mode 100644 index 53d93da..0000000 --- a/src/crepe/Metadata.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "Metadata.h" - -using namespace crepe; -using namespace std; - -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 deleted file mode 100644 index d52ab67..0000000 --- a/src/crepe/Metadata.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include -#include - -#include "Component.h" - -namespace crepe { - -/** - * \brief Metadata component - * - * This class represents the Metadata component. It stores the name, tag, parent - * and children of a GameObject. - */ -class Metadata : public Component { -public: - /** - * \param game_object_id The id of the GameObject this component belongs to - * \param name The name of the GameObject - * \param tag The tag of the GameObject - */ - Metadata(uint32_t game_object_id, const std::string & name, - const std::string & tag); - /** - * \brief Get the maximum number of instances for this component - * - * \return The maximum number of instances for this component - */ - virtual int get_instances_max() const { return 1; } - -public: - //! The name of the GameObject - std::string name; - //! The tag of the GameObject - std::string tag; - //! The id of the parent GameObject (-1 if no parent) - uint32_t parent = -1; - //! The ids of the children GameObjects - std::vector children; -}; - -} // namespace crepe diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt index 0bb1263..3e0c044 100644 --- a/src/crepe/api/CMakeLists.txt +++ b/src/crepe/api/CMakeLists.txt @@ -11,6 +11,7 @@ target_sources(crepe PUBLIC Texture.cpp AssetManager.cpp Sprite.cpp + Metadata.cpp ) target_sources(crepe PUBLIC FILE_SET HEADERS FILES @@ -28,4 +29,5 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES Texture.h AssetManager.h AssetManager.hpp + Metadata.h ) diff --git a/src/crepe/api/Metadata.cpp b/src/crepe/api/Metadata.cpp new file mode 100644 index 0000000..53d93da --- /dev/null +++ b/src/crepe/api/Metadata.cpp @@ -0,0 +1,8 @@ +#include "Metadata.h" + +using namespace crepe; +using namespace std; + +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/api/Metadata.h b/src/crepe/api/Metadata.h new file mode 100644 index 0000000..4d37108 --- /dev/null +++ b/src/crepe/api/Metadata.h @@ -0,0 +1,43 @@ +#pragma once + +#include +#include + +#include "../Component.h" + +namespace crepe { + +/** + * \brief Metadata component + * + * This class represents the Metadata component. It stores the name, tag, parent + * and children of a GameObject. + */ +class Metadata : public Component { +public: + /** + * \param game_object_id The id of the GameObject this component belongs to + * \param name The name of the GameObject + * \param tag The tag of the GameObject + */ + Metadata(uint32_t game_object_id, const std::string & name, + const std::string & tag); + /** + * \brief Get the maximum number of instances for this component + * + * \return The maximum number of instances for this component + */ + virtual int get_instances_max() const { return 1; } + +public: + //! The name of the GameObject + std::string name; + //! The tag of the GameObject + std::string tag; + //! The id of the parent GameObject (-1 if no parent) + uint32_t parent = -1; + //! The ids of the children GameObjects + std::vector children; +}; + +} // namespace crepe diff --git a/src/example/ecs.cpp b/src/example/ecs.cpp index 6f9752e..a8df7e7 100644 --- a/src/example/ecs.cpp +++ b/src/example/ecs.cpp @@ -1,8 +1,8 @@ #include #include "../crepe/ComponentManager.h" -#include "../crepe/Metadata.h" #include "../crepe/api/GameObject.h" +#include "../crepe/api/Metadata.h" #include "../crepe/api/Transform.h" using namespace crepe; diff --git a/src/makefile b/src/makefile index 9b2d826..be1548c 100644 --- a/src/makefile +++ b/src/makefile @@ -24,8 +24,8 @@ MAX += crepe/Component.h MAX += crepe/ComponentManager.cpp MAX += crepe/ComponentManager.h MAX += crepe/ComponentManager.hpp -MAX += crepe/Metadata.cpp -MAX += crepe/Metadata.h +MAX += crepe/api/Metadata.cpp +MAX += crepe/api/Metadata.h TODO += crepe/Particle.cpp TODO += crepe/Particle.h TODO += crepe/Position.h -- cgit v1.2.3 From 3a5201961ce31d415042c6273d03e46aed7e6eb8 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 6 Nov 2024 18:38:45 +0100 Subject: fix code standard and merge #19 --- src/crepe/api/SceneManager.cpp | 41 +++++++++++++++++++++++++---------------- src/crepe/api/SceneManager.h | 16 +++++++++++++++- src/crepe/api/SceneManager.hpp | 2 +- 3 files changed, 41 insertions(+), 18 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp index 08f036d..57ec302 100644 --- a/src/crepe/api/SceneManager.cpp +++ b/src/crepe/api/SceneManager.cpp @@ -1,3 +1,6 @@ +#include +#include + #include "../ComponentManager.h" #include "SceneManager.h" @@ -5,30 +8,36 @@ using namespace crepe; using namespace std; -SceneManager::SceneManager() {} - SceneManager & SceneManager::get_instance() { static SceneManager instance; return instance; } -// Set the next scene (this scene will be loaded at the end of the frame) -void SceneManager::set_next_scene(const std::string & name) { +void SceneManager::set_next_scene(const string & name) { next_scene = name; } -// Load a new scene (if there is one) void SceneManager::load_next_scene() { - if (!next_scene.empty()) { - for (auto & scene : scenes) { - if (scene->name == next_scene) { - // Delete all components of the current scene - ComponentManager & mgr = ComponentManager::get_instance(); - mgr.delete_all_components(); - // Load the new scene - scene->load_scene(); - break; - } + // next scene not set + if (this->next_scene.empty()) + return; + + auto it = find_if(this->scenes.begin(), this->scenes.end(), + [&next_scene = this->next_scene] (unique_ptr & scene) { + return scene->name == next_scene; } - } + ); + + // next scene not found + if (it == this->scenes.end()) + return; + unique_ptr & scene = *it; + + // Delete all components of the current scene + ComponentManager & mgr = ComponentManager::get_instance(); + mgr.delete_all_components(); + + // Load the new scene + scene->load_scene(); } + diff --git a/src/crepe/api/SceneManager.h b/src/crepe/api/SceneManager.h index eaf1ba1..1e0e670 100644 --- a/src/crepe/api/SceneManager.h +++ b/src/crepe/api/SceneManager.h @@ -18,13 +18,27 @@ public: SceneManager & operator=(SceneManager &&) = delete; public: + /** + * \brief Add a new concrete scene to the scene manager + * + * \tparam T Type of concrete scene + * \param name Name of new scene + */ template void add_scene(const std::string & name); + /** + * \brief Set the next scene + * + * This scene will be loaded at the end of the frame + * + * \param name Name of the next scene + */ void set_next_scene(const std::string & name); + //! Load a new scene (if there is one) void load_next_scene(); private: - SceneManager(); + SceneManager() = default; private: std::vector> scenes; diff --git a/src/crepe/api/SceneManager.hpp b/src/crepe/api/SceneManager.hpp index e2ba2da..8bad7b2 100644 --- a/src/crepe/api/SceneManager.hpp +++ b/src/crepe/api/SceneManager.hpp @@ -2,11 +2,11 @@ namespace crepe { -// Add a new concrete scene to the scene manager template void SceneManager::add_scene(const std::string & name) { static_assert(std::is_base_of::value, "T must be derived from Scene"); + scenes.emplace_back(make_unique(name)); // The first scene added, is the one that will be loaded at the beginning -- cgit v1.2.3 From 54f4a322e939dcdb62ab9fbf919bf8cb4b6f7b75 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 7 Nov 2024 10:46:46 +0100 Subject: fix script example segmentation fault --- src/crepe/ComponentManager.hpp | 14 +++++++++----- src/crepe/api/BehaviorScript.h | 5 +---- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp index e74f2e9..89ed111 100644 --- a/src/crepe/ComponentManager.hpp +++ b/src/crepe/ComponentManager.hpp @@ -30,12 +30,16 @@ T & ComponentManager::add_component(uint32_t id, Args &&... args) { // Create a new component of type T (arguments directly forwarded). The // constructor must be called by ComponentManager. - T * instance_pointer = new T(id, forward(args)...); - unique_ptr instance = unique_ptr(instance_pointer); + T * instance_ptr = new T(id, forward(args)...); + if (instance_ptr == nullptr) + throw std::bad_alloc(); + + T & instance_ref = *instance_ptr; + unique_ptr instance = unique_ptr(instance_ptr); // Check if the vector size is not greater than get_instances_max - if (instance->get_instances_max() != -1 - && components[type][id].size() >= instance->get_instances_max()) { + int max_instances = instance->get_instances_max(); + if (max_instances != -1 && components[type][id].size() >= max_instances) { // TODO: Exception throw std::runtime_error( "Exceeded maximum number of instances for this component type"); @@ -44,7 +48,7 @@ T & ComponentManager::add_component(uint32_t id, Args &&... args) { // store its unique_ptr in the vector<> components[type][id].push_back(std::move(instance)); - return *instance; + return instance_ref; } template diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h index 21638f4..6b1fec7 100644 --- a/src/crepe/api/BehaviorScript.h +++ b/src/crepe/api/BehaviorScript.h @@ -5,12 +5,9 @@ #include "../Component.h" namespace crepe { + class ScriptSystem; class ComponentManager; -} // namespace crepe - -namespace crepe { - class Script; class BehaviorScript : public Component { -- cgit v1.2.3 From cd0940f72e1e0d4abb0bc1ef5fb481b389a1f77a Mon Sep 17 00:00:00 2001 From: max-001 Date: Thu, 7 Nov 2024 12:25:17 +0100 Subject: Removed destructor --- src/crepe/api/Transform.cpp | 2 -- src/crepe/api/Transform.h | 1 - 2 files changed, 3 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp index 5274b01..be1769e 100644 --- a/src/crepe/api/Transform.cpp +++ b/src/crepe/api/Transform.cpp @@ -11,5 +11,3 @@ Transform::Transform(uint32_t game_id, const Point & point, double rot, : Component(game_id), position(point), rotation(rot), scale(scale) { dbg_trace(); } - -Transform::~Transform() { dbg_trace(); } diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h index 02125ef..69ea48f 100644 --- a/src/crepe/api/Transform.h +++ b/src/crepe/api/Transform.h @@ -23,7 +23,6 @@ public: * \param scale The scale of the GameObject */ Transform(uint32_t id, const Point & point, double rot, double scale); - ~Transform(); /** * \brief Get the maximum number of instances for this component * -- 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/api') 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 acbe6b5d4256db950827b120fe7cd781e45715f6 Mon Sep 17 00:00:00 2001 From: max-001 Date: Thu, 7 Nov 2024 12:36:08 +0100 Subject: Made name and tag const --- src/crepe/api/Metadata.cpp | 2 +- src/crepe/api/Metadata.h | 4 ++-- src/example/ecs.cpp | 4 ++-- src/example/scene_manager.cpp | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/Metadata.cpp b/src/crepe/api/Metadata.cpp index 53d93da..55d9ae2 100644 --- a/src/crepe/api/Metadata.cpp +++ b/src/crepe/api/Metadata.cpp @@ -5,4 +5,4 @@ using namespace std; Metadata::Metadata(uint32_t game_object_id, const string & name, const string & tag) - : Component(game_object_id), name(name), tag(tag) {} + : Component(game_object_id), NAME(name), TAG(tag) {} diff --git a/src/crepe/api/Metadata.h b/src/crepe/api/Metadata.h index 4d37108..fdbed41 100644 --- a/src/crepe/api/Metadata.h +++ b/src/crepe/api/Metadata.h @@ -31,9 +31,9 @@ public: public: //! The name of the GameObject - std::string name; + const std::string NAME; //! The tag of the GameObject - std::string tag; + const std::string TAG; //! The id of the parent GameObject (-1 if no parent) uint32_t parent = -1; //! The ids of the children GameObjects diff --git a/src/example/ecs.cpp b/src/example/ecs.cpp index dfd3595..7593faf 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 << " "; diff --git a/src/example/scene_manager.cpp b/src/example/scene_manager.cpp index 471c400..bfa9479 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 From d7b17796943e2cc09bf4de853a9c1a19d3cb6786 Mon Sep 17 00:00:00 2001 From: max-001 Date: Thu, 7 Nov 2024 12:37:28 +0100 Subject: Made id const --- src/crepe/api/GameObject.cpp | 14 +++++++------- src/crepe/api/GameObject.h | 2 +- src/crepe/api/GameObject.hpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/crepe/api') 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(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 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 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 -- cgit v1.2.3 From b4834c99c1afced63ee0c266b38925b95782bdf6 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 7 Nov 2024 13:32:48 +0100 Subject: merge #20 --- src/crepe/ComponentManager.hpp | 3 +-- src/crepe/api/SceneManager.cpp | 21 ++++++++------------- 2 files changed, 9 insertions(+), 15 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp index 489e188..cf9f65a 100644 --- a/src/crepe/ComponentManager.hpp +++ b/src/crepe/ComponentManager.hpp @@ -31,8 +31,7 @@ T & ComponentManager::add_component(uint32_t id, Args &&... args) { // Create a new component of type T (arguments directly forwarded). The // constructor must be called by ComponentManager. T * instance_ptr = new T(id, forward(args)...); - if (instance_ptr == nullptr) - throw std::bad_alloc(); + if (instance_ptr == nullptr) throw std::bad_alloc(); T & instance_ref = *instance_ptr; unique_ptr instance = unique_ptr(instance_ptr); diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp index 57ec302..dfed6ee 100644 --- a/src/crepe/api/SceneManager.cpp +++ b/src/crepe/api/SceneManager.cpp @@ -13,24 +13,20 @@ SceneManager & SceneManager::get_instance() { return instance; } -void SceneManager::set_next_scene(const string & name) { - next_scene = name; -} +void SceneManager::set_next_scene(const string & name) { next_scene = name; } void SceneManager::load_next_scene() { // next scene not set - if (this->next_scene.empty()) - return; + if (this->next_scene.empty()) return; - auto it = find_if(this->scenes.begin(), this->scenes.end(), - [&next_scene = this->next_scene] (unique_ptr & scene) { - return scene->name == next_scene; - } - ); + auto it + = find_if(this->scenes.begin(), this->scenes.end(), + [&next_scene = this->next_scene](unique_ptr & scene) { + return scene->name == next_scene; + }); // next scene not found - if (it == this->scenes.end()) - return; + if (it == this->scenes.end()) return; unique_ptr & scene = *it; // Delete all components of the current scene @@ -40,4 +36,3 @@ void SceneManager::load_next_scene() { // Load the new scene scene->load_scene(); } - -- cgit v1.2.3 From be58cc9342a775c21ec2ee28923414a5c612fe6e Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 7 Nov 2024 15:27:28 +0100 Subject: add game_object_id_t type --- src/crepe/Collider.cpp | 2 +- src/crepe/Collider.h | 2 +- src/crepe/Component.cpp | 3 ++- src/crepe/Component.h | 6 ++++-- src/crepe/ComponentManager.cpp | 2 +- src/crepe/ComponentManager.h | 8 ++++---- src/crepe/ComponentManager.hpp | 7 ++++--- src/crepe/api/CircleCollider.h | 2 +- src/crepe/api/Force.cpp | 3 +-- src/crepe/api/Force.h | 2 +- src/crepe/api/GameObject.cpp | 2 +- src/crepe/api/GameObject.h | 6 ++++-- src/crepe/api/Metadata.cpp | 5 ++--- src/crepe/api/Metadata.h | 6 +++--- src/crepe/api/ParticleEmitter.cpp | 4 ++-- src/crepe/api/ParticleEmitter.h | 2 +- src/crepe/api/Rigidbody.cpp | 4 ++-- src/crepe/api/Rigidbody.h | 3 +-- src/crepe/api/Sprite.cpp | 2 +- src/crepe/api/Sprite.h | 3 +-- src/crepe/api/Transform.cpp | 4 ++-- src/crepe/api/Transform.h | 4 +--- src/crepe/types.h | 10 ++++++++++ 23 files changed, 51 insertions(+), 41 deletions(-) create mode 100644 src/crepe/types.h (limited to 'src/crepe/api') diff --git a/src/crepe/Collider.cpp b/src/crepe/Collider.cpp index 13a3f33..bbec488 100644 --- a/src/crepe/Collider.cpp +++ b/src/crepe/Collider.cpp @@ -2,4 +2,4 @@ using namespace crepe; -Collider::Collider(uint32_t gameObjectId) : Component(gameObjectId) {} +Collider::Collider(game_object_id_t id) : Component(id) {} diff --git a/src/crepe/Collider.h b/src/crepe/Collider.h index 68a7d1d..827f83d 100644 --- a/src/crepe/Collider.h +++ b/src/crepe/Collider.h @@ -6,7 +6,7 @@ namespace crepe { class Collider : public Component { public: - Collider(uint32_t game_object_id); + Collider(game_object_id_t id); int size; }; diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp index cdbda67..af439ed 100644 --- a/src/crepe/Component.cpp +++ b/src/crepe/Component.cpp @@ -1,5 +1,6 @@ #include "Component.h" +#include "types.h" using namespace crepe; -Component::Component(uint32_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 41badc3..ee795f4 100644 --- a/src/crepe/Component.h +++ b/src/crepe/Component.h @@ -1,5 +1,7 @@ #pragma once +#include "types.h" + #include namespace crepe { @@ -19,7 +21,7 @@ protected: /** * \param id The id of the GameObject this component belongs to */ - Component(uint32_t id); + Component(game_object_id_t id); public: virtual ~Component() = default; @@ -36,7 +38,7 @@ public: public: //! The id of the GameObject this component belongs to - const uint32_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/ComponentManager.cpp b/src/crepe/ComponentManager.cpp index 01bc8d7..85149c8 100644 --- a/src/crepe/ComponentManager.cpp +++ b/src/crepe/ComponentManager.cpp @@ -9,7 +9,7 @@ ComponentManager & ComponentManager::get_instance() { return instance; } -void ComponentManager::delete_all_components_of_id(uint32_t id) { +void ComponentManager::delete_all_components_of_id(game_object_id_t id) { // Loop through all the types (in the unordered_map<>) for (auto & [type, componentArray] : this->components) { // Make sure that the id (that we are looking for) is within the boundaries of the vector<> diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h index f3b0ace..c8c196c 100644 --- a/src/crepe/ComponentManager.h +++ b/src/crepe/ComponentManager.h @@ -43,7 +43,7 @@ public: * \return The created component */ template - T & add_component(uint32_t id, Args &&... args); + T & add_component(game_object_id_t id, Args &&... args); /** * \brief Delete all components of a specific type and id * @@ -53,7 +53,7 @@ public: * \param id The id of the GameObject this component belongs to */ template - void delete_components_by_id(uint32_t id); + void delete_components_by_id(game_object_id_t id); /** * \brief Delete all components of a specific type * @@ -70,7 +70,7 @@ public: * * \param id The id of the GameObject this component belongs to */ - void delete_all_components_of_id(uint32_t id); + void delete_all_components_of_id(game_object_id_t id); /** * \brief Delete all components * @@ -88,7 +88,7 @@ public: */ template std::vector> - get_components_by_id(uint32_t id) const; + get_components_by_id(game_object_id_t id) const; /** * \brief Get all components of a specific type * diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp index cf9f65a..98efb49 100644 --- a/src/crepe/ComponentManager.hpp +++ b/src/crepe/ComponentManager.hpp @@ -3,11 +3,12 @@ #include #include "ComponentManager.h" +#include "types.h" namespace crepe { template -T & ComponentManager::add_component(uint32_t id, Args &&... args) { +T & ComponentManager::add_component(game_object_id_t id, Args &&... args) { using namespace std; static_assert(is_base_of::value, @@ -51,7 +52,7 @@ T & ComponentManager::add_component(uint32_t id, Args &&... args) { } template -void ComponentManager::delete_components_by_id(uint32_t id) { +void ComponentManager::delete_components_by_id(game_object_id_t id) { using namespace std; // Determine the type of T (this is used as the key of the unordered_map<>) @@ -83,7 +84,7 @@ void ComponentManager::delete_components() { template std::vector> -ComponentManager::get_components_by_id(uint32_t id) const { +ComponentManager::get_components_by_id(game_object_id_t id) const { using namespace std; // Determine the type of T (this is used as the key of the unordered_map<>) diff --git a/src/crepe/api/CircleCollider.h b/src/crepe/api/CircleCollider.h index 931b012..caa7e43 100644 --- a/src/crepe/api/CircleCollider.h +++ b/src/crepe/api/CircleCollider.h @@ -5,7 +5,7 @@ namespace crepe { class CircleCollider : public Collider { public: - CircleCollider(uint32_t game_object_id, int radius) + CircleCollider(game_object_id_t game_object_id, int radius) : Collider(game_object_id), radius(radius) {} int radius; }; diff --git a/src/crepe/api/Force.cpp b/src/crepe/api/Force.cpp index 3c33ad3..63131ac 100644 --- a/src/crepe/api/Force.cpp +++ b/src/crepe/api/Force.cpp @@ -4,8 +4,7 @@ namespace crepe { -Force::Force(uint32_t game_object_id, uint32_t magnitude, uint32_t direction) - : Component(game_object_id) { +Force::Force(game_object_id_t id, uint32_t magnitude, uint32_t direction) : Component(id) { // TODO: A standard angle unit should be established for the entire engine // and assumed to be the default everywhere. Only conversion functions should // explicitly contain the unit (i.e. `deg_to_rad()` & `rad_to_deg()`) diff --git a/src/crepe/api/Force.h b/src/crepe/api/Force.h index c08a8b9..4a4b5de 100644 --- a/src/crepe/api/Force.h +++ b/src/crepe/api/Force.h @@ -8,7 +8,7 @@ namespace crepe { class Force : public Component { public: - Force(uint32_t game_object_id, uint32_t magnitude, uint32_t direction); + Force(game_object_id_t id, uint32_t magnitude, uint32_t direction); int32_t force_x; int32_t force_y; diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index b1b8f85..e009288 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -6,7 +6,7 @@ using namespace crepe; using namespace std; -GameObject::GameObject(uint32_t id, const std::string & name, +GameObject::GameObject(game_object_id_t id, const std::string & name, const std::string & tag, const Point & position, double rotation, double scale) : ID(id) { diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index 2992787..223d72e 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -3,6 +3,8 @@ #include #include +#include "types.h" + namespace crepe { class Point; @@ -27,7 +29,7 @@ public: * \param rotation The rotation of the GameObject * \param scale The scale of the GameObject */ - GameObject(uint32_t id, const std::string & name, const std::string & tag, + GameObject(game_object_id_t id, const std::string & name, const std::string & tag, const Point & position, double rotation, double scale); /** * \brief Set the parent of this GameObject @@ -55,7 +57,7 @@ public: public: //! The id of the GameObject - const uint32_t ID; + const game_object_id_t ID; }; } // namespace crepe diff --git a/src/crepe/api/Metadata.cpp b/src/crepe/api/Metadata.cpp index 55d9ae2..ab9612b 100644 --- a/src/crepe/api/Metadata.cpp +++ b/src/crepe/api/Metadata.cpp @@ -3,6 +3,5 @@ using namespace crepe; using namespace std; -Metadata::Metadata(uint32_t game_object_id, const string & name, - const string & tag) - : Component(game_object_id), NAME(name), TAG(tag) {} +Metadata::Metadata(game_object_id_t id, const string & name, const string & tag) + : Component(id), NAME(name), TAG(tag) {} diff --git a/src/crepe/api/Metadata.h b/src/crepe/api/Metadata.h index fdbed41..f5e5c55 100644 --- a/src/crepe/api/Metadata.h +++ b/src/crepe/api/Metadata.h @@ -20,7 +20,7 @@ public: * \param name The name of the GameObject * \param tag The tag of the GameObject */ - Metadata(uint32_t game_object_id, const std::string & name, + Metadata(game_object_id_t id, const std::string & name, const std::string & tag); /** * \brief Get the maximum number of instances for this component @@ -35,9 +35,9 @@ public: //! The tag of the GameObject const std::string TAG; //! The id of the parent GameObject (-1 if no parent) - uint32_t parent = -1; + game_object_id_t parent = -1; //! The ids of the children GameObjects - std::vector children; + std::vector children; }; } // namespace crepe diff --git a/src/crepe/api/ParticleEmitter.cpp b/src/crepe/api/ParticleEmitter.cpp index 0b3a9ee..6094732 100644 --- a/src/crepe/api/ParticleEmitter.cpp +++ b/src/crepe/api/ParticleEmitter.cpp @@ -6,12 +6,12 @@ using namespace crepe; -ParticleEmitter::ParticleEmitter(uint32_t game_object_id, +ParticleEmitter::ParticleEmitter(game_object_id_t id, uint32_t max_particles, uint32_t emission_rate, uint32_t speed, uint32_t speed_offset, uint32_t angle, uint32_t angleOffset, float begin_lifespan, float end_lifespan) - : Component(game_object_id), max_particles(max_particles), + : Component(id), max_particles(max_particles), emission_rate(emission_rate), speed(speed), speed_offset(speed_offset), position{0, 0}, begin_lifespan(begin_lifespan), end_lifespan(end_lifespan) { diff --git a/src/crepe/api/ParticleEmitter.h b/src/crepe/api/ParticleEmitter.h index 2e2e95b..5939723 100644 --- a/src/crepe/api/ParticleEmitter.h +++ b/src/crepe/api/ParticleEmitter.h @@ -10,7 +10,7 @@ namespace crepe { class ParticleEmitter : public Component { public: - ParticleEmitter(uint32_t game_object_id, uint32_t max_particles, + ParticleEmitter(game_object_id_t id, uint32_t max_particles, uint32_t emission_rate, uint32_t speed, uint32_t speed_offset, uint32_t angle, uint32_t angleOffset, float begin_lifespan, float end_lifespan); diff --git a/src/crepe/api/Rigidbody.cpp b/src/crepe/api/Rigidbody.cpp index 0a6262a..1e76346 100644 --- a/src/crepe/api/Rigidbody.cpp +++ b/src/crepe/api/Rigidbody.cpp @@ -2,7 +2,7 @@ using namespace crepe; -Rigidbody::Rigidbody(uint32_t game_object_id, int mass, int gravity_scale, +Rigidbody::Rigidbody(game_object_id_t id, int mass, int gravity_scale, BodyType bodyType) - : Component(game_object_id), mass(mass), gravity_scale(gravity_scale), + : Component(id), mass(mass), gravity_scale(gravity_scale), body_type(bodyType) {} diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h index 518ed94..02ced2e 100644 --- a/src/crepe/api/Rigidbody.h +++ b/src/crepe/api/Rigidbody.h @@ -18,8 +18,7 @@ enum class BodyType { class Rigidbody : public Component { public: - Rigidbody(uint32_t game_object_id, int mass, int gravity_scale, - BodyType body_type); + Rigidbody(game_object_id_t id, int mass, int gravity_scale, BodyType body_type); int32_t velocity_x; int32_t velocity_y; int mass; diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp index 3dd44f2..7e810b5 100644 --- a/src/crepe/api/Sprite.cpp +++ b/src/crepe/api/Sprite.cpp @@ -10,7 +10,7 @@ using namespace std; using namespace crepe; -Sprite::Sprite(uint32_t id, shared_ptr image, const Color & color, +Sprite::Sprite(game_object_id_t id, shared_ptr image, const Color & color, const FlipSettings & flip) : Component(id), color(color), flip(flip), sprite_image(image) { dbg_trace(); diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h index bdb4da9..28078cd 100644 --- a/src/crepe/api/Sprite.h +++ b/src/crepe/api/Sprite.h @@ -19,8 +19,7 @@ struct FlipSettings { class Sprite : public Component { public: - Sprite(uint32_t game_id, std::shared_ptr image, - const Color & color, const FlipSettings & flip); + Sprite(game_object_id_t id, std::shared_ptr image, const Color & color, const FlipSettings & flip); ~Sprite(); std::shared_ptr sprite_image; Color color; diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp index be1769e..5fb66b3 100644 --- a/src/crepe/api/Transform.cpp +++ b/src/crepe/api/Transform.cpp @@ -6,8 +6,8 @@ using namespace crepe; -Transform::Transform(uint32_t game_id, const Point & point, double rot, +Transform::Transform(game_object_id_t id, const Point & point, double rot, double scale) - : Component(game_id), position(point), rotation(rot), scale(scale) { + : Component(id), position(point), rotation(rot), scale(scale) { dbg_trace(); } diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h index 69ea48f..1104e99 100644 --- a/src/crepe/api/Transform.h +++ b/src/crepe/api/Transform.h @@ -1,7 +1,5 @@ #pragma once -#include - #include "api/Point.h" #include "Component.h" @@ -22,7 +20,7 @@ public: * \param rot The rotation of the GameObject * \param scale The scale of the GameObject */ - Transform(uint32_t id, const Point & point, double rot, double scale); + Transform(game_object_id_t id, const Point & point, double rot, double scale); /** * \brief Get the maximum number of instances for this component * diff --git a/src/crepe/types.h b/src/crepe/types.h new file mode 100644 index 0000000..5ae2c81 --- /dev/null +++ b/src/crepe/types.h @@ -0,0 +1,10 @@ +#pragma once + +#include + +namespace crepe { + +typedef uint32_t game_object_id_t; + +} + -- 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/api') 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 From e2f3ace383b43cc3f140629e577b97c6f69c9856 Mon Sep 17 00:00:00 2001 From: jaroWMR Date: Thu, 7 Nov 2024 18:39:56 +0100 Subject: added physics system --- src/crepe/api/CMakeLists.txt | 4 +- src/crepe/api/Config.h | 10 ++++ src/crepe/api/Force.cpp | 20 ------- src/crepe/api/Force.h | 17 ------ src/crepe/api/GameObject.cpp | 2 +- src/crepe/api/GameObject.h | 4 +- src/crepe/api/Point.h | 11 ---- src/crepe/api/Rigidbody.cpp | 16 ++++-- src/crepe/api/Rigidbody.h | 102 ++++++++++++++++++++++++++------ src/crepe/api/Transform.cpp | 2 +- src/crepe/api/Transform.h | 6 +- src/crepe/api/Vector2.cpp | 59 +++++++++++++++++++ src/crepe/api/Vector2.h | 48 ++++++++++++++++ src/crepe/system/PhysicsSystem.cpp | 102 +++++++++++++++++++++----------- src/crepe/system/PhysicsSystem.h | 17 +++++- src/example/ecs.cpp | 12 ++-- src/example/particle.cpp | 4 +- src/example/physics.cpp | 23 ++++---- src/example/rendering.cpp | 8 +-- src/example/scene_manager.cpp | 16 +++--- src/example/script.cpp | 2 +- src/makefile | 19 +++--- src/test/CMakeLists.txt | 1 + src/test/PhysicsTest.cpp | 115 +++++++++++++++++++++++++++++++++++++ 24 files changed, 464 insertions(+), 156 deletions(-) delete mode 100644 src/crepe/api/Force.cpp delete mode 100644 src/crepe/api/Force.h delete mode 100644 src/crepe/api/Point.h create mode 100644 src/crepe/api/Vector2.cpp create mode 100644 src/crepe/api/Vector2.h create mode 100644 src/test/PhysicsTest.cpp (limited to 'src/crepe/api') diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt index dbd6bf1..321343a 100644 --- a/src/crepe/api/CMakeLists.txt +++ b/src/crepe/api/CMakeLists.txt @@ -4,7 +4,6 @@ target_sources(crepe PUBLIC Script.cpp GameObject.cpp Rigidbody.cpp - Force.cpp ParticleEmitter.cpp Transform.cpp Color.cpp @@ -14,6 +13,7 @@ target_sources(crepe PUBLIC Metadata.cpp Scene.cpp SceneManager.cpp + Vector2.cpp ) target_sources(crepe PUBLIC FILE_SET HEADERS FILES @@ -26,7 +26,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES GameObject.hpp Rigidbody.h Sprite.h - Point.h + Vector2.h Color.h Texture.h AssetManager.h diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h index 22104a7..88220a7 100644 --- a/src/crepe/api/Config.h +++ b/src/crepe/api/Config.h @@ -35,6 +35,16 @@ public: */ bool color = true; } log; + + //! physics-related settings + struct { + /** + * \brief gravity value of physics system + * + * Gravity value of game. + */ + double gravity = 1; + } physics; }; } // namespace crepe diff --git a/src/crepe/api/Force.cpp b/src/crepe/api/Force.cpp deleted file mode 100644 index 63131ac..0000000 --- a/src/crepe/api/Force.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include - -#include "Force.h" - -namespace crepe { - -Force::Force(game_object_id_t id, uint32_t magnitude, uint32_t direction) : Component(id) { - // TODO: A standard angle unit should be established for the entire engine - // and assumed to be the default everywhere. Only conversion functions should - // explicitly contain the unit (i.e. `deg_to_rad()` & `rad_to_deg()`) - - // Convert direction from degrees to radians - float radian_direction = static_cast(direction) * (M_PI / 180.0f); - force_x = static_cast( - std::round(magnitude * std::cos(radian_direction))); - force_y = static_cast( - std::round(magnitude * std::sin(radian_direction))); -} - -} // namespace crepe diff --git a/src/crepe/api/Force.h b/src/crepe/api/Force.h deleted file mode 100644 index 4a4b5de..0000000 --- a/src/crepe/api/Force.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include - -#include "../Component.h" - -namespace crepe { - -class Force : public Component { -public: - Force(game_object_id_t id, uint32_t magnitude, uint32_t direction); - - int32_t force_x; - int32_t force_y; -}; - -} // namespace crepe diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp index 15330f3..d252e77 100644 --- a/src/crepe/api/GameObject.cpp +++ b/src/crepe/api/GameObject.cpp @@ -7,7 +7,7 @@ using namespace crepe; using namespace std; GameObject::GameObject(game_object_id_t id, const std::string & name, - const std::string & tag, const Point & position, + const std::string & tag, const Vector2 & position, double rotation, double scale) : id(id) { // Add Transform and Metadata components diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index 8389e6c..8dc102c 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -7,7 +7,7 @@ namespace crepe { -class Point; +class Vector2; /** * \brief Represents a GameObject @@ -30,7 +30,7 @@ public: * \param scale The scale of the GameObject */ GameObject(game_object_id_t id, const std::string & name, const std::string & tag, - const Point & position, double rotation, double scale); + const Vector2 & position, double rotation, double scale); /** * \brief Set the parent of this GameObject * diff --git a/src/crepe/api/Point.h b/src/crepe/api/Point.h deleted file mode 100644 index 575d624..0000000 --- a/src/crepe/api/Point.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -namespace crepe { - -class Point { -public: - double x; - double y; -}; - -} // namespace crepe diff --git a/src/crepe/api/Rigidbody.cpp b/src/crepe/api/Rigidbody.cpp index 1e76346..cf07b0e 100644 --- a/src/crepe/api/Rigidbody.cpp +++ b/src/crepe/api/Rigidbody.cpp @@ -2,7 +2,15 @@ using namespace crepe; -Rigidbody::Rigidbody(game_object_id_t id, int mass, int gravity_scale, - BodyType bodyType) - : Component(id), mass(mass), gravity_scale(gravity_scale), - body_type(bodyType) {} +crepe::Rigidbody::Rigidbody(uint32_t game_object_id, + const RigidbodyData & data) : + Component(game_object_id), data(data){} + +void crepe::Rigidbody::add_force_linear(const Vector2 & force) { + this->data.linear_velocity += force; +} + +void crepe::Rigidbody::add_force_angular(double force) { + this->data.angular_velocity += force; +} + diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h index 02ced2e..0c069d8 100644 --- a/src/crepe/api/Rigidbody.h +++ b/src/crepe/api/Rigidbody.h @@ -4,26 +4,96 @@ #include "../Component.h" -namespace crepe { +#include "Vector2.h" -// FIXME: can't this enum be defined inside the class declaration of Rigidbody? -enum class BodyType { - //! Does not move (e.g. walls, ground ...) - STATIC, - //! Moves and responds to forces (e.g. player, physics objects ...) - DYNAMIC, - //! Moves but does not respond to forces (e.g. moving platforms ...) - KINEMATIC, -}; +namespace crepe { +/** + * \brief Rigidbody class + * + * This class is used by the physics sytem and collision system. + * It configures how to system interact with the gameobject for movement and collisions. + */ class Rigidbody : public Component { public: - Rigidbody(game_object_id_t id, int mass, int gravity_scale, BodyType body_type); - int32_t velocity_x; - int32_t velocity_y; - int mass; - int gravity_scale; - BodyType body_type; + /** + * \brief BodyType enum + * + * This enum provides three bodytypes the physics sytem and collision system use. + */ + enum class BodyType { + //! Does not move (e.g. walls, ground ...) + STATIC, + //! Moves and responds to forces (e.g. player, physics objects ...) + DYNAMIC, + //! Moves but does not respond to forces (e.g. moving platforms ...) + KINEMATIC, + }; + /** + * \brief PhysicsConstraints to constrain movement + * + * This struct configures the movement constraint for this object. + * If a constraint is enabled the systems will not move the object. + */ + struct PhysicsConstraints { + //! X constraint + bool x = 0; + //! Y constraint + bool y = 0; + //! rotation constraint + bool rotation = 0; + }; +public: + /** + * This struct holds the data for the Rigidbody. + */ + struct RigidbodyData{ + //! objects mass + double mass = 0.0; + //! gravtiy scale + double gravity_scale = 0.0; + //! Changes if physics apply + BodyType body_type = BodyType::DYNAMIC; + //! linear velocity of object + Vector2 linear_velocity; + //! maximum linear velocity of object + Vector2 max_linear_velocity; + //! linear damping of object + Vector2 linear_damping; + //! angular velocity of object + double angular_velocity = 0.0; + //! max angular velocity of object + double max_angular_velocity = 0.0; + //! angular damping of object + double angular_damping = 0.0; + //! movements constraints of object + PhysicsConstraints constraints; + //! if gravity applies + bool use_gravity = true; + //! if object bounces + bool bounce = false; + }; +public: + /** + * \param game_object_id id of the gameobject the rigibody is added to. + * \param data struct to configure the rigidbody. + */ + Rigidbody(uint32_t game_object_id,const RigidbodyData& data); + //! struct to hold data of rigidbody + RigidbodyData data; +public: + /** + * \brief add a linear force to the Rigidbody. + * + * \param force Vector2 that is added to the linear force. + */ + void add_force_linear(const Vector2 & force); + /** + * \brief add a angular force to the Rigidbody. + * + * \param force Vector2 that is added to the angular force. + */ + void add_force_angular(double force); }; } // namespace crepe diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp index 5fb66b3..a5f29ea 100644 --- a/src/crepe/api/Transform.cpp +++ b/src/crepe/api/Transform.cpp @@ -6,7 +6,7 @@ using namespace crepe; -Transform::Transform(game_object_id_t id, const Point & point, double rot, +Transform::Transform(game_object_id_t id, const Vector2 & point, double rot, double scale) : Component(id), position(point), rotation(rot), scale(scale) { dbg_trace(); diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h index 1104e99..33e70f9 100644 --- a/src/crepe/api/Transform.h +++ b/src/crepe/api/Transform.h @@ -1,6 +1,6 @@ #pragma once -#include "api/Point.h" +#include "api/Vector2.h" #include "Component.h" @@ -20,7 +20,7 @@ public: * \param rot The rotation of the GameObject * \param scale The scale of the GameObject */ - Transform(game_object_id_t id, const Point & point, double rot, double scale); + Transform(game_object_id_t id, const Vector2 & point, double rot, double scale); /** * \brief Get the maximum number of instances for this component * @@ -30,7 +30,7 @@ public: public: //! Translation (shift) - Point position; + Vector2 position; //! Rotation, in radians double rotation; //! Multiplication factor diff --git a/src/crepe/api/Vector2.cpp b/src/crepe/api/Vector2.cpp new file mode 100644 index 0000000..8cbd9ad --- /dev/null +++ b/src/crepe/api/Vector2.cpp @@ -0,0 +1,59 @@ +#include "Vector2.h" + +namespace crepe { + + // Constructor with initial values + Vector2::Vector2(float x, float y) : x(x), y(y) {} + + // Subtracts another vector from this vector and returns the result. + Vector2 Vector2::operator-(const Vector2& other) const { + return {x - other.x, y - other.y}; + } + + // Adds another vector to this vector and returns the result. + Vector2 Vector2::operator+(const Vector2& other) const { + return {x + other.x, y + other.y}; + } + + // Multiplies this vector by a scalar and returns the result. + Vector2 Vector2::operator*(float scalar) const { + return {x * scalar, y * scalar}; + } + + // Multiplies this vector by another vector element-wise and updates this vector. + Vector2& Vector2::operator*=(const Vector2& other) { + x *= other.x; + y *= other.y; + return *this; + } + + // Adds another vector to this vector and updates this vector. + Vector2& Vector2::operator+=(const Vector2& other) { + x += other.x; + y += other.y; + return *this; + } + + // Adds a scalar value to both components of this vector and updates this vector. + Vector2& Vector2::operator+=(float other) { + x += other; + y += other; + return *this; + } + + // Returns the negation of this vector. + Vector2 Vector2::operator-() const { + return {-x, -y}; + } + + // Checks if this vector is equal to another vector. + bool Vector2::operator==(const Vector2& other) const { + return x == other.x && y == other.y; + } + + // Checks if this vector is not equal to another vector. + bool Vector2::operator!=(const Vector2& other) const { + return !(*this == other); + } + +} // namespace crepe diff --git a/src/crepe/api/Vector2.h b/src/crepe/api/Vector2.h new file mode 100644 index 0000000..d571209 --- /dev/null +++ b/src/crepe/api/Vector2.h @@ -0,0 +1,48 @@ +#pragma once + +namespace crepe { + + //! Vector2 class + class Vector2 { + public: + //! X component of the vector + float x; + //! Y component of the vector + float y; + + //! Default constructor + Vector2() = default; + + //! Constructor with initial values + Vector2(float x, float y); + + //! Subtracts another vector from this vector and returns the result. + Vector2 operator-(const Vector2& other) const; + + //! Adds another vector to this vector and returns the result. + Vector2 operator+(const Vector2& other) const; + + //! Multiplies this vector by a scalar and returns the result. + Vector2 operator*(float scalar) const; + + //! Multiplies this vector by another vector element-wise and updates this vector. + Vector2& operator*=(const Vector2& other); + + //! Adds another vector to this vector and updates this vector. + Vector2& operator+=(const Vector2& other); + + //! Adds a scalar value to both components of this vector and updates this vector. + Vector2& operator+=(float other); + + //! Returns the negation of this vector. + Vector2 operator-() const; + + //! Checks if this vector is equal to another vector. + bool operator==(const Vector2& other) const; + + //! Checks if this vector is not equal to another vector. + bool operator!=(const Vector2& other) const; + + }; + +} // namespace crepe diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp index cea8062..1a323ee 100644 --- a/src/crepe/system/PhysicsSystem.cpp +++ b/src/crepe/system/PhysicsSystem.cpp @@ -1,16 +1,15 @@ -#include +#include #include "../ComponentManager.h" -#include "../api/Force.h" #include "../api/Rigidbody.h" #include "../api/Transform.h" +#include "../api/Vector2.h" +#include "../api/Config.h" #include "PhysicsSystem.h" using namespace crepe; -PhysicsSystem::PhysicsSystem() {} - void PhysicsSystem::update() { ComponentManager & mgr = ComponentManager::get_instance(); std::vector> rigidbodies @@ -18,41 +17,80 @@ void PhysicsSystem::update() { std::vector> transforms = mgr.get_components_by_type(); + double gravity = Config::get_instance().physics.gravity; for (Rigidbody & rigidbody : rigidbodies) { - - switch (rigidbody.body_type) { - case BodyType::DYNAMIC: + if(!rigidbody.active){continue;} + switch (rigidbody.data.body_type) { + case Rigidbody::BodyType::DYNAMIC: for (Transform & transform : transforms) { 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.velocity_y - += rigidbody.gravity_scale * 1 * rigidbody.mass; - - for (Force & force : forces) { - rigidbody.velocity_x += force.force_x; - rigidbody.velocity_y += force.force_y; - } - - std::cout << "before transform.postion.x " - << transform.position.x << std::endl; - std::cout << "before transform.postion.y " - << transform.position.y << std::endl; - transform.position.x += rigidbody.velocity_x; - transform.position.y += rigidbody.velocity_y; - std::cout << "after transform.postion.x " - << transform.position.x << std::endl; - std::cout << "after transform.postion.y " - << transform.position.y << std::endl; + + // Add gravity + if(rigidbody.data.use_gravity) + { + rigidbody.data.linear_velocity.y += (rigidbody.data.mass * rigidbody.data.gravity_scale * gravity); + } + // Add damping + if(rigidbody.data.angular_damping != 0) + { + rigidbody.data.angular_velocity *= rigidbody.data.angular_damping; + } + if(rigidbody.data.linear_damping != Vector2{0,0}) + { + rigidbody.data.linear_velocity *= rigidbody.data.linear_damping; + } + + // Max velocity check + if(rigidbody.data.angular_velocity > rigidbody.data.max_angular_velocity) + { + rigidbody.data.angular_velocity = rigidbody.data.max_angular_velocity; + } + else if (rigidbody.data.angular_velocity < -rigidbody.data.max_angular_velocity) + { + rigidbody.data.angular_velocity = -rigidbody.data.max_angular_velocity; + } + + if(rigidbody.data.linear_velocity.x > rigidbody.data.max_linear_velocity.x) + { + rigidbody.data.linear_velocity.x = rigidbody.data.max_linear_velocity.x; + } + else if(rigidbody.data.linear_velocity.x < -rigidbody.data.max_linear_velocity.x) + { + rigidbody.data.linear_velocity.x = -rigidbody.data.max_linear_velocity.x; + } + + if(rigidbody.data.linear_velocity.y > rigidbody.data.max_linear_velocity.y) + { + rigidbody.data.linear_velocity.y = rigidbody.data.max_linear_velocity.y; + } + else if(rigidbody.data.linear_velocity.y < -rigidbody.data.max_linear_velocity.y) + { + rigidbody.data.linear_velocity.y = -rigidbody.data.max_linear_velocity.y; + } + + // Move object + if(!rigidbody.data.constraints.rotation) + { + transform.rotation += rigidbody.data.angular_velocity; + transform.rotation = std::fmod(transform.rotation, 360.0); + if (transform.rotation < 0) { + transform.rotation += 360.0; + } + } + if(!rigidbody.data.constraints.x) + { + transform.position.x += rigidbody.data.linear_velocity.x; + } + if(!rigidbody.data.constraints.y) + { + transform.position.y += rigidbody.data.linear_velocity.y; + } } } break; - case BodyType::KINEMATIC: + case Rigidbody::BodyType::KINEMATIC: break; //(scripts) - case BodyType::STATIC: + case Rigidbody::BodyType::STATIC: break; //(unmoveable objects) default: break; diff --git a/src/crepe/system/PhysicsSystem.h b/src/crepe/system/PhysicsSystem.h index 33b4072..cc13b70 100644 --- a/src/crepe/system/PhysicsSystem.h +++ b/src/crepe/system/PhysicsSystem.h @@ -1,10 +1,23 @@ #pragma once namespace crepe { - +/** + * \brief System that controls all physics + * + * This class is a physics system that uses a rigidbody and transform + * to add physics to a game object. + */ class PhysicsSystem { public: - PhysicsSystem(); + /** + * Constructor is default + */ + PhysicsSystem() = default; + /** + * \brief updates the physics system. + * + * It calculates new velocties and changes the postion in the transform. + */ void update(); }; diff --git a/src/example/ecs.cpp b/src/example/ecs.cpp index 0c64373..e61c398 100644 --- a/src/example/ecs.cpp +++ b/src/example/ecs.cpp @@ -11,11 +11,11 @@ using namespace std; int main() { // Create a few GameObjects try { - GameObject body(0, "body", "person", Point{0, 0}, 0, 1); - GameObject right_leg(1, "rightLeg", "person", Point{1, 1}, 0, 1); - GameObject left_leg(2, "leftLeg", "person", Point{1, 1}, 0, 1); - GameObject right_foot(3, "rightFoot", "person", Point{2, 2}, 0, 1); - GameObject left_foot(4, "leftFoot", "person", Point{2, 2}, 0, 1); + GameObject body(0, "body", "person", Vector2{0, 0}, 0, 1); + GameObject right_leg(1, "rightLeg", "person", Vector2{1, 1}, 0, 1); + GameObject left_leg(2, "leftLeg", "person", Vector2{1, 1}, 0, 1); + GameObject right_foot(3, "rightFoot", "person", Vector2{2, 2}, 0, 1); + GameObject left_foot(4, "leftFoot", "person", Vector2{2, 2}, 0, 1); // Set the parent of each GameObject right_foot.set_parent(right_leg); @@ -24,7 +24,7 @@ int main() { left_leg.set_parent(body); // Adding a second Transform component is not allowed and will invoke an exception - body.add_component(Point{10, 10}, 0, 1); + body.add_component(Vector2{10, 10}, 0, 1); } catch (const exception & e) { cerr << e.what() << endl; } diff --git a/src/example/particle.cpp b/src/example/particle.cpp index 607530d..0ab5632 100644 --- a/src/example/particle.cpp +++ b/src/example/particle.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include @@ -26,7 +26,7 @@ int main(int argc, char * argv[]) { } GameObject * game_object[1]; - game_object[0] = new GameObject(0, "Name", "Tag", Point{0, 0}, 0, 1); + game_object[0] = new GameObject(0, "Name", "Tag", Vector2{0, 0}, 0, 1); // FIXME: all systems are singletons, so this shouldn't even compile. ParticleSystem particle_system; diff --git a/src/example/physics.cpp b/src/example/physics.cpp index c7db6ac..fd15c79 100644 --- a/src/example/physics.cpp +++ b/src/example/physics.cpp @@ -1,10 +1,5 @@ -#include -#include -#include - #include #include -#include #include #include #include @@ -14,13 +9,15 @@ using namespace crepe; using namespace std; int main(int argc, char * argv[]) { - PhysicsSystem physics_system; - GameObject * game_object[2]; - // not found not used - game_object[1] = new GameObject(2, "Name", "Tag", Point{0, 0}, 0, 0); - game_object[0] = new GameObject(5, "Name", "Tag", Point{0, 0}, 0, 0); - game_object[0]->add_component(1, 1, BodyType::DYNAMIC); - game_object[0]->add_component(1, 0); - physics_system.update(); + GameObject *game_object; + game_object = new GameObject(0, "Name", "Tag", Vector2{0,0},0,0); + game_object->add_component(Rigidbody::RigidbodyData{ + .mass = 1, + .gravity_scale = 1, + .body_type = Rigidbody::BodyType::DYNAMIC, + .constraints = {0,0,0}, + .use_gravity = true, + .bounce = false, + }); return 0; } diff --git a/src/example/rendering.cpp b/src/example/rendering.cpp index 3fe43d6..e1ff9da 100644 --- a/src/example/rendering.cpp +++ b/src/example/rendering.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include @@ -19,9 +19,9 @@ using namespace crepe; int main() { dbg_trace(); - auto obj = GameObject(0, "name", "tag", Point{0, 0}, 1, 1); - auto obj1 = GameObject(1, "name", "tag", Point{500, 0}, 1, 0.1); - auto obj2 = GameObject(2, "name", "tag", Point{800, 0}, 1, 0.1); + auto obj = GameObject(0, "name", "tag", Vector2{0, 0}, 1, 1); + auto obj1 = GameObject(1, "name", "tag", Vector2{500, 0}, 1, 0.1); + auto obj2 = GameObject(2, "name", "tag", Vector2{800, 0}, 1, 0.1); auto & mgr = AssetManager::get_instance(); // Normal adding components diff --git a/src/example/scene_manager.cpp b/src/example/scene_manager.cpp index efbf2c2..1780c81 100644 --- a/src/example/scene_manager.cpp +++ b/src/example/scene_manager.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include @@ -15,9 +15,9 @@ public: ConcreteScene1(string name) : Scene(name) {} void load_scene() { - GameObject object1(0, "scene_1", "tag_scene_1", Point{0, 0}, 0, 1); - GameObject object2(1, "scene_1", "tag_scene_1", Point{1, 0}, 0, 1); - GameObject object3(2, "scene_1", "tag_scene_1", Point{2, 0}, 0, 1); + GameObject object1(0, "scene_1", "tag_scene_1", Vector2{0, 0}, 0, 1); + GameObject object2(1, "scene_1", "tag_scene_1", Vector2{1, 0}, 0, 1); + GameObject object3(2, "scene_1", "tag_scene_1", Vector2{2, 0}, 0, 1); } }; @@ -26,10 +26,10 @@ public: ConcreteScene2(string name) : Scene(name) {} void load_scene() { - GameObject object1(0, "scene_2", "tag_scene_2", Point{0, 0}, 0, 1); - GameObject object2(1, "scene_2", "tag_scene_2", Point{0, 1}, 0, 1); - GameObject object3(2, "scene_2", "tag_scene_2", Point{0, 2}, 0, 1); - GameObject object4(3, "scene_2", "tag_scene_2", Point{0, 3}, 0, 1); + GameObject object1(0, "scene_2", "tag_scene_2", Vector2{0, 0}, 0, 1); + GameObject object2(1, "scene_2", "tag_scene_2", Vector2{0, 1}, 0, 1); + GameObject object3(2, "scene_2", "tag_scene_2", Vector2{0, 2}, 0, 1); + GameObject object4(3, "scene_2", "tag_scene_2", Vector2{0, 3}, 0, 1); } }; diff --git a/src/example/script.cpp b/src/example/script.cpp index 8ca4ceb..9e8b147 100644 --- a/src/example/script.cpp +++ b/src/example/script.cpp @@ -36,7 +36,7 @@ class MyScript : public Script { int main() { // Create game object with Transform and BehaviorScript components - auto obj = GameObject(0, "name", "tag", Point{1.2, 3.4}, 0, 1); + auto obj = GameObject(0, "name", "tag", Vector2{1.2, 3.4}, 0, 1); obj.add_component().set_script(); // Get ScriptSystem singleton instance (this would normally be done from the diff --git a/src/makefile b/src/makefile index be1548c..2251119 100644 --- a/src/makefile +++ b/src/makefile @@ -41,16 +41,14 @@ TODO += crepe/api/CircleCollider.h TODO += crepe/api/Color.cpp TODO += crepe/api/Color.h LOEK += crepe/api/Config.h -TODO += crepe/api/Force.cpp -TODO += crepe/api/Force.h MAX += crepe/api/GameObject.cpp MAX += crepe/api/GameObject.h MAX += crepe/api/GameObject.hpp TODO += crepe/api/ParticleEmitter.cpp TODO += crepe/api/ParticleEmitter.h -TODO += crepe/api/Point.h -TODO += crepe/api/Rigidbody.cpp -TODO += crepe/api/Rigidbody.h +TODO += crepe/api/Vector2.h +JARO += crepe/api/Rigidbody.cpp +JARO += crepe/api/Rigidbody.h LOEK += crepe/api/Script.cpp LOEK += crepe/api/Script.h LOEK += crepe/api/Script.hpp @@ -60,8 +58,6 @@ TODO += crepe/api/Texture.cpp TODO += crepe/api/Texture.h MAX += crepe/api/Transform.cpp MAX += crepe/api/Transform.h -TODO += crepe/facade/SDLApp.cpp -TODO += crepe/facade/SDLApp.h TODO += crepe/facade/SDLContext.cpp TODO += crepe/facade/SDLContext.h LOEK += crepe/facade/Sound.cpp @@ -72,8 +68,8 @@ TODO += crepe/system/CollisionSystem.cpp TODO += crepe/system/CollisionSystem.h TODO += crepe/system/ParticleSystem.cpp TODO += crepe/system/ParticleSystem.h -TODO += crepe/system/PhysicsSystem.cpp -TODO += crepe/system/PhysicsSystem.h +JARO += crepe/system/PhysicsSystem.cpp +JARO += crepe/system/PhysicsSystem.h TODO += crepe/system/RenderSystem.cpp TODO += crepe/system/RenderSystem.h LOEK += crepe/system/ScriptSystem.cpp @@ -91,13 +87,14 @@ TODO += example/components_internal.cpp MAX += example/ecs.cpp LOEK += example/log.cpp TODO += example/particle.cpp -TODO += example/physics.cpp +JARO += example/physics.cpp TODO += example/rendering.cpp LOEK += example/script.cpp LOEK += test/audio.cpp LOEK += test/dummy.cpp +JARO += test/PhysicsTest.cpp -FMT := $(MAX) #<<< CHANGE THIS TO YOUR NAME FOR STEP 2 +FMT := $(JARO) #<<< CHANGE THIS TO YOUR NAME FOR STEP 2 format: FORCE clang-tidy -p build/compile_commands.json --fix-errors $(FMT) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 0d316d6..0e4eaed 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -1,5 +1,6 @@ target_sources(test_main PUBLIC dummy.cpp # audio.cpp + PhysicsTest.cpp ) diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp new file mode 100644 index 0000000..5ad5d01 --- /dev/null +++ b/src/test/PhysicsTest.cpp @@ -0,0 +1,115 @@ +#include +#include +#include +#include +#include +#include +#include + +using namespace std; +using namespace std::chrono_literals; +using namespace crepe; + +class PhysicsTest : public ::testing::Test { +protected: + GameObject* game_object; + PhysicsSystem physics_system; + void SetUp() override { + ComponentManager & mgr = ComponentManager::get_instance(); + std::vector> transforms = mgr.get_components_by_id(0); + if (transforms.empty()) { + game_object = new GameObject(0,"","",Vector2{0,0},0,0); + game_object->add_component(Rigidbody::RigidbodyData{ + .mass = 1, + .gravity_scale = 1, + .body_type = Rigidbody::BodyType::DYNAMIC, + .max_linear_velocity = Vector2{10,10}, + .max_angular_velocity = 10, + .constraints = {0, 0}, + .use_gravity = true, + .bounce = false + }); + } + transforms = mgr.get_components_by_id(0); + Transform& transform = transforms.front().get(); + transform.position.x = 0.0; + transform.position.y = 0.0; + transform.rotation = 0.0; + std::vector> rigidbodies = mgr.get_components_by_id(0); + Rigidbody& rigidbody = rigidbodies.front().get(); + rigidbody.data.angular_velocity = 0; + rigidbody.data.linear_velocity.x = 0; + rigidbody.data.linear_velocity.y = 0; + } +}; + +TEST_F(PhysicsTest, gravity) { + Config::get_instance().physics.gravity = 1; + ComponentManager & mgr = ComponentManager::get_instance(); + std::vector> transforms = mgr.get_components_by_id(0); + const Transform& transform = transforms.front().get(); + ASSERT_FALSE(transforms.empty()); + EXPECT_EQ(transform.position.y, 0); + physics_system.update(); + EXPECT_EQ(transform.position.y, 1); + physics_system.update(); + EXPECT_EQ(transform.position.y, 3); +} + +TEST_F(PhysicsTest, max_velocity) { + ComponentManager & mgr = ComponentManager::get_instance(); + std::vector> rigidbodies = mgr.get_components_by_id(0); + Rigidbody& rigidbody = rigidbodies.front().get(); + ASSERT_FALSE(rigidbodies.empty()); + EXPECT_EQ(rigidbody.data.linear_velocity.y, 0); + rigidbody.add_force_linear({100,100}); + rigidbody.add_force_angular(100); + physics_system.update(); + EXPECT_EQ(rigidbody.data.linear_velocity.y, 10); + EXPECT_EQ(rigidbody.data.linear_velocity.x, 10); + EXPECT_EQ(rigidbody.data.angular_velocity, 10); + rigidbody.add_force_linear({-100,-100}); + rigidbody.add_force_angular(-100); + physics_system.update(); + EXPECT_EQ(rigidbody.data.linear_velocity.y, -10); + EXPECT_EQ(rigidbody.data.linear_velocity.x, -10); + EXPECT_EQ(rigidbody.data.angular_velocity, -10); +} + +TEST_F(PhysicsTest, movement) { + Config::get_instance().physics.gravity = 0; + ComponentManager & mgr = ComponentManager::get_instance(); + std::vector> rigidbodies = mgr.get_components_by_id(0); + Rigidbody& rigidbody = rigidbodies.front().get(); + std::vector> transforms = mgr.get_components_by_id(0); + const Transform& transform = transforms.front().get(); + ASSERT_FALSE(rigidbodies.empty()); + ASSERT_FALSE(transforms.empty()); + rigidbody.add_force_linear({1,1}); + rigidbody.add_force_angular(1); + physics_system.update(); + EXPECT_EQ(transform.position.x, 1); + EXPECT_EQ(transform.position.y, 1); + EXPECT_EQ(transform.rotation, 1); + rigidbody.data.constraints = {1,1,1}; + EXPECT_EQ(transform.position.x, 1); + EXPECT_EQ(transform.position.y, 1); + EXPECT_EQ(transform.rotation, 1); + rigidbody.data.linear_damping.x = 0.5; + rigidbody.data.linear_damping.y = 0.5; + rigidbody.data.angular_damping = 0.5; + physics_system.update(); + EXPECT_EQ(rigidbody.data.linear_velocity.x, 0.5); + EXPECT_EQ(rigidbody.data.linear_velocity.y, 0.5); + EXPECT_EQ(rigidbody.data.angular_velocity, 0.5); + rigidbody.data.constraints = {1,1,0}; + rigidbody.data.angular_damping = 0; + rigidbody.data.max_angular_velocity = 1000; + rigidbody.data.angular_velocity = 360; + physics_system.update(); + EXPECT_EQ(transform.rotation, 1); + rigidbody.data.angular_velocity = -360; + physics_system.update(); + EXPECT_EQ(transform.rotation, 1); +} + -- cgit v1.2.3 From f49c93a5dfc0aeb5c0087cc9adfeb68526a2b0a7 Mon Sep 17 00:00:00 2001 From: max-001 Date: Thu, 7 Nov 2024 19:24:24 +0100 Subject: Make format --- src/crepe/api/GameObject.h | 6 +-- src/crepe/api/ParticleEmitter.cpp | 17 +++--- src/crepe/api/Rigidbody.cpp | 6 +-- src/crepe/api/Rigidbody.h | 13 +++-- src/crepe/api/Transform.h | 3 +- src/crepe/api/Vector2.cpp | 104 ++++++++++++++++++------------------- src/crepe/api/Vector2.h | 61 +++++++++++----------- src/crepe/system/PhysicsSystem.cpp | 96 ++++++++++++++++++---------------- src/example/physics.cpp | 8 +-- src/example/rendering.cpp | 2 +- src/example/scene_manager.cpp | 2 +- src/test/PhysicsTest.cpp | 94 +++++++++++++++++---------------- 12 files changed, 210 insertions(+), 202 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h index 8dc102c..d703730 100644 --- a/src/crepe/api/GameObject.h +++ b/src/crepe/api/GameObject.h @@ -1,6 +1,5 @@ #pragma once -#include #include #include "types.h" @@ -29,8 +28,9 @@ public: * \param rotation The rotation of the GameObject * \param scale The scale of the GameObject */ - GameObject(game_object_id_t id, const std::string & name, const std::string & tag, - const Vector2 & position, double rotation, double scale); + GameObject(game_object_id_t id, const std::string & name, + const std::string & tag, const Vector2 & position, + double rotation, double scale); /** * \brief Set the parent of this GameObject * diff --git a/src/crepe/api/ParticleEmitter.cpp b/src/crepe/api/ParticleEmitter.cpp index 6094732..3b2e2f2 100644 --- a/src/crepe/api/ParticleEmitter.cpp +++ b/src/crepe/api/ParticleEmitter.cpp @@ -6,15 +6,14 @@ using namespace crepe; -ParticleEmitter::ParticleEmitter(game_object_id_t id, - uint32_t max_particles, uint32_t emission_rate, - uint32_t speed, uint32_t speed_offset, - uint32_t angle, uint32_t angleOffset, - float begin_lifespan, float end_lifespan) - : Component(id), max_particles(max_particles), - emission_rate(emission_rate), speed(speed), speed_offset(speed_offset), - position{0, 0}, begin_lifespan(begin_lifespan), - end_lifespan(end_lifespan) { +ParticleEmitter::ParticleEmitter(game_object_id_t id, uint32_t max_particles, + uint32_t emission_rate, uint32_t speed, + uint32_t speed_offset, uint32_t angle, + uint32_t angleOffset, float begin_lifespan, + float end_lifespan) + : Component(id), max_particles(max_particles), emission_rate(emission_rate), + speed(speed), speed_offset(speed_offset), position{0, 0}, + begin_lifespan(begin_lifespan), end_lifespan(end_lifespan) { std::srand( static_cast(std::time(nullptr))); // initialize random seed std::cout << "Create emitter" << std::endl; diff --git a/src/crepe/api/Rigidbody.cpp b/src/crepe/api/Rigidbody.cpp index cf07b0e..0de9846 100644 --- a/src/crepe/api/Rigidbody.cpp +++ b/src/crepe/api/Rigidbody.cpp @@ -2,9 +2,8 @@ using namespace crepe; -crepe::Rigidbody::Rigidbody(uint32_t game_object_id, - const RigidbodyData & data) : - Component(game_object_id), data(data){} +crepe::Rigidbody::Rigidbody(uint32_t game_object_id, const RigidbodyData & data) + : Component(game_object_id), data(data) {} void crepe::Rigidbody::add_force_linear(const Vector2 & force) { this->data.linear_velocity += force; @@ -13,4 +12,3 @@ void crepe::Rigidbody::add_force_linear(const Vector2 & force) { void crepe::Rigidbody::add_force_angular(double force) { this->data.angular_velocity += force; } - diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h index 0c069d8..e1abd46 100644 --- a/src/crepe/api/Rigidbody.h +++ b/src/crepe/api/Rigidbody.h @@ -37,17 +37,18 @@ public: */ struct PhysicsConstraints { //! X constraint - bool x = 0; + bool x = 0; //! Y constraint - bool y = 0; + bool y = 0; //! rotation constraint - bool rotation = 0; + bool rotation = 0; }; + public: /** * This struct holds the data for the Rigidbody. */ - struct RigidbodyData{ + struct RigidbodyData { //! objects mass double mass = 0.0; //! gravtiy scale @@ -73,14 +74,16 @@ public: //! if object bounces bool bounce = false; }; + public: /** * \param game_object_id id of the gameobject the rigibody is added to. * \param data struct to configure the rigidbody. */ - Rigidbody(uint32_t game_object_id,const RigidbodyData& data); + Rigidbody(uint32_t game_object_id, const RigidbodyData & data); //! struct to hold data of rigidbody RigidbodyData data; + public: /** * \brief add a linear force to the Rigidbody. diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h index 33e70f9..805553e 100644 --- a/src/crepe/api/Transform.h +++ b/src/crepe/api/Transform.h @@ -20,7 +20,8 @@ public: * \param rot The rotation of the GameObject * \param scale The scale of the GameObject */ - Transform(game_object_id_t id, const Vector2 & point, double rot, double scale); + Transform(game_object_id_t id, const Vector2 & point, double rot, + double scale); /** * \brief Get the maximum number of instances for this component * diff --git a/src/crepe/api/Vector2.cpp b/src/crepe/api/Vector2.cpp index 8cbd9ad..09bb59b 100644 --- a/src/crepe/api/Vector2.cpp +++ b/src/crepe/api/Vector2.cpp @@ -2,58 +2,56 @@ namespace crepe { - // Constructor with initial values - Vector2::Vector2(float x, float y) : x(x), y(y) {} - - // Subtracts another vector from this vector and returns the result. - Vector2 Vector2::operator-(const Vector2& other) const { - return {x - other.x, y - other.y}; - } - - // Adds another vector to this vector and returns the result. - Vector2 Vector2::operator+(const Vector2& other) const { - return {x + other.x, y + other.y}; - } - - // Multiplies this vector by a scalar and returns the result. - Vector2 Vector2::operator*(float scalar) const { - return {x * scalar, y * scalar}; - } - - // Multiplies this vector by another vector element-wise and updates this vector. - Vector2& Vector2::operator*=(const Vector2& other) { - x *= other.x; - y *= other.y; - return *this; - } - - // Adds another vector to this vector and updates this vector. - Vector2& Vector2::operator+=(const Vector2& other) { - x += other.x; - y += other.y; - return *this; - } - - // Adds a scalar value to both components of this vector and updates this vector. - Vector2& Vector2::operator+=(float other) { - x += other; - y += other; - return *this; - } - - // Returns the negation of this vector. - Vector2 Vector2::operator-() const { - return {-x, -y}; - } - - // Checks if this vector is equal to another vector. - bool Vector2::operator==(const Vector2& other) const { - return x == other.x && y == other.y; - } - - // Checks if this vector is not equal to another vector. - bool Vector2::operator!=(const Vector2& other) const { - return !(*this == other); - } +// Constructor with initial values +Vector2::Vector2(float x, float y) : x(x), y(y) {} + +// Subtracts another vector from this vector and returns the result. +Vector2 Vector2::operator-(const Vector2 & other) const { + return {x - other.x, y - other.y}; +} + +// Adds another vector to this vector and returns the result. +Vector2 Vector2::operator+(const Vector2 & other) const { + return {x + other.x, y + other.y}; +} + +// Multiplies this vector by a scalar and returns the result. +Vector2 Vector2::operator*(float scalar) const { + return {x * scalar, y * scalar}; +} + +// Multiplies this vector by another vector element-wise and updates this vector. +Vector2 & Vector2::operator*=(const Vector2 & other) { + x *= other.x; + y *= other.y; + return *this; +} + +// Adds another vector to this vector and updates this vector. +Vector2 & Vector2::operator+=(const Vector2 & other) { + x += other.x; + y += other.y; + return *this; +} + +// Adds a scalar value to both components of this vector and updates this vector. +Vector2 & Vector2::operator+=(float other) { + x += other; + y += other; + return *this; +} + +// Returns the negation of this vector. +Vector2 Vector2::operator-() const { return {-x, -y}; } + +// Checks if this vector is equal to another vector. +bool Vector2::operator==(const Vector2 & other) const { + return x == other.x && y == other.y; +} + +// Checks if this vector is not equal to another vector. +bool Vector2::operator!=(const Vector2 & other) const { + return !(*this == other); +} } // namespace crepe diff --git a/src/crepe/api/Vector2.h b/src/crepe/api/Vector2.h index d571209..741951b 100644 --- a/src/crepe/api/Vector2.h +++ b/src/crepe/api/Vector2.h @@ -2,47 +2,46 @@ namespace crepe { - //! Vector2 class - class Vector2 { - public: - //! X component of the vector - float x; - //! Y component of the vector - float y; +//! Vector2 class +class Vector2 { +public: + //! X component of the vector + float x; + //! Y component of the vector + float y; - //! Default constructor - Vector2() = default; + //! Default constructor + Vector2() = default; - //! Constructor with initial values - Vector2(float x, float y); + //! Constructor with initial values + Vector2(float x, float y); - //! Subtracts another vector from this vector and returns the result. - Vector2 operator-(const Vector2& other) const; + //! Subtracts another vector from this vector and returns the result. + Vector2 operator-(const Vector2 & other) const; - //! Adds another vector to this vector and returns the result. - Vector2 operator+(const Vector2& other) const; + //! Adds another vector to this vector and returns the result. + Vector2 operator+(const Vector2 & other) const; - //! Multiplies this vector by a scalar and returns the result. - Vector2 operator*(float scalar) const; + //! Multiplies this vector by a scalar and returns the result. + Vector2 operator*(float scalar) const; - //! Multiplies this vector by another vector element-wise and updates this vector. - Vector2& operator*=(const Vector2& other); + //! Multiplies this vector by another vector element-wise and updates this vector. + Vector2 & operator*=(const Vector2 & other); - //! Adds another vector to this vector and updates this vector. - Vector2& operator+=(const Vector2& other); + //! Adds another vector to this vector and updates this vector. + Vector2 & operator+=(const Vector2 & other); - //! Adds a scalar value to both components of this vector and updates this vector. - Vector2& operator+=(float other); + //! Adds a scalar value to both components of this vector and updates this vector. + Vector2 & operator+=(float other); - //! Returns the negation of this vector. - Vector2 operator-() const; + //! Returns the negation of this vector. + Vector2 operator-() const; - //! Checks if this vector is equal to another vector. - bool operator==(const Vector2& other) const; + //! Checks if this vector is equal to another vector. + bool operator==(const Vector2 & other) const; - //! Checks if this vector is not equal to another vector. - bool operator!=(const Vector2& other) const; - - }; + //! Checks if this vector is not equal to another vector. + bool operator!=(const Vector2 & other) const; +}; } // namespace crepe diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp index 1a323ee..1bd2171 100644 --- a/src/crepe/system/PhysicsSystem.cpp +++ b/src/crepe/system/PhysicsSystem.cpp @@ -1,10 +1,10 @@ #include #include "../ComponentManager.h" +#include "../api/Config.h" #include "../api/Rigidbody.h" #include "../api/Transform.h" #include "../api/Vector2.h" -#include "../api/Config.h" #include "PhysicsSystem.h" @@ -19,71 +19,77 @@ void PhysicsSystem::update() { double gravity = Config::get_instance().physics.gravity; for (Rigidbody & rigidbody : rigidbodies) { - if(!rigidbody.active){continue;} + if (!rigidbody.active) continue; + switch (rigidbody.data.body_type) { case Rigidbody::BodyType::DYNAMIC: for (Transform & transform : transforms) { if (transform.game_object_id == rigidbody.game_object_id) { - - // Add gravity - if(rigidbody.data.use_gravity) - { - rigidbody.data.linear_velocity.y += (rigidbody.data.mass * rigidbody.data.gravity_scale * gravity); + + // Add gravity + if (rigidbody.data.use_gravity) { + rigidbody.data.linear_velocity.y + += (rigidbody.data.mass + * rigidbody.data.gravity_scale * gravity); } // Add damping - if(rigidbody.data.angular_damping != 0) - { - rigidbody.data.angular_velocity *= rigidbody.data.angular_damping; + if (rigidbody.data.angular_damping != 0) { + rigidbody.data.angular_velocity + *= rigidbody.data.angular_damping; } - if(rigidbody.data.linear_damping != Vector2{0,0}) - { - rigidbody.data.linear_velocity *= rigidbody.data.linear_damping; + if (rigidbody.data.linear_damping != Vector2{0, 0}) { + rigidbody.data.linear_velocity + *= rigidbody.data.linear_damping; } // Max velocity check - if(rigidbody.data.angular_velocity > rigidbody.data.max_angular_velocity) - { - rigidbody.data.angular_velocity = rigidbody.data.max_angular_velocity; - } - else if (rigidbody.data.angular_velocity < -rigidbody.data.max_angular_velocity) - { - rigidbody.data.angular_velocity = -rigidbody.data.max_angular_velocity; + if (rigidbody.data.angular_velocity + > rigidbody.data.max_angular_velocity) { + rigidbody.data.angular_velocity + = rigidbody.data.max_angular_velocity; + } else if (rigidbody.data.angular_velocity + < -rigidbody.data.max_angular_velocity) { + rigidbody.data.angular_velocity + = -rigidbody.data.max_angular_velocity; } - if(rigidbody.data.linear_velocity.x > rigidbody.data.max_linear_velocity.x) - { - rigidbody.data.linear_velocity.x = rigidbody.data.max_linear_velocity.x; - } - else if(rigidbody.data.linear_velocity.x < -rigidbody.data.max_linear_velocity.x) - { - rigidbody.data.linear_velocity.x = -rigidbody.data.max_linear_velocity.x; + if (rigidbody.data.linear_velocity.x + > rigidbody.data.max_linear_velocity.x) { + rigidbody.data.linear_velocity.x + = rigidbody.data.max_linear_velocity.x; + } else if (rigidbody.data.linear_velocity.x + < -rigidbody.data.max_linear_velocity.x) { + rigidbody.data.linear_velocity.x + = -rigidbody.data.max_linear_velocity.x; } - if(rigidbody.data.linear_velocity.y > rigidbody.data.max_linear_velocity.y) - { - rigidbody.data.linear_velocity.y = rigidbody.data.max_linear_velocity.y; - } - else if(rigidbody.data.linear_velocity.y < -rigidbody.data.max_linear_velocity.y) - { - rigidbody.data.linear_velocity.y = -rigidbody.data.max_linear_velocity.y; + if (rigidbody.data.linear_velocity.y + > rigidbody.data.max_linear_velocity.y) { + rigidbody.data.linear_velocity.y + = rigidbody.data.max_linear_velocity.y; + } else if (rigidbody.data.linear_velocity.y + < -rigidbody.data.max_linear_velocity.y) { + rigidbody.data.linear_velocity.y + = -rigidbody.data.max_linear_velocity.y; } - // Move object - if(!rigidbody.data.constraints.rotation) - { - transform.rotation += rigidbody.data.angular_velocity; - transform.rotation = std::fmod(transform.rotation, 360.0); + // Move object + if (!rigidbody.data.constraints.rotation) { + transform.rotation + += rigidbody.data.angular_velocity; + transform.rotation + = std::fmod(transform.rotation, 360.0); if (transform.rotation < 0) { transform.rotation += 360.0; } } - if(!rigidbody.data.constraints.x) - { - transform.position.x += rigidbody.data.linear_velocity.x; + if (!rigidbody.data.constraints.x) { + transform.position.x + += rigidbody.data.linear_velocity.x; } - if(!rigidbody.data.constraints.y) - { - transform.position.y += rigidbody.data.linear_velocity.y; + if (!rigidbody.data.constraints.y) { + transform.position.y + += rigidbody.data.linear_velocity.y; } } } diff --git a/src/example/physics.cpp b/src/example/physics.cpp index 9a5e5f9..a7e94f6 100644 --- a/src/example/physics.cpp +++ b/src/example/physics.cpp @@ -9,16 +9,16 @@ using namespace crepe; using namespace std; int main(int argc, char * argv[]) { - GameObject *game_object; - game_object = new GameObject(0, "Name", "Tag", Vector2{0,0},0,0); + GameObject * game_object; + game_object = new GameObject(0, "Name", "Tag", Vector2{0, 0}, 0, 0); game_object->add_component(Rigidbody::RigidbodyData{ .mass = 1, .gravity_scale = 1, .body_type = Rigidbody::BodyType::DYNAMIC, - .constraints = {0,0,0}, + .constraints = {0, 0, 0}, .use_gravity = true, .bounce = false, - }); + }); delete game_object; return 0; } diff --git a/src/example/rendering.cpp b/src/example/rendering.cpp index e1ff9da..d554a8a 100644 --- a/src/example/rendering.cpp +++ b/src/example/rendering.cpp @@ -5,10 +5,10 @@ #include #include -#include #include #include #include +#include #include #include diff --git a/src/example/scene_manager.cpp b/src/example/scene_manager.cpp index 1780c81..f46dc36 100644 --- a/src/example/scene_manager.cpp +++ b/src/example/scene_manager.cpp @@ -3,9 +3,9 @@ #include #include #include -#include #include #include +#include using namespace crepe; using namespace std; diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp index 5ad5d01..6b8c4d8 100644 --- a/src/test/PhysicsTest.cpp +++ b/src/test/PhysicsTest.cpp @@ -1,10 +1,10 @@ -#include #include +#include #include #include #include #include -#include +#include using namespace std; using namespace std::chrono_literals; @@ -12,42 +12,44 @@ using namespace crepe; class PhysicsTest : public ::testing::Test { protected: - GameObject* game_object; - PhysicsSystem physics_system; - void SetUp() override { - ComponentManager & mgr = ComponentManager::get_instance(); - std::vector> transforms = mgr.get_components_by_id(0); - if (transforms.empty()) { - game_object = new GameObject(0,"","",Vector2{0,0},0,0); - game_object->add_component(Rigidbody::RigidbodyData{ - .mass = 1, - .gravity_scale = 1, - .body_type = Rigidbody::BodyType::DYNAMIC, - .max_linear_velocity = Vector2{10,10}, - .max_angular_velocity = 10, - .constraints = {0, 0}, - .use_gravity = true, - .bounce = false - }); - } - transforms = mgr.get_components_by_id(0); - Transform& transform = transforms.front().get(); - transform.position.x = 0.0; - transform.position.y = 0.0; - transform.rotation = 0.0; - std::vector> rigidbodies = mgr.get_components_by_id(0); - Rigidbody& rigidbody = rigidbodies.front().get(); - rigidbody.data.angular_velocity = 0; - rigidbody.data.linear_velocity.x = 0; - rigidbody.data.linear_velocity.y = 0; - } + GameObject * game_object; + PhysicsSystem physics_system; + void SetUp() override { + ComponentManager & mgr = ComponentManager::get_instance(); + std::vector> transforms + = mgr.get_components_by_id(0); + if (transforms.empty()) { + game_object = new GameObject(0, "", "", Vector2{0, 0}, 0, 0); + game_object->add_component(Rigidbody::RigidbodyData{ + .mass = 1, + .gravity_scale = 1, + .body_type = Rigidbody::BodyType::DYNAMIC, + .max_linear_velocity = Vector2{10, 10}, + .max_angular_velocity = 10, + .constraints = {0, 0}, + .use_gravity = true, + .bounce = false}); + } + transforms = mgr.get_components_by_id(0); + Transform & transform = transforms.front().get(); + transform.position.x = 0.0; + transform.position.y = 0.0; + transform.rotation = 0.0; + std::vector> rigidbodies + = mgr.get_components_by_id(0); + Rigidbody & rigidbody = rigidbodies.front().get(); + rigidbody.data.angular_velocity = 0; + rigidbody.data.linear_velocity.x = 0; + rigidbody.data.linear_velocity.y = 0; + } }; TEST_F(PhysicsTest, gravity) { Config::get_instance().physics.gravity = 1; ComponentManager & mgr = ComponentManager::get_instance(); - std::vector> transforms = mgr.get_components_by_id(0); - const Transform& transform = transforms.front().get(); + std::vector> transforms + = mgr.get_components_by_id(0); + const Transform & transform = transforms.front().get(); ASSERT_FALSE(transforms.empty()); EXPECT_EQ(transform.position.y, 0); physics_system.update(); @@ -58,17 +60,18 @@ TEST_F(PhysicsTest, gravity) { TEST_F(PhysicsTest, max_velocity) { ComponentManager & mgr = ComponentManager::get_instance(); - std::vector> rigidbodies = mgr.get_components_by_id(0); - Rigidbody& rigidbody = rigidbodies.front().get(); + std::vector> rigidbodies + = mgr.get_components_by_id(0); + Rigidbody & rigidbody = rigidbodies.front().get(); ASSERT_FALSE(rigidbodies.empty()); EXPECT_EQ(rigidbody.data.linear_velocity.y, 0); - rigidbody.add_force_linear({100,100}); + rigidbody.add_force_linear({100, 100}); rigidbody.add_force_angular(100); physics_system.update(); EXPECT_EQ(rigidbody.data.linear_velocity.y, 10); EXPECT_EQ(rigidbody.data.linear_velocity.x, 10); EXPECT_EQ(rigidbody.data.angular_velocity, 10); - rigidbody.add_force_linear({-100,-100}); + rigidbody.add_force_linear({-100, -100}); rigidbody.add_force_angular(-100); physics_system.update(); EXPECT_EQ(rigidbody.data.linear_velocity.y, -10); @@ -79,19 +82,21 @@ TEST_F(PhysicsTest, max_velocity) { TEST_F(PhysicsTest, movement) { Config::get_instance().physics.gravity = 0; ComponentManager & mgr = ComponentManager::get_instance(); - std::vector> rigidbodies = mgr.get_components_by_id(0); - Rigidbody& rigidbody = rigidbodies.front().get(); - std::vector> transforms = mgr.get_components_by_id(0); - const Transform& transform = transforms.front().get(); + std::vector> rigidbodies + = mgr.get_components_by_id(0); + Rigidbody & rigidbody = rigidbodies.front().get(); + std::vector> transforms + = mgr.get_components_by_id(0); + const Transform & transform = transforms.front().get(); ASSERT_FALSE(rigidbodies.empty()); ASSERT_FALSE(transforms.empty()); - rigidbody.add_force_linear({1,1}); + rigidbody.add_force_linear({1, 1}); rigidbody.add_force_angular(1); physics_system.update(); EXPECT_EQ(transform.position.x, 1); EXPECT_EQ(transform.position.y, 1); EXPECT_EQ(transform.rotation, 1); - rigidbody.data.constraints = {1,1,1}; + rigidbody.data.constraints = {1, 1, 1}; EXPECT_EQ(transform.position.x, 1); EXPECT_EQ(transform.position.y, 1); EXPECT_EQ(transform.rotation, 1); @@ -102,7 +107,7 @@ TEST_F(PhysicsTest, movement) { EXPECT_EQ(rigidbody.data.linear_velocity.x, 0.5); EXPECT_EQ(rigidbody.data.linear_velocity.y, 0.5); EXPECT_EQ(rigidbody.data.angular_velocity, 0.5); - rigidbody.data.constraints = {1,1,0}; + rigidbody.data.constraints = {1, 1, 0}; rigidbody.data.angular_damping = 0; rigidbody.data.max_angular_velocity = 1000; rigidbody.data.angular_velocity = 360; @@ -112,4 +117,3 @@ TEST_F(PhysicsTest, movement) { physics_system.update(); EXPECT_EQ(transform.rotation, 1); } - -- cgit v1.2.3 From fde229c24dcbd1ed844880a35eabddb88279802b Mon Sep 17 00:00:00 2001 From: jaroWMR Date: Thu, 7 Nov 2024 19:49:43 +0100 Subject: corrected doxygen comment --- src/crepe/api/Rigidbody.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/crepe/api') diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h index e1abd46..b12cf1d 100644 --- a/src/crepe/api/Rigidbody.h +++ b/src/crepe/api/Rigidbody.h @@ -46,6 +46,9 @@ public: public: /** + * + * \brief struct for Rigidbody data + * * This struct holds the data for the Rigidbody. */ struct RigidbodyData { -- cgit v1.2.3 From 3d2428af8e8d9d49b4ade52d4806a7dae4cf1ab8 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 7 Nov 2024 20:03:14 +0100 Subject: merge #25 + nitpicking --- contributing.md | 17 +++++++++++++++++ src/crepe/api/Rigidbody.cpp | 2 +- src/crepe/api/Rigidbody.h | 13 ++++++------- src/crepe/api/Sprite.cpp | 4 ++-- src/crepe/api/Sprite.h | 7 ++++--- src/crepe/api/Transform.cpp | 8 +++----- src/crepe/api/Transform.h | 4 ++-- src/crepe/system/PhysicsSystem.cpp | 2 +- src/crepe/types.h | 1 - src/example/physics.cpp | 2 +- src/test/PhysicsTest.cpp | 5 +++-- 11 files changed, 40 insertions(+), 25 deletions(-) (limited to 'src/crepe/api') diff --git a/contributing.md b/contributing.md index ba8ad68..8799057 100644 --- a/contributing.md +++ b/contributing.md @@ -635,6 +635,23 @@ that you can click on to open them. } ``` +-
+ Assigning booleans should be done with the + true/false literals instead of + 0/1 +
GoodBad
+ + ```cpp + bool foo = true; + bool bar = false; + ``` + + + ```cpp + bool foo = 1; + bool bar = 0; + ``` +
## CMakeLists-specific diff --git a/src/crepe/api/Rigidbody.cpp b/src/crepe/api/Rigidbody.cpp index 0de9846..cbf1325 100644 --- a/src/crepe/api/Rigidbody.cpp +++ b/src/crepe/api/Rigidbody.cpp @@ -2,7 +2,7 @@ using namespace crepe; -crepe::Rigidbody::Rigidbody(uint32_t game_object_id, const RigidbodyData & data) +crepe::Rigidbody::Rigidbody(uint32_t game_object_id, const Data & data) : Component(game_object_id), data(data) {} void crepe::Rigidbody::add_force_linear(const Vector2 & force) { diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h index b12cf1d..68481f4 100644 --- a/src/crepe/api/Rigidbody.h +++ b/src/crepe/api/Rigidbody.h @@ -37,21 +37,20 @@ public: */ struct PhysicsConstraints { //! X constraint - bool x = 0; + bool x = false; //! Y constraint - bool y = 0; + bool y = false; //! rotation constraint - bool rotation = 0; + bool rotation = false; }; public: /** - * * \brief struct for Rigidbody data * * This struct holds the data for the Rigidbody. */ - struct RigidbodyData { + struct Data { //! objects mass double mass = 0.0; //! gravtiy scale @@ -83,9 +82,9 @@ public: * \param game_object_id id of the gameobject the rigibody is added to. * \param data struct to configure the rigidbody. */ - Rigidbody(uint32_t game_object_id, const RigidbodyData & data); + Rigidbody(uint32_t game_object_id, const Data & data); //! struct to hold data of rigidbody - RigidbodyData data; + Data data; public: /** diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp index 7e810b5..d3465c7 100644 --- a/src/crepe/api/Sprite.cpp +++ b/src/crepe/api/Sprite.cpp @@ -10,8 +10,8 @@ using namespace std; using namespace crepe; -Sprite::Sprite(game_object_id_t id, shared_ptr image, const Color & color, - const FlipSettings & flip) +Sprite::Sprite(game_object_id_t id, shared_ptr image, + const Color & color, const FlipSettings & flip) : Component(id), color(color), flip(flip), sprite_image(image) { dbg_trace(); } diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h index 28078cd..00dcb27 100644 --- a/src/crepe/api/Sprite.h +++ b/src/crepe/api/Sprite.h @@ -12,14 +12,15 @@ namespace crepe { struct FlipSettings { - bool flip_x = 1; - bool flip_y = 1; + bool flip_x = true; + bool flip_y = true; }; class Sprite : public Component { public: - Sprite(game_object_id_t id, std::shared_ptr image, const Color & color, const FlipSettings & flip); + Sprite(game_object_id_t id, std::shared_ptr image, + const Color & color, const FlipSettings & flip); ~Sprite(); std::shared_ptr sprite_image; Color color; diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp index a5f29ea..a244bc5 100644 --- a/src/crepe/api/Transform.cpp +++ b/src/crepe/api/Transform.cpp @@ -1,13 +1,11 @@ -#include - #include "util/log.h" #include "Transform.h" using namespace crepe; -Transform::Transform(game_object_id_t id, const Vector2 & point, double rot, - double scale) - : Component(id), position(point), rotation(rot), scale(scale) { +Transform::Transform(game_object_id_t id, const Vector2 & point, + double rotation, double scale) + : Component(id), position(point), rotation(rotation), scale(scale) { dbg_trace(); } diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h index 805553e..d7a5b8a 100644 --- a/src/crepe/api/Transform.h +++ b/src/crepe/api/Transform.h @@ -17,10 +17,10 @@ public: /** * \param id The id of the GameObject this component belongs to * \param point The position of the GameObject - * \param rot The rotation of the GameObject + * \param rotation The rotation of the GameObject * \param scale The scale of the GameObject */ - Transform(game_object_id_t id, const Vector2 & point, double rot, + Transform(game_object_id_t id, const Vector2 & point, double rotation, double scale); /** * \brief Get the maximum number of instances for this component diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp index 1bd2171..eb54ad3 100644 --- a/src/crepe/system/PhysicsSystem.cpp +++ b/src/crepe/system/PhysicsSystem.cpp @@ -20,7 +20,7 @@ void PhysicsSystem::update() { double gravity = Config::get_instance().physics.gravity; for (Rigidbody & rigidbody : rigidbodies) { if (!rigidbody.active) continue; - + switch (rigidbody.data.body_type) { case Rigidbody::BodyType::DYNAMIC: for (Transform & transform : transforms) { diff --git a/src/crepe/types.h b/src/crepe/types.h index 5ae2c81..0d459e8 100644 --- a/src/crepe/types.h +++ b/src/crepe/types.h @@ -7,4 +7,3 @@ namespace crepe { typedef uint32_t game_object_id_t; } - diff --git a/src/example/physics.cpp b/src/example/physics.cpp index a7e94f6..848f857 100644 --- a/src/example/physics.cpp +++ b/src/example/physics.cpp @@ -11,7 +11,7 @@ using namespace std; int main(int argc, char * argv[]) { GameObject * game_object; game_object = new GameObject(0, "Name", "Tag", Vector2{0, 0}, 0, 0); - game_object->add_component(Rigidbody::RigidbodyData{ + game_object->add_component(Rigidbody::Data{ .mass = 1, .gravity_scale = 1, .body_type = Rigidbody::BodyType::DYNAMIC, diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp index 6b8c4d8..5385962 100644 --- a/src/test/PhysicsTest.cpp +++ b/src/test/PhysicsTest.cpp @@ -20,7 +20,7 @@ protected: = mgr.get_components_by_id(0); if (transforms.empty()) { game_object = new GameObject(0, "", "", Vector2{0, 0}, 0, 0); - game_object->add_component(Rigidbody::RigidbodyData{ + game_object->add_component(Rigidbody::Data{ .mass = 1, .gravity_scale = 1, .body_type = Rigidbody::BodyType::DYNAMIC, @@ -28,7 +28,8 @@ protected: .max_angular_velocity = 10, .constraints = {0, 0}, .use_gravity = true, - .bounce = false}); + .bounce = false, + }); } transforms = mgr.get_components_by_id(0); Transform & transform = transforms.front().get(); -- cgit v1.2.3