aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormax-001 <maxsmits21@kpnmail.nl>2024-11-07 12:33:37 +0100
committermax-001 <maxsmits21@kpnmail.nl>2024-11-07 12:33:37 +0100
commit96ef24654d2ee26184ebcb5b9092649e67afe5d9 (patch)
tree3149f522a7390a2f7ff98c2b7cc494cf2a69a0a0
parentcd0940f72e1e0d4abb0bc1ef5fb481b389a1f77a (diff)
Made game_object_id const
-rw-r--r--src/crepe/Component.cpp2
-rw-r--r--src/crepe/Component.h2
-rw-r--r--src/crepe/api/Script.hpp2
-rw-r--r--src/crepe/system/PhysicsSystem.cpp4
-rw-r--r--src/crepe/system/RenderSystem.cpp2
-rw-r--r--src/example/ecs.cpp4
-rw-r--r--src/example/scene_manager.cpp4
7 files changed, 10 insertions, 10 deletions
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 <typename T>
std::vector<std::reference_wrapper<T>> Script::get_components() {
ComponentManager & mgr = ComponentManager::get_instance();
- return mgr.get_components_by_id<T>(this->parent->game_object_id);
+ return mgr.get_components_by_id<T>(this->parent->GAME_OBJECT_ID);
}
} // namespace crepe
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<std::reference_wrapper<Force>> forces
= mgr.get_components_by_id<Force>(
- 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<std::reference_wrapper<Transform>> transforms
- = mgr.get_components_by_id<Transform>(sprite.game_object_id);
+ = mgr.get_components_by_id<Transform>(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;
}