Merge remote-tracking branch 'origin/master' into niels/rendering_color

3 files changed, 8 insertions, 12 deletions

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;
 }