aboutsummaryrefslogtreecommitdiff
path: root/mwe
diff options
context:
space:
mode:
Diffstat (limited to 'mwe')
-rw-r--r--mwe/events/include/event.h82
-rw-r--r--mwe/events/include/eventHandler.h50
-rw-r--r--mwe/events/include/eventManager.h81
-rw-r--r--mwe/events/include/keyCodes.h248
-rw-r--r--mwe/events/include/loopManager.h5
-rw-r--r--mwe/events/src/event.cpp48
-rw-r--r--mwe/events/src/eventHandler.cpp5
-rw-r--r--mwe/events/src/eventManager.cpp231
-rw-r--r--mwe/events/src/keyCodes.cpp247
-rw-r--r--mwe/events/src/loopManager.cpp45
-rw-r--r--mwe/events/src/main.cpp49
-rw-r--r--mwe/events/src/timer.cpp3
-rw-r--r--mwe/events/src/window.cpp3
-rw-r--r--mwe/gameloop/include/eventManager.h4
-rw-r--r--mwe/gameloop/include/loopManager.h2
15 files changed, 569 insertions, 534 deletions
diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index 802140c..5eef32f 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -1,87 +1,91 @@
#pragma once
+#include "keyCodes.h"
#include <cstdint>
#include <iostream>
#include <string>
#include <unordered_map>
#include <variant>
-#include "keyCodes.h"
class UUIDGenerator {
public:
- static std::uint32_t getUniqueID() {
- static std::uint32_t id = 0;
- return ++id;
- }
+ static std::uint32_t getUniqueID() {
+ static std::uint32_t id = 0;
+ return ++id;
+ }
};
#define REGISTER_EVENT_TYPE(ClassName) \
+\
public: \
- static std::uint32_t getStaticEventType() { \
- static std::uint32_t typeID = UUIDGenerator::getUniqueID(); \
- return typeID; \
- } \
- virtual std::uint32_t getEventType() const override { \
- return getStaticEventType(); \
- }
+ static std::uint32_t getStaticEventType() { \
+ static std::uint32_t typeID = UUIDGenerator::getUniqueID(); \
+ return typeID; \
+ } \
+ virtual std::uint32_t getEventType() const override { \
+ return getStaticEventType(); \
+ }
class Event {
public:
- Event(std::string eventType);
- virtual ~Event() = default;
- virtual std::uint32_t getEventType() const = 0;
- virtual std::string toString() const;
- void addArgument(const std::string& key, const std::variant<int, std::string, float>& value);
+ Event(std::string eventType);
+ virtual ~Event() = default;
+ virtual std::uint32_t getEventType() const = 0;
+ virtual std::string toString() const;
+ 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();
+ std::string getType() const;
+ bool getHandled() const;
+ void markHandled();
private:
- std::unordered_map<std::string, std::variant<int, std::string, float>> eventData;
- bool isHandled = false;
+ std::unordered_map<std::string, std::variant<int, std::string, float>>
+ eventData;
+ bool isHandled = false;
};
// KeyPressedEvent class
class KeyPressedEvent : public Event {
public:
- KeyPressedEvent(int keyCode);
+ KeyPressedEvent(int keyCode);
- REGISTER_EVENT_TYPE("KeyPressedEvent");
+ REGISTER_EVENT_TYPE("KeyPressedEvent");
- Keycode getKeyCode() const;
- int getRepeatCount() const;
+ Keycode getKeyCode() const;
+ int getRepeatCount() const;
private:
- Keycode keycode;
+ Keycode keycode;
public:
- Keycode key = 0;
- int repeatCount = 0;
+ Keycode key = 0;
+ int repeatCount = 0;
};
// KeyReleasedEvent class
class KeyReleasedEvent : public Event {
public:
- KeyReleasedEvent(int keyCode);
+ KeyReleasedEvent(int keyCode);
- REGISTER_EVENT_TYPE(KeyReleasedEvent);
+ REGISTER_EVENT_TYPE(KeyReleasedEvent);
- Keycode getKeyCode() const;
+ Keycode getKeyCode() const;
private:
- Keycode key = 0;
+ Keycode key = 0;
};
// MousePressedEvent class
class MousePressedEvent : public Event {
public:
- MousePressedEvent(int mouseX, int mouseY);
+ MousePressedEvent(int mouseX, int mouseY);
- REGISTER_EVENT_TYPE(MousePressedEvent)
+ REGISTER_EVENT_TYPE(MousePressedEvent)
- std::pair<int, int> getMousePosition() const;
+ std::pair<int, int> getMousePosition() const;
private:
- int mouseX = 0;
- int mouseY = 0;
+ int mouseX = 0;
+ int mouseY = 0;
};
diff --git a/mwe/events/include/eventHandler.h b/mwe/events/include/eventHandler.h
index e5b99d6..7414801 100644
--- a/mwe/events/include/eventHandler.h
+++ b/mwe/events/include/eventHandler.h
@@ -4,45 +4,43 @@
#include <functional>
#include <iostream>
-template<typename EventType>
-using EventHandler = std::function<void(const EventType& e)>;
+template <typename EventType>
+using EventHandler = std::function<void(const EventType & e)>;
class IEventHandlerWrapper {
public:
- virtual ~IEventHandlerWrapper() = default;
+ virtual ~IEventHandlerWrapper() = default;
- void exec(const Event& e);
+ void exec(const Event & e);
- virtual std::string getType() const = 0;
- virtual bool isDestroyOnSuccess() const = 0;
+ virtual std::string getType() const = 0;
+ virtual bool isDestroyOnSuccess() const = 0;
private:
- virtual void call(const Event& e) = 0;
+ virtual void call(const Event & e) = 0;
};
-template<typename EventType>
+template <typename EventType>
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_destroyOnSuccess(destroyOnSuccess)
- {
+ explicit EventHandlerWrapper(const EventHandler<EventType> & handler,
+ const bool destroyOnSuccess = false)
+ : m_handler(handler), m_handlerType(m_handler.target_type().name()),
+ m_destroyOnSuccess(destroyOnSuccess) {
// std::cout << m_handlerType << std::endl;
}
private:
- void call(const Event& e) override
- {
- if (e.getEventType() == EventType::getStaticEventType()) {
- m_handler(static_cast<const EventType&>(e));
- }
- }
-
- std::string getType() const override { return m_handlerType; }
- bool isDestroyOnSuccess() const { return m_destroyOnSuccess; }
-
- EventHandler<EventType> m_handler;
- const std::string m_handlerType;
- bool m_destroyOnSuccess { false };
+ void call(const Event & e) override {
+ if (e.getEventType() == EventType::getStaticEventType()) {
+ m_handler(static_cast<const EventType &>(e));
+ }
+ }
+
+ std::string getType() const override { return m_handlerType; }
+ bool isDestroyOnSuccess() const { return m_destroyOnSuccess; }
+
+ EventHandler<EventType> m_handler;
+ const std::string m_handlerType;
+ bool m_destroyOnSuccess{false};
};
diff --git a/mwe/events/include/eventManager.h b/mwe/events/include/eventManager.h
index 709796a..af41b82 100644
--- a/mwe/events/include/eventManager.h
+++ b/mwe/events/include/eventManager.h
@@ -1,57 +1,66 @@
#pragma once
-#include <unordered_map>
-#include <memory>
#include "event.h"
-#include "keyCodes.h"
#include "eventHandler.h"
+#include "keyCodes.h"
+#include <memory>
+#include <unordered_map>
#include <vector>
// using EventType = std::uint32_t;
// using EventId = std::uint64_t;
class EventManager {
public:
- EventManager(const EventManager&) = delete;
- const EventManager& operator=(const EventManager&) = delete;
- static EventManager& getInstance() {
- static EventManager instance;
- return instance;
- }
+ EventManager(const EventManager &) = delete;
+ const EventManager & operator=(const EventManager &) = delete;
+ static EventManager & getInstance() {
+ static EventManager instance;
+ return instance;
+ }
- void shutdown();
- void subscribe(int eventType, std::unique_ptr<IEventHandlerWrapper>&& handler, 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();
+ void shutdown();
+ void subscribe(int eventType,
+ std::unique_ptr<IEventHandlerWrapper> && handler,
+ 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();
private:
- EventManager() = default;
- std::vector<std::pair<std::unique_ptr<Event>, int>> m_eventsQueue;
- std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> m_subscribers;
- std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>> m_subscribersByEventId;
+ EventManager() = default;
+ std::vector<std::pair<std::unique_ptr<Event>, int>> m_eventsQueue;
+ std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>
+ m_subscribers;
+ std::unordered_map<
+ int, std::unordered_map<
+ int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>
+ m_subscribersByEventId;
};
-
-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);
+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);
}
-template<typename EventType>
-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);
+template <typename EventType>
+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);
}
-inline void triggerEvent(const Event& triggeredEvent, int eventId = 0)
-{
- EventManager::getInstance().triggerEvent(triggeredEvent, eventId);
+inline void triggerEvent(const Event & triggeredEvent, int eventId = 0) {
+ EventManager::getInstance().triggerEvent(triggeredEvent, eventId);
}
-inline void queueEvent(std::unique_ptr<Event>&& queuedEvent, int eventId = 0)
-{
- EventManager::getInstance().queueEvent(std::forward<std::unique_ptr<Event>>(queuedEvent), eventId);
+inline void queueEvent(std::unique_ptr<Event> && queuedEvent, int eventId = 0) {
+ EventManager::getInstance().queueEvent(
+ std::forward<std::unique_ptr<Event>>(queuedEvent), eventId);
}
diff --git a/mwe/events/include/keyCodes.h b/mwe/events/include/keyCodes.h
index c3a7826..0879efc 100644
--- a/mwe/events/include/keyCodes.h
+++ b/mwe/events/include/keyCodes.h
@@ -1,140 +1,140 @@
#pragma once
+#include <SDL2/SDL.h>
#include <cstdint>
#include <unordered_map>
-#include <SDL2/SDL.h>
using Keycode = uint16_t;
enum : Keycode {
- // From glfw3.h
- Space = 32,
- Apostrophe = 39, /* ' */
- Comma = 44, /* , */
- Minus = 45, /* - */
- Period = 46, /* . */
- Slash = 47, /* / */
+ // From glfw3.h
+ Space = 32,
+ Apostrophe = 39, /* ' */
+ Comma = 44, /* , */
+ Minus = 45, /* - */
+ Period = 46, /* . */
+ Slash = 47, /* / */
- D0 = 48, /* 0 */
- D1 = 49, /* 1 */
- D2 = 50, /* 2 */
- D3 = 51, /* 3 */
- D4 = 52, /* 4 */
- D5 = 53, /* 5 */
- D6 = 54, /* 6 */
- D7 = 55, /* 7 */
- D8 = 56, /* 8 */
- D9 = 57, /* 9 */
+ D0 = 48, /* 0 */
+ D1 = 49, /* 1 */
+ D2 = 50, /* 2 */
+ D3 = 51, /* 3 */
+ D4 = 52, /* 4 */
+ D5 = 53, /* 5 */
+ D6 = 54, /* 6 */
+ D7 = 55, /* 7 */
+ D8 = 56, /* 8 */
+ D9 = 57, /* 9 */
- Semicolon = 59, /* ; */
- Equal = 61, /* = */
+ Semicolon = 59, /* ; */
+ Equal = 61, /* = */
- A = 65,
- B = 66,
- C = 67,
- D = 68,
- E = 69,
- F = 70,
- G = 71,
- H = 72,
- I = 73,
- J = 74,
- K = 75,
- L = 76,
- M = 77,
- N = 78,
- O = 79,
- P = 80,
- Q = 81,
- R = 82,
- S = 83,
- T = 84,
- U = 85,
- V = 86,
- W = 87,
- X = 88,
- Y = 89,
- Z = 90,
+ A = 65,
+ B = 66,
+ C = 67,
+ D = 68,
+ E = 69,
+ F = 70,
+ G = 71,
+ H = 72,
+ I = 73,
+ J = 74,
+ K = 75,
+ L = 76,
+ M = 77,
+ N = 78,
+ O = 79,
+ P = 80,
+ Q = 81,
+ R = 82,
+ S = 83,
+ T = 84,
+ U = 85,
+ V = 86,
+ W = 87,
+ X = 88,
+ Y = 89,
+ Z = 90,
- LeftBracket = 91, /* [ */
- Backslash = 92, /* \ */
- RightBracket = 93, /* ] */
- GraveAccent = 96, /* ` */
+ LeftBracket = 91, /* [ */
+ Backslash = 92, /* \ */
+ RightBracket = 93, /* ] */
+ GraveAccent = 96, /* ` */
- World1 = 161, /* non-US #1 */
- World2 = 162, /* non-US #2 */
+ World1 = 161, /* non-US #1 */
+ World2 = 162, /* non-US #2 */
- /* Function keys */
- Escape = 256,
- Enter = 257,
- Tab = 258,
- Backspace = 259,
- Insert = 260,
- Delete = 261,
- Right = 262,
- Left = 263,
- Down = 264,
- Up = 265,
- PageUp = 266,
- PageDown = 267,
- Home = 268,
- End = 269,
- CapsLock = 280,
- ScrollLock = 281,
- NumLock = 282,
- PrintScreen = 283,
- Pause = 284,
- F1 = 290,
- F2 = 291,
- F3 = 292,
- F4 = 293,
- F5 = 294,
- F6 = 295,
- F7 = 296,
- F8 = 297,
- F9 = 298,
- F10 = 299,
- F11 = 300,
- F12 = 301,
- F13 = 302,
- F14 = 303,
- F15 = 304,
- F16 = 305,
- F17 = 306,
- F18 = 307,
- F19 = 308,
- F20 = 309,
- F21 = 310,
- F22 = 311,
- F23 = 312,
- F24 = 313,
- F25 = 314,
+ /* Function keys */
+ Escape = 256,
+ Enter = 257,
+ Tab = 258,
+ Backspace = 259,
+ Insert = 260,
+ Delete = 261,
+ Right = 262,
+ Left = 263,
+ Down = 264,
+ Up = 265,
+ PageUp = 266,
+ PageDown = 267,
+ Home = 268,
+ End = 269,
+ CapsLock = 280,
+ ScrollLock = 281,
+ NumLock = 282,
+ PrintScreen = 283,
+ Pause = 284,
+ F1 = 290,
+ F2 = 291,
+ F3 = 292,
+ F4 = 293,
+ F5 = 294,
+ F6 = 295,
+ F7 = 296,
+ F8 = 297,
+ F9 = 298,
+ F10 = 299,
+ F11 = 300,
+ F12 = 301,
+ F13 = 302,
+ F14 = 303,
+ F15 = 304,
+ F16 = 305,
+ F17 = 306,
+ F18 = 307,
+ F19 = 308,
+ F20 = 309,
+ F21 = 310,
+ F22 = 311,
+ F23 = 312,
+ F24 = 313,
+ F25 = 314,
- /* Keypad */
- KP0 = 320,
- KP1 = 321,
- KP2 = 322,
- KP3 = 323,
- KP4 = 324,
- KP5 = 325,
- KP6 = 326,
- KP7 = 327,
- KP8 = 328,
- KP9 = 329,
- KPDecimal = 330,
- KPDivide = 331,
- KPMultiply = 332,
- KPSubtract = 333,
- KPAdd = 334,
- KPEnter = 335,
- KPEqual = 336,
+ /* Keypad */
+ KP0 = 320,
+ KP1 = 321,
+ KP2 = 322,
+ KP3 = 323,
+ KP4 = 324,
+ KP5 = 325,
+ KP6 = 326,
+ KP7 = 327,
+ KP8 = 328,
+ KP9 = 329,
+ KPDecimal = 330,
+ KPDivide = 331,
+ KPMultiply = 332,
+ KPSubtract = 333,
+ KPAdd = 334,
+ KPEnter = 335,
+ KPEqual = 336,
- LeftShift = 340,
- LeftControl = 341,
- LeftAlt = 342,
- LeftSuper = 343,
- RightShift = 344,
- RightControl = 345,
- RightAlt = 346,
- RightSuper = 347,
- Menu = 348
+ LeftShift = 340,
+ LeftControl = 341,
+ LeftAlt = 342,
+ LeftSuper = 343,
+ RightShift = 344,
+ RightControl = 345,
+ RightAlt = 346,
+ RightSuper = 347,
+ Menu = 348
};
// Define the mapping
extern const std::unordered_map<SDL_Keycode, Keycode> sdlToCustom;
diff --git a/mwe/events/include/loopManager.h b/mwe/events/include/loopManager.h
index 5c519d9..baffb94 100644
--- a/mwe/events/include/loopManager.h
+++ b/mwe/events/include/loopManager.h
@@ -1,17 +1,18 @@
#pragma once
+#include "timer.h"
#include "window.h"
#include <SDL2/SDL.h>
-#include "timer.h"
//#include "combinedEvent.h"
+#include "eventHandler.h"
#include "eventManager.h"
#include "loopManager.h"
-#include "eventHandler.h"
class LoopManager {
public:
LoopManager();
void setup();
void loop();
void setRunning(bool running);
+
private:
void processInput();
void update();
diff --git a/mwe/events/src/event.cpp b/mwe/events/src/event.cpp
index fecae76..c0ae9ed 100644
--- a/mwe/events/src/event.cpp
+++ b/mwe/events/src/event.cpp
@@ -1,56 +1,44 @@
#include "event.h"
#include "keyCodes.h"
// Event class methods
-Event::Event(std::string eventType) {
- eventData["eventType"] = eventType;
-}
+Event::Event(std::string eventType) { eventData["eventType"] = eventType; }
-void Event::addArgument(const std::string& key, const std::variant<int, std::string, float>& value) {
- eventData[key] = value;
+void Event::addArgument(const std::string & key,
+ const std::variant<int, std::string, float> & value) {
+ eventData[key] = value;
}
-std::variant<int, std::string, float> Event::getArgument(const std::string& key) const {
- return eventData.at(key);
+std::variant<int, std::string, float>
+Event::getArgument(const std::string & key) const {
+ return eventData.at(key);
}
std::string Event::getType() const {
- return std::get<std::string>(eventData.at("eventType"));
-}
-std::string Event::toString() const {
- return std::to_string(getEventType());
-}
-bool Event::getHandled() const {
- return isHandled;
+ return std::get<std::string>(eventData.at("eventType"));
}
+std::string Event::toString() const { return std::to_string(getEventType()); }
+bool Event::getHandled() const { return isHandled; }
-void Event::markHandled() {
- isHandled = true;
-}
+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;
-}
+Keycode KeyPressedEvent::getKeyCode() const { return key; }
-int KeyPressedEvent::getRepeatCount() const {
- return repeatCount;
-}
+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;
-}
+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};
+ return {mouseX, mouseY};
}
diff --git a/mwe/events/src/eventHandler.cpp b/mwe/events/src/eventHandler.cpp
index 7040d8d..7fb8d70 100644
--- a/mwe/events/src/eventHandler.cpp
+++ b/mwe/events/src/eventHandler.cpp
@@ -1,5 +1,2 @@
#include "eventHandler.h"
-void IEventHandlerWrapper::exec(const Event& e)
- {
- call(e);
- }
+void IEventHandlerWrapper::exec(const Event & e) { call(e); }
diff --git a/mwe/events/src/eventManager.cpp b/mwe/events/src/eventManager.cpp
index ce8e940..2aef89d 100644
--- a/mwe/events/src/eventManager.cpp
+++ b/mwe/events/src/eventManager.cpp
@@ -1,109 +1,152 @@
#include "eventManager.h"
-void EventManager::shutdown()
-{
- m_subscribers.clear();
-}
+void EventManager::shutdown() { m_subscribers.clear(); }
-void EventManager::subscribe(int eventType, std::unique_ptr<IEventHandlerWrapper>&& handler, int eventId)
-{
- if (eventId) {
- std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::iterator subscribers = m_subscribersByEventId.find(eventType);
+void EventManager::subscribe(int eventType,
+ std::unique_ptr<IEventHandlerWrapper> && handler,
+ int eventId) {
+ if (eventId) {
+ std::unordered_map<
+ int, std::unordered_map<
+ int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::
+ iterator subscribers
+ = m_subscribersByEventId.find(eventType);
- if (subscribers != m_subscribersByEventId.end()) {
- std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>& handlersMap = subscribers->second;
- std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlers = handlersMap.find(eventId);
- if (handlers != handlersMap.end()) {
- handlers->second.emplace_back(std::move(handler));
- return;
- }
- }
- m_subscribersByEventId[eventType][eventId].emplace_back(std::move(handler));
+ if (subscribers != m_subscribersByEventId.end()) {
+ std::unordered_map<
+ int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> &
+ handlersMap
+ = subscribers->second;
+ std::unordered_map<
+ int,
+ std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator
+ handlers
+ = handlersMap.find(eventId);
+ if (handlers != handlersMap.end()) {
+ handlers->second.emplace_back(std::move(handler));
+ return;
+ }
+ }
+ m_subscribersByEventId[eventType][eventId].emplace_back(
+ std::move(handler));
- } else {
- std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator subscribers = m_subscribers.find(eventType);
- if (subscribers != m_subscribers.end()) {
- std::vector<std::unique_ptr<IEventHandlerWrapper>>& handlers = subscribers->second;
- for (std::unique_ptr<IEventHandlerWrapper>& it : handlers) {
- if (it->getType() == handler->getType()) {
- // log for double register
- return;
- }
- }
- handlers.emplace_back(std::move(handler));
- } else {
- m_subscribers[eventType].emplace_back(std::move(handler));
- }
- }
+ } else {
+ std::unordered_map<
+ int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator
+ subscribers
+ = m_subscribers.find(eventType);
+ if (subscribers != m_subscribers.end()) {
+ std::vector<std::unique_ptr<IEventHandlerWrapper>> & handlers
+ = subscribers->second;
+ for (std::unique_ptr<IEventHandlerWrapper> & it : handlers) {
+ if (it->getType() == handler->getType()) {
+ // log for double register
+ return;
+ }
+ }
+ handlers.emplace_back(std::move(handler));
+ } else {
+ m_subscribers[eventType].emplace_back(std::move(handler));
+ }
+ }
}
-void EventManager::unsubscribe(int eventType, const std::string& handlerName, int eventId)
-{
- if (eventId) {
- std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::iterator subscribers = m_subscribersByEventId.find(eventType);
- if (subscribers != m_subscribersByEventId.end()) {
- std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>& handlersMap = subscribers->second;
- std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlers = handlersMap.find(eventId);
- if (handlers != handlersMap.end()) {
- std::vector<std::unique_ptr<IEventHandlerWrapper>>& callbacks = handlers->second;
- for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it = callbacks.begin(); it != callbacks.end(); ++it) {
- if (it->get()->getType() == handlerName) {
- it = callbacks.erase(it);
- return;
- }
- }
- }
- }
- } else {
- std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlersIt = m_subscribers.find(eventType);
- if (handlersIt != m_subscribers.end()) {
- std::vector<std::unique_ptr<IEventHandlerWrapper>>& handlers = handlersIt->second;
- for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it = handlers.begin(); it != handlers.end(); ++it) {
- if (it->get()->getType() == handlerName) {
- it = handlers.erase(it);
- return;
- }
- }
- }
- }
+void EventManager::unsubscribe(int eventType, const std::string & handlerName,
+ int eventId) {
+ if (eventId) {
+ std::unordered_map<
+ int, std::unordered_map<
+ int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::
+ iterator subscribers
+ = m_subscribersByEventId.find(eventType);
+ if (subscribers != m_subscribersByEventId.end()) {
+ std::unordered_map<
+ int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> &
+ handlersMap
+ = subscribers->second;
+ std::unordered_map<
+ int,
+ std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator
+ handlers
+ = handlersMap.find(eventId);
+ if (handlers != handlersMap.end()) {
+ std::vector<std::unique_ptr<IEventHandlerWrapper>> & callbacks
+ = handlers->second;
+ for (std::vector<
+ std::unique_ptr<IEventHandlerWrapper>>::iterator it
+ = callbacks.begin();
+ it != callbacks.end(); ++it) {
+ if (it->get()->getType() == handlerName) {
+ it = callbacks.erase(it);
+ return;
+ }
+ }
+ }
+ }
+ } else {
+ std::unordered_map<
+ int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator
+ handlersIt
+ = m_subscribers.find(eventType);
+ if (handlersIt != m_subscribers.end()) {
+ std::vector<std::unique_ptr<IEventHandlerWrapper>> & handlers
+ = handlersIt->second;
+ for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it
+ = handlers.begin();
+ it != handlers.end(); ++it) {
+ if (it->get()->getType() == handlerName) {
+ it = handlers.erase(it);
+ return;
+ }
+ }
+ }
+ }
}
-void EventManager::triggerEvent(const Event& event_, int eventId)
-{
- std::vector<std::unique_ptr<IEventHandlerWrapper>>& handlers = m_subscribers[event_.getEventType()];
- for (std::unique_ptr<IEventHandlerWrapper>& handler : handlers) {
- handler->exec(event_);
- }
+void EventManager::triggerEvent(const Event & event_, int eventId) {
+ std::vector<std::unique_ptr<IEventHandlerWrapper>> & handlers
+ = m_subscribers[event_.getEventType()];
+ for (std::unique_ptr<IEventHandlerWrapper> & handler : handlers) {
+ handler->exec(event_);
+ }
- std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>& handlersMap = m_subscribersByEventId[event_.getEventType()];
- std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlersIt = handlersMap.find(eventId);
- if (handlersIt != handlersMap.end()) {
- std::vector<std::unique_ptr<IEventHandlerWrapper>>& callbacks = handlersIt->second;
- for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it = callbacks.begin(); it != callbacks.end();) {
- std::unique_ptr<IEventHandlerWrapper>& handler = *it;
- handler->exec(event_);
- if (handler->isDestroyOnSuccess()) {
- it = callbacks.erase(it);
- } else {
- ++it;
- }
- }
- }
+ std::unordered_map<
+ int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> & handlersMap
+ = m_subscribersByEventId[event_.getEventType()];
+ std::unordered_map<
+ int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator
+ handlersIt
+ = handlersMap.find(eventId);
+ if (handlersIt != handlersMap.end()) {
+ std::vector<std::unique_ptr<IEventHandlerWrapper>> & callbacks
+ = handlersIt->second;
+ for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it
+ = callbacks.begin();
+ it != callbacks.end();) {
+ std::unique_ptr<IEventHandlerWrapper> & handler = *it;
+ handler->exec(event_);
+ if (handler->isDestroyOnSuccess()) {
+ it = callbacks.erase(it);
+ } else {
+ ++it;
+ }
+ }
+ }
}
-void EventManager::queueEvent(std::unique_ptr<Event>&& event_, int eventId)
-{
- m_eventsQueue.emplace_back(std::move(event_), eventId);
+void EventManager::queueEvent(std::unique_ptr<Event> && event_, int eventId) {
+ m_eventsQueue.emplace_back(std::move(event_), eventId);
}
-void EventManager::dispatchEvents()
-{
- for (std::vector<std::pair<std::unique_ptr<Event>, int>>::iterator eventIt = m_eventsQueue.begin(); eventIt != m_eventsQueue.end();) {
- if (!eventIt->first.get()->getHandled()) {
- triggerEvent(*eventIt->first.get(), eventIt->second);
- eventIt = m_eventsQueue.erase(eventIt);
- } else {
- ++eventIt;
- }
- }
+void EventManager::dispatchEvents() {
+ for (std::vector<std::pair<std::unique_ptr<Event>, int>>::iterator eventIt
+ = m_eventsQueue.begin();
+ eventIt != m_eventsQueue.end();) {
+ if (!eventIt->first.get()->getHandled()) {
+ triggerEvent(*eventIt->first.get(), eventIt->second);
+ eventIt = m_eventsQueue.erase(eventIt);
+ } else {
+ ++eventIt;
+ }
+ }
}
diff --git a/mwe/events/src/keyCodes.cpp b/mwe/events/src/keyCodes.cpp
index 6f35d11..5f3aa96 100644
--- a/mwe/events/src/keyCodes.cpp
+++ b/mwe/events/src/keyCodes.cpp
@@ -1,140 +1,139 @@
#include "keyCodes.h"
-const std::unordered_map<SDL_Keycode, Keycode> sdlToCustom = {
- { SDLK_SPACE, Space },
- { SDLK_QUOTE, Apostrophe },
- { SDLK_COMMA, Comma },
- { SDLK_MINUS, Minus },
- { SDLK_PERIOD, Period },
- { SDLK_SLASH, Slash },
+const std::unordered_map<SDL_Keycode, Keycode> sdlToCustom
+ = {{SDLK_SPACE, Space},
+ {SDLK_QUOTE, Apostrophe},
+ {SDLK_COMMA, Comma},
+ {SDLK_MINUS, Minus},
+ {SDLK_PERIOD, Period},
+ {SDLK_SLASH, Slash},
- { SDLK_0, D0 },
- { SDLK_1, D1 },
- { SDLK_2, D2 },
- { SDLK_3, D3 },
- { SDLK_4, D4 },
- { SDLK_5, D5 },
- { SDLK_6, D6 },
- { SDLK_7, D7 },
- { SDLK_8, D8 },
- { SDLK_9, D9 },
+ {SDLK_0, D0},
+ {SDLK_1, D1},
+ {SDLK_2, D2},
+ {SDLK_3, D3},
+ {SDLK_4, D4},
+ {SDLK_5, D5},
+ {SDLK_6, D6},
+ {SDLK_7, D7},
+ {SDLK_8, D8},
+ {SDLK_9, D9},
- { SDLK_SEMICOLON, Semicolon },
- { SDLK_EQUALS, Equal },
+ {SDLK_SEMICOLON, Semicolon},
+ {SDLK_EQUALS, Equal},
- { SDLK_a, A },
- { SDLK_b, B },
- { SDLK_c, C },
- { SDLK_d, D },
- { SDLK_e, E },
- { SDLK_f, F },
- { SDLK_g, G },
- { SDLK_h, H },
- { SDLK_i, I },
- { SDLK_j, J },
- { SDLK_k, K },
- { SDLK_l, L },
- { SDLK_m, M },
- { SDLK_n, N },
- { SDLK_o, O },
- { SDLK_p, P },
- { SDLK_q, Q },
- { SDLK_r, R },
- { SDLK_s, S },
- { SDLK_t, T },
- { SDLK_u, U },
- { SDLK_v, V },
- { SDLK_w, W },
- { SDLK_x, X },
- { SDLK_y, Y },
- { SDLK_z, Z },
+ {SDLK_a, A},
+ {SDLK_b, B},
+ {SDLK_c, C},
+ {SDLK_d, D},
+ {SDLK_e, E},
+ {SDLK_f, F},
+ {SDLK_g, G},
+ {SDLK_h, H},
+ {SDLK_i, I},
+ {SDLK_j, J},
+ {SDLK_k, K},
+ {SDLK_l, L},
+ {SDLK_m, M},
+ {SDLK_n, N},
+ {SDLK_o, O},
+ {SDLK_p, P},
+ {SDLK_q, Q},
+ {SDLK_r, R},
+ {SDLK_s, S},
+ {SDLK_t, T},
+ {SDLK_u, U},
+ {SDLK_v, V},
+ {SDLK_w, W},
+ {SDLK_x, X},
+ {SDLK_y, Y},
+ {SDLK_z, Z},
- { SDLK_LEFTBRACKET, LeftBracket },
- { SDLK_BACKSLASH, Backslash },
- { SDLK_RIGHTBRACKET, RightBracket },
- { SDLK_BACKQUOTE, GraveAccent },
+ {SDLK_LEFTBRACKET, LeftBracket},
+ {SDLK_BACKSLASH, Backslash},
+ {SDLK_RIGHTBRACKET, RightBracket},
+ {SDLK_BACKQUOTE, GraveAccent},
- { SDLK_ESCAPE, Escape },
- { SDLK_RETURN, Enter },
- { SDLK_TAB, Tab },
- { SDLK_BACKSPACE, Backspace },
- { SDLK_INSERT, Insert },
- { SDLK_DELETE, Delete },
- { SDLK_RIGHT, Right },
- { SDLK_LEFT, Left },
- { SDLK_DOWN, Down },
- { SDLK_UP, Up },
- { SDLK_PAGEUP, PageUp },
- { SDLK_PAGEDOWN, PageDown },
- { SDLK_HOME, Home },
- { SDLK_END, End },
+ {SDLK_ESCAPE, Escape},
+ {SDLK_RETURN, Enter},
+ {SDLK_TAB, Tab},
+ {SDLK_BACKSPACE, Backspace},
+ {SDLK_INSERT, Insert},
+ {SDLK_DELETE, Delete},
+ {SDLK_RIGHT, Right},
+ {SDLK_LEFT, Left},
+ {SDLK_DOWN, Down},
+ {SDLK_UP, Up},
+ {SDLK_PAGEUP, PageUp},
+ {SDLK_PAGEDOWN, PageDown},
+ {SDLK_HOME, Home},
+ {SDLK_END, End},
- { SDLK_CAPSLOCK, CapsLock },
- { SDLK_SCROLLLOCK, ScrollLock },
- { SDLK_NUMLOCKCLEAR, NumLock },
- { SDLK_PRINTSCREEN, PrintScreen },
- { SDLK_PAUSE, Pause },
+ {SDLK_CAPSLOCK, CapsLock},
+ {SDLK_SCROLLLOCK, ScrollLock},
+ {SDLK_NUMLOCKCLEAR, NumLock},
+ {SDLK_PRINTSCREEN, PrintScreen},
+ {SDLK_PAUSE, Pause},
- { SDLK_F1, F1 },
- { SDLK_F2, F2 },
- { SDLK_F3, F3 },
- { SDLK_F4, F4 },
- { SDLK_F5, F5 },
- { SDLK_F6, F6 },
- { SDLK_F7, F7 },
- { SDLK_F8, F8 },
- { SDLK_F9, F9 },
- { SDLK_F10, F10 },
- { SDLK_F11, F11 },
- { SDLK_F12, F12 },
- { SDLK_F13, F13 },
- { SDLK_F14, F14 },
- { SDLK_F15, F15 },
- { SDLK_F16, F16 },
- { SDLK_F17, F17 },
- { SDLK_F18, F18 },
- { SDLK_F19, F19 },
- { SDLK_F20, F20 },
- { SDLK_F21, F21 },
- { SDLK_F22, F22 },
- { SDLK_F23, F23 },
- { SDLK_F24, F24 },
+ {SDLK_F1, F1},
+ {SDLK_F2, F2},
+ {SDLK_F3, F3},
+ {SDLK_F4, F4},
+ {SDLK_F5, F5},
+ {SDLK_F6, F6},
+ {SDLK_F7, F7},
+ {SDLK_F8, F8},
+ {SDLK_F9, F9},
+ {SDLK_F10, F10},
+ {SDLK_F11, F11},
+ {SDLK_F12, F12},
+ {SDLK_F13, F13},
+ {SDLK_F14, F14},
+ {SDLK_F15, F15},
+ {SDLK_F16, F16},
+ {SDLK_F17, F17},
+ {SDLK_F18, F18},
+ {SDLK_F19, F19},
+ {SDLK_F20, F20},
+ {SDLK_F21, F21},
+ {SDLK_F22, F22},
+ {SDLK_F23, F23},
+ {SDLK_F24, F24},
- { SDLK_KP_0, KP0 },
- { SDLK_KP_1, KP1 },
- { SDLK_KP_2, KP2 },
- { SDLK_KP_3, KP3 },
- { SDLK_KP_4, KP4 },
- { SDLK_KP_5, KP5 },
- { SDLK_KP_6, KP6 },
- { SDLK_KP_7, KP7 },
- { SDLK_KP_8, KP8 },
- { SDLK_KP_9, KP9 },
+ {SDLK_KP_0, KP0},
+ {SDLK_KP_1, KP1},
+ {SDLK_KP_2, KP2},
+ {SDLK_KP_3, KP3},
+ {SDLK_KP_4, KP4},
+ {SDLK_KP_5, KP5},
+ {SDLK_KP_6, KP6},
+ {SDLK_KP_7, KP7},
+ {SDLK_KP_8, KP8},
+ {SDLK_KP_9, KP9},
- { SDLK_KP_DECIMAL, KPDecimal },
- { SDLK_KP_DIVIDE, KPDivide },
- { SDLK_KP_MULTIPLY, KPMultiply },
- { SDLK_KP_MINUS, KPSubtract },
- { SDLK_KP_PLUS, KPAdd },
- { SDLK_KP_ENTER, KPEnter },
- { SDLK_KP_EQUALS, KPEqual },
+ {SDLK_KP_DECIMAL, KPDecimal},
+ {SDLK_KP_DIVIDE, KPDivide},
+ {SDLK_KP_MULTIPLY, KPMultiply},
+ {SDLK_KP_MINUS, KPSubtract},
+ {SDLK_KP_PLUS, KPAdd},
+ {SDLK_KP_ENTER, KPEnter},
+ {SDLK_KP_EQUALS, KPEqual},
- { SDLK_LSHIFT, LeftShift },
- { SDLK_LCTRL, LeftControl },
- { SDLK_LALT, LeftAlt },
- { SDLK_LGUI, LeftSuper },
+ {SDLK_LSHIFT, LeftShift},
+ {SDLK_LCTRL, LeftControl},
+ {SDLK_LALT, LeftAlt},
+ {SDLK_LGUI, LeftSuper},
- { SDLK_RSHIFT, RightShift },
- { SDLK_RCTRL, RightControl },
- { SDLK_RALT, RightAlt },
- { SDLK_RGUI, RightSuper },
+ {SDLK_RSHIFT, RightShift},
+ {SDLK_RCTRL, RightControl},
+ {SDLK_RALT, RightAlt},
+ {SDLK_RGUI, RightSuper},
- { SDLK_MENU, Menu }
-};
+ {SDLK_MENU, Menu}};
Keycode getCustomKey(SDL_Keycode sdlKey) {
- auto it = sdlToCustom.find(sdlKey);
- if (it != sdlToCustom.end()) {
- return it->second;
- }
- return 0;
+ auto it = sdlToCustom.find(sdlKey);
+ if (it != sdlToCustom.end()) {
+ return it->second;
+ }
+ return 0;
}
diff --git a/mwe/events/src/loopManager.cpp b/mwe/events/src/loopManager.cpp
index 6defda0..8ecb932 100644
--- a/mwe/events/src/loopManager.cpp
+++ b/mwe/events/src/loopManager.cpp
@@ -12,17 +12,15 @@ void LoopManager::processInput() {
triggerEvent(KeyPressedEvent(getCustomKey(event.key.keysym.sym)));
break;
case SDL_MOUSEBUTTONDOWN:
- int x, y;
- SDL_GetMouseState(&x, &y);
- triggerEvent(MousePressedEvent(x, y));
- break;
+ int x, y;
+ SDL_GetMouseState(&x, &y);
+ triggerEvent(MousePressedEvent(x, y));
+ break;
}
}
-void LoopManager::setRunning(bool running){
- this->gameRunning = running;
-}
-void LoopManager::fixedUpdate() {
- //fprintf(stderr, "fixed update\n");
+void LoopManager::setRunning(bool running) { this->gameRunning = running; }
+void LoopManager::fixedUpdate() {
+ //fprintf(stderr, "fixed update\n");
}
void LoopManager::loop() {
LoopTimer & timer = LoopTimer::getInstance();
@@ -45,30 +43,29 @@ void LoopManager::loop() {
window.destroyWindow();
}
-void onKey(const KeyPressedEvent& e)
-{
- int keyCode = e.getKeyCode();
+void onKey(const KeyPressedEvent & e) {
+ int keyCode = e.getKeyCode();
std::cout << "keycode pressed: " << keyCode << std::endl;
-
}
-void onMouse(const MousePressedEvent& e){
- fprintf(stderr, "mouse Position X: %d Y: %d\n", e.getMousePosition().first, e.getMousePosition().second);
+void onMouse(const MousePressedEvent & e) {
+ fprintf(stderr, "mouse Position X: %d Y: %d\n", e.getMousePosition().first,
+ e.getMousePosition().second);
}
void LoopManager::setup() {
gameRunning = window.initWindow();
LoopTimer::getInstance().start();
LoopTimer::getInstance().setFPS(50);
EventHandler<KeyPressedEvent> callback = onKey;
- subscribe<KeyPressedEvent>(callback,false);
+ subscribe<KeyPressedEvent>(callback, false);
EventHandler<MousePressedEvent> mouseCallback = onMouse;
- subscribe<MousePressedEvent>(mouseCallback ,false);
- EventHandler<KeyPressedEvent> closeWindowCallback = [this](const KeyPressedEvent& e) {
- if(e.getKeyCode() == Escape){
- this->setRunning(false);
- }
- };
- subscribe<KeyPressedEvent>(closeWindowCallback,false);
-
+ subscribe<MousePressedEvent>(mouseCallback, false);
+ EventHandler<KeyPressedEvent> closeWindowCallback
+ = [this](const KeyPressedEvent & e) {
+ if (e.getKeyCode() == Escape) {
+ this->setRunning(false);
+ }
+ };
+ subscribe<KeyPressedEvent>(closeWindowCallback, false);
}
void LoopManager::render() {
//fprintf(stderr, "**********render********** \n");
diff --git a/mwe/events/src/main.cpp b/mwe/events/src/main.cpp
index 3940c60..55c562f 100644
--- a/mwe/events/src/main.cpp
+++ b/mwe/events/src/main.cpp
@@ -1,50 +1,51 @@
+#include "event.h"
+#include "loopManager.h"
#include <SDL2/SDL.h>
#include <iostream>
#include <memory>
-#include "loopManager.h"
-#include "event.h"
class PlayerDamagedEvent : public Event {
public:
- PlayerDamagedEvent(int damage, int playerID)
- : Event("PlayerDamaged"), damage(damage), playerID(playerID) {}
+ PlayerDamagedEvent(int damage, int playerID)
+ : Event("PlayerDamaged"), damage(damage), playerID(playerID) {}
- REGISTER_EVENT_TYPE(PlayerDamagedEvent);
+ REGISTER_EVENT_TYPE(PlayerDamagedEvent);
- int getDamage() const { return damage; }
- int getPlayerID() const { return playerID; }
+ int getDamage() const { return damage; }
+ int getPlayerID() const { return playerID; }
private:
- int damage;
- int playerID;
+ int damage;
+ int playerID;
};
-void onPlayerDamaged(const PlayerDamagedEvent& e) {
- std::cout << "Player " << e.getPlayerID() << " took " << e.getDamage() << " damage." << std::endl;
+void onPlayerDamaged(const PlayerDamagedEvent & e) {
+ std::cout << "Player " << e.getPlayerID() << " took " << e.getDamage()
+ << " damage." << std::endl;
}
-void onKeyPressed(const KeyPressedEvent& e)
-{
- const int keyCode = e.getKeyCode();
- fprintf(stderr,"KeyCode %d\n",keyCode);
+void onKeyPressed(const KeyPressedEvent & e) {
+ const int keyCode = e.getKeyCode();
+ fprintf(stderr, "KeyCode %d\n", keyCode);
}
-int main(int argc, char* args[]) {
+int main(int argc, char * args[]) {
LoopManager gameLoop;
// Create an event handler for KeyPressedEvent
- // EventHandler<KeyPressedEvent> callback = [](const KeyPressedEvent& e) {
- // onKeyPressed(e);
- // };
+ // EventHandler<KeyPressedEvent> callback = [](const KeyPressedEvent& e) {
+ // onKeyPressed(e);
+ // };
// custom event class poc
EventHandler<PlayerDamagedEvent> playerDamagedHandler = onPlayerDamaged;
subscribe<PlayerDamagedEvent>(playerDamagedHandler);
triggerEvent(PlayerDamagedEvent(50, 1));
//EventHandler<KeyPressedEvent> callback = onKeyPressed;
- //subscribe<KeyPressedEvent>(callback,false);
- std::unique_ptr<Event> anotherKeyPressEvent = std::make_unique<KeyPressedEvent>(65);
- queueEvent(std::move(anotherKeyPressEvent));
- triggerEvent(KeyPressedEvent(42));
+ //subscribe<KeyPressedEvent>(callback,false);
+ std::unique_ptr<Event> anotherKeyPressEvent
+ = std::make_unique<KeyPressedEvent>(65);
+ queueEvent(std::move(anotherKeyPressEvent));
+ triggerEvent(KeyPressedEvent(42));
EventManager::getInstance().dispatchEvents();
gameLoop.setup();
gameLoop.loop();
- return 0;
+ return 0;
}
diff --git a/mwe/events/src/timer.cpp b/mwe/events/src/timer.cpp
index f4fee23..0b89bf5 100644
--- a/mwe/events/src/timer.cpp
+++ b/mwe/events/src/timer.cpp
@@ -16,8 +16,7 @@ void LoopTimer::start() {
// Update the timer, calculate deltaTime
void LoopTimer::update() {
uint64_t currentFrameTime = SDL_GetTicks64();
- deltaTime
- = (currentFrameTime - lastFrameTime) / 1000.0;
+ deltaTime = (currentFrameTime - lastFrameTime) / 1000.0;
if (deltaTime > maximumDeltaTime) {
deltaTime = maximumDeltaTime;
diff --git a/mwe/events/src/window.cpp b/mwe/events/src/window.cpp
index 9cafd57..41eb85f 100644
--- a/mwe/events/src/window.cpp
+++ b/mwe/events/src/window.cpp
@@ -1,6 +1,5 @@
#include "window.h"
-WindowManager::WindowManager() {
-}
+WindowManager::WindowManager() {}
WindowManager::~WindowManager() { destroyWindow(); }
SDL_Renderer * WindowManager::getRenderer() { return renderer; }
diff --git a/mwe/gameloop/include/eventManager.h b/mwe/gameloop/include/eventManager.h
index ba1ca32..a1b9f92 100644
--- a/mwe/gameloop/include/eventManager.h
+++ b/mwe/gameloop/include/eventManager.h
@@ -1,5 +1,5 @@
#pragma once
class EventManager {
- public:
- EventManager();
+public:
+ EventManager();
};
diff --git a/mwe/gameloop/include/loopManager.h b/mwe/gameloop/include/loopManager.h
index dcbfedc..1befb69 100644
--- a/mwe/gameloop/include/loopManager.h
+++ b/mwe/gameloop/include/loopManager.h
@@ -1,8 +1,8 @@
#pragma once
+#include "event.h"
#include "gameObject.h"
#include "window.h"
#include <SDL2/SDL.h>
-#include "event.h"
class LoopManager {
public:
LoopManager();