merge with master and keypressed added to game

1 files changed, 18 insertions, 7 deletions

diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h
index 152bc2c..f2f3daf 100644
--- a/src/crepe/api/Event.h
+++ b/src/crepe/api/Event.h
@@ -3,8 +3,6 @@
 
 #include <string>
 
-#include "system/CollisionSystem.h"
-
 #include "KeyCodes.h"
 
 namespace crepe {
@@ -90,16 +88,29 @@ public:
 
 	//! Y-coordinate of the mouse position at the time of the event.
 	int mouse_y = 0;
+
+	// Movement since last event in x
+	int delta_x = 0;
+
+	// Movement since last event in y
+	int delta_y = 0;
 };
 
 /**
- * \brief Event triggered during a collision between objects.
+ * \brief Event triggered when the mouse is moved.
  */
-class CollisionEvent : public Event {
+class MouseScrollEvent : public Event {
 public:
-	crepe::CollisionSystem::CollisionInfo info;
-	CollisionEvent(const crepe::CollisionSystem::CollisionInfo & collisionInfo)
-		: info(collisionInfo) {}
+	//! X-coordinate of the mouse position at the time of the event.
+	int mouse_x = 0;
+
+	//! Y-coordinate of the mouse position at the time of the event.
+	int mouse_y = 0;
+
+	//! scroll direction (-1 = down, 1 = up)
+	int scroll_direction = 0;
+	//! scroll amount in y axis (from and away from the person).
+	float scroll_delta = 0;
 };
 
 /**