aboutsummaryrefslogtreecommitdiff
path: root/mwe/events/include
diff options
context:
space:
mode:
Diffstat (limited to 'mwe/events/include')
-rw-r--r--mwe/events/include/customTypes.h11
-rw-r--r--mwe/events/include/event.h10
-rw-r--r--mwe/events/include/eventManager.h30
3 files changed, 18 insertions, 33 deletions
diff --git a/mwe/events/include/customTypes.h b/mwe/events/include/customTypes.h
index 415b989..5a7851b 100644
--- a/mwe/events/include/customTypes.h
+++ b/mwe/events/include/customTypes.h
@@ -5,14 +5,10 @@ struct Vector2 {
float y; // Y component of the vector
// Vector subtraction
- Vector2 operator-(const Vector2 & other) const {
- return {x - other.x, y - other.y};
- }
+ Vector2 operator-(const Vector2 & other) const { return {x - other.x, y - other.y}; }
// Vector addition
- Vector2 operator+(const Vector2 & other) const {
- return {x + other.x, y + other.y};
- }
+ Vector2 operator+(const Vector2 & other) const { return {x + other.x, y + other.y}; }
// Scalar multiplication
Vector2 operator*(float scalar) const { return {x * scalar, y * scalar}; }
@@ -31,8 +27,7 @@ struct Collision {
Vector2 contactNormal; // Normal vector at the contact point
// Constructor to initialize a Collision
- Collision(int idA, int idB, const Vector2 & point, const Vector2 & normal,
- float depth)
+ Collision(int idA, int idB, const Vector2 & point, const Vector2 & normal, float depth)
: objectIdA(idA),
objectIdB(idB),
contactPoint(point),
diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index 3e70201..e1b220b 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -20,9 +20,7 @@ public: \
static std::uint32_t typeID = UUIDGenerator::getUniqueID(); \
return typeID; \
} \
- virtual std::uint32_t getEventType() const override { \
- return getStaticEventType(); \
- }
+ virtual std::uint32_t getEventType() const override { return getStaticEventType(); }
class Event {
public:
Event(std::string eventType);
@@ -32,16 +30,14 @@ public:
void addArgument(const std::string & key,
const std::variant<int, std::string, float> & value);
- std::variant<int, std::string, float>
- getArgument(const std::string & key) const;
+ std::variant<int, std::string, float> getArgument(const std::string & key) const;
std::string getType() const;
bool getHandled() const;
void markHandled();
private:
- std::unordered_map<std::string, std::variant<int, std::string, float>>
- eventData;
+ std::unordered_map<std::string, std::variant<int, std::string, float>> eventData;
bool isHandled = false;
};
diff --git a/mwe/events/include/eventManager.h b/mwe/events/include/eventManager.h
index 508a5e2..30e927f 100644
--- a/mwe/events/include/eventManager.h
+++ b/mwe/events/include/eventManager.h
@@ -18,11 +18,9 @@ public:
}
void shutdown();
- void subscribe(int eventType,
- std::unique_ptr<IEventHandlerWrapper> && handler,
+ void subscribe(int eventType, std::unique_ptr<IEventHandlerWrapper> && handler,
int eventId);
- void unsubscribe(int eventType, const std::string & handlerName,
- int eventId);
+ void unsubscribe(int eventType, const std::string & handlerName, int eventId);
void triggerEvent(const Event & event_, int eventId);
void queueEvent(std::unique_ptr<Event> && event_, int eventId);
void dispatchEvents();
@@ -30,11 +28,9 @@ public:
private:
EventManager() = default;
std::vector<std::pair<std::unique_ptr<Event>, int>> eventsQueue;
- std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>
- subscribers;
+ std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> subscribers;
std::unordered_map<
- int, std::unordered_map<
- int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>
+ int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>
subscribersByEventId;
};
@@ -42,18 +38,16 @@ template <typename EventType>
inline void subscribe(const EventHandler<EventType> & callback, int eventId = 0,
const bool unsubscribeOnSuccess = false) {
std::unique_ptr<IEventHandlerWrapper> handler
- = std::make_unique<EventHandlerWrapper<EventType>>(
- callback, unsubscribeOnSuccess);
- EventManager::getInstance().subscribe(EventType::getStaticEventType(),
- std::move(handler), eventId);
+ = std::make_unique<EventHandlerWrapper<EventType>>(callback, unsubscribeOnSuccess);
+ EventManager::getInstance().subscribe(EventType::getStaticEventType(), std::move(handler),
+ eventId);
}
template <typename EventType>
-inline void unsubscribe(const EventHandler<EventType> & callback,
- int eventId = 0) {
+inline void unsubscribe(const EventHandler<EventType> & callback, int eventId = 0) {
const std::string handlerName = callback.target_type().name();
- EventManager::getInstance().unsubscribe(EventType::getStaticEventType(),
- handlerName, eventId);
+ EventManager::getInstance().unsubscribe(EventType::getStaticEventType(), handlerName,
+ eventId);
}
inline void triggerEvent(const Event & triggeredEvent, int eventId = 0) {
@@ -61,6 +55,6 @@ inline void triggerEvent(const Event & triggeredEvent, int eventId = 0) {
}
inline void queueEvent(std::unique_ptr<Event> && queuedEvent, int eventId = 0) {
- EventManager::getInstance().queueEvent(
- std::forward<std::unique_ptr<Event>>(queuedEvent), eventId);
+ EventManager::getInstance().queueEvent(std::forward<std::unique_ptr<Event>>(queuedEvent),
+ eventId);
}