aboutsummaryrefslogtreecommitdiff
path: root/mwe/ecs-memory-efficient
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-11-16 21:45:36 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-11-16 21:45:36 +0100
commit73598a9e7f49047d74ca439cb0f300099d8c03bf (patch)
treeef62148ac6769f169670a1e7f7fd8482045ef65f /mwe/ecs-memory-efficient
parentd258fcc8efdb6a968a220c4590a204292a16ad42 (diff)
parent121b64b1cb6cfead5814070c8b0185d3d7308095 (diff)
merge `master` into `loek/audio`
Diffstat (limited to 'mwe/ecs-memory-efficient')
-rw-r--r--mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp3
-rw-r--r--mwe/ecs-memory-efficient/inc/GameObjectMax.hpp9
-rw-r--r--mwe/ecs-memory-efficient/src/ComponentManager.cpp9
-rw-r--r--mwe/ecs-memory-efficient/src/GameObjectMax.cpp3
-rw-r--r--mwe/ecs-memory-efficient/src/main.cpp8
5 files changed, 12 insertions, 20 deletions
diff --git a/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp b/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp
index ff8fde4..fa95952 100644
--- a/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp
+++ b/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp
@@ -54,8 +54,7 @@ size_t ContiguousContainer<T>::getSize() const {
// Function that returns a vector of references to all stored objects
template <typename T>
-std::vector<std::reference_wrapper<T>>
-ContiguousContainer<T>::getAllReferences() {
+std::vector<std::reference_wrapper<T>> ContiguousContainer<T>::getAllReferences() {
std::vector<std::reference_wrapper<T>> references;
references.reserve(mSize); // Reserve space to avoid reallocation
for (size_t i = 0; i < mSize; ++i) {
diff --git a/mwe/ecs-memory-efficient/inc/GameObjectMax.hpp b/mwe/ecs-memory-efficient/inc/GameObjectMax.hpp
index be3ffa2..909b4be 100644
--- a/mwe/ecs-memory-efficient/inc/GameObjectMax.hpp
+++ b/mwe/ecs-memory-efficient/inc/GameObjectMax.hpp
@@ -2,18 +2,15 @@
template <typename... Args>
void GameObject::addSpriteComponent(Args &&... args) {
- ComponentManager::GetInstance().addSpriteComponent(
- std::forward<Args>(args)...);
+ ComponentManager::GetInstance().addSpriteComponent(std::forward<Args>(args)...);
}
template <typename... Args>
void GameObject::addRigidbodyComponent(Args &&... args) {
- ComponentManager::GetInstance().addRigidbodyComponent(
- std::forward<Args>(args)...);
+ ComponentManager::GetInstance().addRigidbodyComponent(std::forward<Args>(args)...);
}
template <typename... Args>
void GameObject::addColiderComponent(Args &&... args) {
- ComponentManager::GetInstance().addColiderComponent(
- std::forward<Args>(args)...);
+ ComponentManager::GetInstance().addColiderComponent(std::forward<Args>(args)...);
}
diff --git a/mwe/ecs-memory-efficient/src/ComponentManager.cpp b/mwe/ecs-memory-efficient/src/ComponentManager.cpp
index 8c1fd23..e7a8866 100644
--- a/mwe/ecs-memory-efficient/src/ComponentManager.cpp
+++ b/mwe/ecs-memory-efficient/src/ComponentManager.cpp
@@ -6,17 +6,14 @@ ComponentManager & ComponentManager::GetInstance() { return mInstance; }
ComponentManager::ComponentManager() {}
-std::vector<std::reference_wrapper<Sprite>>
-ComponentManager::getAllSpriteReferences() {
+std::vector<std::reference_wrapper<Sprite>> ComponentManager::getAllSpriteReferences() {
return mSpriteContainer.getAllReferences();
}
-std::vector<std::reference_wrapper<Rigidbody>>
-ComponentManager::getAllRigidbodyReferences() {
+std::vector<std::reference_wrapper<Rigidbody>> ComponentManager::getAllRigidbodyReferences() {
return mRigidbodyContainer.getAllReferences();
}
-std::vector<std::reference_wrapper<Colider>>
-ComponentManager::getAllColiderReferences() {
+std::vector<std::reference_wrapper<Colider>> ComponentManager::getAllColiderReferences() {
return mColiderContainer.getAllReferences();
}
diff --git a/mwe/ecs-memory-efficient/src/GameObjectMax.cpp b/mwe/ecs-memory-efficient/src/GameObjectMax.cpp
index 753c8e2..0516f68 100644
--- a/mwe/ecs-memory-efficient/src/GameObjectMax.cpp
+++ b/mwe/ecs-memory-efficient/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-memory-efficient/src/main.cpp b/mwe/ecs-memory-efficient/src/main.cpp
index 9c6f2aa..b564b8c 100644
--- a/mwe/ecs-memory-efficient/src/main.cpp
+++ b/mwe/ecs-memory-efficient/src/main.cpp
@@ -50,10 +50,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;
}