aboutsummaryrefslogtreecommitdiff
path: root/mwe/events/include
diff options
context:
space:
mode:
authorWBoerenkamps <wrj.boerenkamps@student.avans.nl>2024-11-13 15:44:46 +0100
committerWBoerenkamps <wrj.boerenkamps@student.avans.nl>2024-11-13 15:44:46 +0100
commit2d07c0dc6bec17ea9f60d4c22669456f6aad52d7 (patch)
tree629d03f93390fec099840b563922fc99387f2278 /mwe/events/include
parent9ce53b197953e66189febeaa434255b848647993 (diff)
parentf2509e89c02894ebd3ad992324eb300103621d26 (diff)
Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/events
Diffstat (limited to 'mwe/events/include')
-rw-r--r--mwe/events/include/customTypes.h4
-rw-r--r--mwe/events/include/eventHandler.h3
2 files changed, 5 insertions, 2 deletions
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;
}