aboutsummaryrefslogtreecommitdiff
path: root/mwe/ecs-homemade/src
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-11-15 20:39:07 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-11-15 20:39:07 +0100
commite8cd950b8ebd152d76d588d4fedc7f4c239b0835 (patch)
tree7919d13a79d52f1365bc19bf1b435a6264ee5512 /mwe/ecs-homemade/src
parent5bee4515c1089ce3499bc3b74780db94f0c02306 (diff)
parent9f6475e7b0698c414138e2a8140b47f01ce9c5d1 (diff)
merge `master` into `loek/cleanup`
Diffstat (limited to 'mwe/ecs-homemade/src')
-rw-r--r--mwe/ecs-homemade/src/ComponentManager.cpp3
-rw-r--r--mwe/ecs-homemade/src/GameObjectMax.cpp3
-rw-r--r--mwe/ecs-homemade/src/main.cpp11
3 files changed, 7 insertions, 10 deletions
diff --git a/mwe/ecs-homemade/src/ComponentManager.cpp b/mwe/ecs-homemade/src/ComponentManager.cpp
index 536c152..33ba12e 100644
--- a/mwe/ecs-homemade/src/ComponentManager.cpp
+++ b/mwe/ecs-homemade/src/ComponentManager.cpp
@@ -12,8 +12,7 @@ void ComponentManager::DeleteAllComponentsOfId(std::uint32_t id) {
if (id
< componentArray
.size()) { //Make sure that the id (that we are looking for) is within the boundaries of the vector<>
- componentArray[id]
- .clear(); //Clear the components at this specific id
+ componentArray[id].clear(); //Clear the components at this specific id
}
}
}
diff --git a/mwe/ecs-homemade/src/GameObjectMax.cpp b/mwe/ecs-homemade/src/GameObjectMax.cpp
index 753c8e2..0516f68 100644
--- a/mwe/ecs-homemade/src/GameObjectMax.cpp
+++ b/mwe/ecs-homemade/src/GameObjectMax.cpp
@@ -2,8 +2,7 @@
#include "ComponentManager.h"
-GameObject::GameObject(std::uint32_t id, std::string name, std::string tag,
- int layer)
+GameObject::GameObject(std::uint32_t id, std::string name, std::string tag, int layer)
: mId(id),
mName(name),
mTag(tag),
diff --git a/mwe/ecs-homemade/src/main.cpp b/mwe/ecs-homemade/src/main.cpp
index 70c5d2c..85ab1f1 100644
--- a/mwe/ecs-homemade/src/main.cpp
+++ b/mwe/ecs-homemade/src/main.cpp
@@ -53,8 +53,7 @@ int main() {
}
std::vector<std::reference_wrapper<BehaviourScript>> scripts
- = ComponentManager::GetInstance()
- .GetComponentsByType<BehaviourScript>();
+ = ComponentManager::GetInstance().GetComponentsByType<BehaviourScript>();
for (BehaviourScript & script : scripts) {
//script.onStart();
//script.onUpdate();
@@ -66,10 +65,10 @@ int main() {
delete gameObject[i];
}
- auto Addtime = std::chrono::duration_cast<std::chrono::microseconds>(
- stopAdding - startAdding);
- auto LoopTime = std::chrono::duration_cast<std::chrono::microseconds>(
- stopLooping - stopAdding);
+ auto Addtime
+ = std::chrono::duration_cast<std::chrono::microseconds>(stopAdding - startAdding);
+ auto LoopTime
+ = std::chrono::duration_cast<std::chrono::microseconds>(stopLooping - stopAdding);
std::cout << "AddTime: " << Addtime.count() << " us" << std::endl;
std::cout << "LoopTime: " << LoopTime.count() << " us" << std::endl;
}