Merge branch 'master' into niels/RenderingParticle

11 files changed, 65 insertions, 20 deletions

diff --git a/mwe/ecs-homemade/src/Components.cpp b/mwe/ecs-homemade/src/Components.cpp
index de8753e..0d62bd5 100644
--- a/mwe/ecs-homemade/src/Components.cpp
+++ b/mwe/ecs-homemade/src/Components.cpp
@@ -6,7 +6,9 @@ Component::Component() : mActive(true) {}
 Sprite::Sprite(std::string path) : mPath(path) {}
 
 Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
-	: mMass(mass), mGravityScale(gravityScale), mBodyType(bodyType) {}
+	: mMass(mass),
+	  mGravityScale(gravityScale),
+	  mBodyType(bodyType) {}
 
 Colider::Colider(int size) : mSize(size) {}
 
diff --git a/mwe/ecs-homemade/src/GameObjectMax.cpp b/mwe/ecs-homemade/src/GameObjectMax.cpp
index b0c5af7..753c8e2 100644
--- a/mwe/ecs-homemade/src/GameObjectMax.cpp
+++ b/mwe/ecs-homemade/src/GameObjectMax.cpp
@@ -4,4 +4,8 @@
 
 GameObject::GameObject(std::uint32_t id, std::string name, std::string tag,
 					   int layer)
-	: mId(id), mName(name), mTag(tag), mActive(true), mLayer(layer) {}
+	: mId(id),
+	  mName(name),
+	  mTag(tag),
+	  mActive(true),
+	  mLayer(layer) {}
diff --git a/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp b/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp
index 408d5aa..ff8fde4 100644
--- a/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp
+++ b/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp
@@ -1,5 +1,6 @@
 template <typename T>
-ContiguousContainer<T>::ContiguousContainer() : mSize(0), mCapacity(10) {
+ContiguousContainer<T>::ContiguousContainer() : mSize(0),
+												mCapacity(10) {
 	// Allocate memory for 10 objects initially
 	mData = static_cast<T *>(malloc(mCapacity * sizeof(T)));
 	if (!mData) {
diff --git a/mwe/ecs-memory-efficient/src/Components.cpp b/mwe/ecs-memory-efficient/src/Components.cpp
index c8347b3..2ec8609 100644
--- a/mwe/ecs-memory-efficient/src/Components.cpp
+++ b/mwe/ecs-memory-efficient/src/Components.cpp
@@ -6,6 +6,8 @@ Component::Component() : mActive(true) {}
 Sprite::Sprite(std::string path) : mPath(path) {}
 
 Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
-	: mMass(mass), mGravityScale(gravityScale), mBodyType(bodyType) {}
+	: mMass(mass),
+	  mGravityScale(gravityScale),
+	  mBodyType(bodyType) {}
 
 Colider::Colider(int size) : mSize(size) {}
diff --git a/mwe/ecs-memory-efficient/src/GameObjectMax.cpp b/mwe/ecs-memory-efficient/src/GameObjectMax.cpp
index b0c5af7..753c8e2 100644
--- a/mwe/ecs-memory-efficient/src/GameObjectMax.cpp
+++ b/mwe/ecs-memory-efficient/src/GameObjectMax.cpp
@@ -4,4 +4,8 @@
 
 GameObject::GameObject(std::uint32_t id, std::string name, std::string tag,
 					   int layer)
-	: mId(id), mName(name), mTag(tag), mActive(true), mLayer(layer) {}
+	: mId(id),
+	  mName(name),
+	  mTag(tag),
+	  mActive(true),
+	  mLayer(layer) {}
diff --git a/mwe/events/include/customTypes.h b/mwe/events/include/customTypes.h
index a5d8dc9..415b989 100644
--- a/mwe/events/include/customTypes.h
+++ b/mwe/events/include/customTypes.h
@@ -33,6 +33,8 @@ struct Collision {
 	// Constructor to initialize a Collision
 	Collision(int idA, int idB, const Vector2 & point, const Vector2 & normal,
 			  float depth)
-		: objectIdA(idA), objectIdB(idB), contactPoint(point),
+		: objectIdA(idA),
+		  objectIdB(idB),
+		  contactPoint(point),
 		  contactNormal(normal) {}
 };
diff --git a/mwe/events/include/eventHandler.h b/mwe/events/include/eventHandler.h
index aa8f63b..3a83b15 100644
--- a/mwe/events/include/eventHandler.h
+++ b/mwe/events/include/eventHandler.h
@@ -24,7 +24,8 @@ class EventHandlerWrapper : public IEventHandlerWrapper {
 public:
 	explicit EventHandlerWrapper(const EventHandler<EventType> & handler,
 								 const bool destroyOnSuccess = false)
-		: m_handler(handler), m_handlerType(m_handler.target_type().name()),
+		: m_handler(handler),
+		  m_handlerType(m_handler.target_type().name()),
 		  m_destroyOnSuccess(destroyOnSuccess) {
 		// std::cout << m_handlerType << std::endl;
 	}
diff --git a/mwe/events/src/event.cpp b/mwe/events/src/event.cpp
index 0c9f3ed..8ffa0b1 100644
--- a/mwe/events/src/event.cpp
+++ b/mwe/events/src/event.cpp
@@ -23,7 +23,9 @@ void Event::markHandled() { isHandled = true; }
 
 // KeyPressedEvent class methods
 KeyPressedEvent::KeyPressedEvent(int keycode)
-	: Event("KeyPressedEvent"), key(keycode), repeatCount(0) {}
+	: Event("KeyPressedEvent"),
+	  key(keycode),
+	  repeatCount(0) {}
 
 Keycode KeyPressedEvent::getKeyCode() const { return key; }
 
@@ -31,13 +33,16 @@ int KeyPressedEvent::getRepeatCount() const { return repeatCount; }
 
 // KeyReleasedEvent class methods
 KeyReleasedEvent::KeyReleasedEvent(int keycode)
-	: Event("KeyReleasedEvent"), key(keycode) {}
+	: Event("KeyReleasedEvent"),
+	  key(keycode) {}
 
 Keycode KeyReleasedEvent::getKeyCode() const { return key; }
 
 // MousePressedEvent class methods
 MousePressedEvent::MousePressedEvent(int mouseX, int mouseY)
-	: Event("MousePressedEvent"), mouseX(mouseX), mouseY(mouseY) {}
+	: Event("MousePressedEvent"),
+	  mouseX(mouseX),
+	  mouseY(mouseY) {}
 
 std::pair<int, int> MousePressedEvent::getMousePosition() const {
 	return {mouseX, mouseY};
@@ -45,26 +50,36 @@ std::pair<int, int> MousePressedEvent::getMousePosition() const {
 
 //Collision event
 CollisionEvent::CollisionEvent(Collision collision)
-	: collisionData(collision), Event("CollisionEvent") {}
+	: collisionData(collision),
+	  Event("CollisionEvent") {}
 
 Collision CollisionEvent::getCollisionData() const {
 	return this->collisionData;
 }
 
 TextSubmitEvent::TextSubmitEvent(std::string text)
-	: text(text), Event("TextSubmitEvent") {}
+	: text(text),
+	  Event("TextSubmitEvent") {}
 
 std::string TextSubmitEvent::getText() const { return this->text; }
 
 MouseReleasedEvent::MouseReleasedEvent(int x, int y, MouseButton button)
-	: mouseX(x), mouseY(y), button(button), Event("MouseReleased") {}
+	: mouseX(x),
+	  mouseY(y),
+	  button(button),
+	  Event("MouseReleased") {}
 std::pair<int, int> MouseReleasedEvent::getMousePosition() const {
 	return {mouseX, mouseY};
 }
 MouseClickEvent::MouseClickEvent(int x, int y, MouseButton button)
-	: mouseX(x), mouseY(y), button(button), Event("MouseClickEvent") {}
+	: mouseX(x),
+	  mouseY(y),
+	  button(button),
+	  Event("MouseClickEvent") {}
 MouseMovedEvent::MouseMovedEvent(int x, int y)
-	: mouseX(x), mouseY(y), Event("MouseMovedEvent") {}
+	: mouseX(x),
+	  mouseY(y),
+	  Event("MouseMovedEvent") {}
 std::pair<int, int> MouseClickEvent::getMousePosition() const {
 	return {mouseX, mouseY};
 }
diff --git a/mwe/events/src/main.cpp b/mwe/events/src/main.cpp
index d49cf74..f4e7390 100644
--- a/mwe/events/src/main.cpp
+++ b/mwe/events/src/main.cpp
@@ -11,7 +11,9 @@
 class PlayerDamagedEvent : public Event {
 public:
 	PlayerDamagedEvent(int damage, int playerID)
-		: Event("PlayerDamaged"), damage(damage), playerID(playerID) {}
+		: Event("PlayerDamaged"),
+		  damage(damage),
+		  playerID(playerID) {}
 
 	REGISTER_EVENT_TYPE(PlayerDamagedEvent);
 
diff --git a/mwe/events/src/uiObject.cpp b/mwe/events/src/uiObject.cpp
index 8405469..947d1a2 100644
--- a/mwe/events/src/uiObject.cpp
+++ b/mwe/events/src/uiObject.cpp
@@ -7,7 +7,9 @@ UIObject::UIObject(int width, int height) : width(width), height(height) {}
 Button::Button(int width, int height) : UIObject(width, height) {}
 
 Text::Text(int width, int height)
-	: UIObject(width, height), size(12), font(nullptr),
+	: UIObject(width, height),
+	  size(12),
+	  font(nullptr),
 	  color{255, 255, 255} { // Default size and color
 	alignment.horizontal = Alignment::Horizontal::CENTER;
 	alignment.vertical = Alignment::Vertical::MIDDLE;
@@ -15,8 +17,13 @@ Text::Text(int width, int height)
 }
 
 TextInput::TextInput(int width, int height)
-	: UIObject(width, height), textBuffer(""), placeholder(""), isActive(false),
-	  textColor{255, 255, 255}, backgroundColor{0, 0, 0}, maxLength(100),
+	: UIObject(width, height),
+	  textBuffer(""),
+	  placeholder(""),
+	  isActive(false),
+	  textColor{255, 255, 255},
+	  backgroundColor{0, 0, 0},
+	  maxLength(100),
 	  font(nullptr) {
 	alignment.horizontal = Alignment::Horizontal::LEFT;
 	alignment.vertical = Alignment::Vertical::TOP;
diff --git a/mwe/gameloop/src/gameObject.cpp b/mwe/gameloop/src/gameObject.cpp
index 78217c4..b33dc78 100644
--- a/mwe/gameloop/src/gameObject.cpp
+++ b/mwe/gameloop/src/gameObject.cpp
@@ -26,5 +26,10 @@ void GameObject::setVelY(float value) { velY = value; }
 
 GameObject::GameObject(std::string name, float x, float y, float width,
 					   float height, float velX, float velY)
-	: name(name), x(x), y(y), width(width), height(height), velX(velX),
+	: name(name),
+	  x(x),
+	  y(y),
+	  width(width),
+	  height(height),
+	  velX(velX),
 	  velY(velY) {}