diff options
author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-12 18:30:06 +0100 |
---|---|---|
committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-12 18:30:06 +0100 |
commit | 63f99aa1971095f1cb475e29bc2fa9ed7fb8e0f1 (patch) | |
tree | 563eeccbcc41558dd085a0c423ed433d54111008 /mwe/events/include | |
parent | 3c9b331668189e9c1a35d3d6ac6ded601f725e78 (diff) | |
parent | d9130d78738b6cb1bdc4e7ec65362b0ef46b1035 (diff) |
Merge branch 'master' into niels/cleanup
Diffstat (limited to 'mwe/events/include')
-rw-r--r-- | mwe/events/include/customTypes.h | 4 | ||||
-rw-r--r-- | mwe/events/include/eventHandler.h | 3 |
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; } |