Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/events-poc

1 files changed, 37 insertions, 20 deletions

diff --git a/mwe/events/src/main.cpp b/mwe/events/src/main.cpp
index 8fd6d10..972fc70 100644
--- a/mwe/events/src/main.cpp
+++ b/mwe/events/src/main.cpp
@@ -1,3 +1,4 @@
+#include "customTypes.h"
 #include "event.h"
 #include "loopManager.h"
 #include <SDL2/SDL.h>
@@ -17,9 +18,9 @@ public:
 
 	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;
@@ -29,22 +30,22 @@ void onPlayerDamaged(const PlayerDamagedEvent & e) {
 			  << " damage." << std::endl;
 }
 
-void onKeyPressed1(const KeyPressedEvent& e)
-{
-   int keyCode = e.getKeyCode();
-	fprintf(stderr,"first function KeyCode %d\n",keyCode);
+void onKeyPressed1(const KeyPressedEvent & e) {
+	int keyCode = e.getKeyCode();
+	fprintf(stderr, "first function KeyCode %d\n", keyCode);
 }
-void onKeyPressed(const KeyPressedEvent& e)
-{
-   int keyCode = e.getKeyCode();
-	fprintf(stderr,"second function KeyCode %d\n",keyCode);
+void onKeyPressed(const KeyPressedEvent & e) {
+	int keyCode = e.getKeyCode();
+	fprintf(stderr, "second function KeyCode %d\n", keyCode);
 }
-void CollisionHandler(const CollisionEvent& e){
-	std::cout << "collision between object id: "<< e.getCollisionData().objectIdA << " and id: " << e.getCollisionData().objectIdB << std::endl;
+void CollisionHandler(const CollisionEvent & e) {
+	std::cout << "collision betwee object id: "
+			  << e.getCollisionData().objectIdA
+			  << " and id: " << e.getCollisionData().objectIdB << std::endl;
 }
 void testCollisionEvent() {
 	Collision testCollision(1, 2, {3, 4}, {5, 6}, 7.8f);
-	subscribe<CollisionEvent>(CollisionHandler,1);
+	subscribe<CollisionEvent>(CollisionHandler, 1);
 	// EventHandler<PlayerDamagedEvent>
 	triggerEvent(CollisionEvent(testCollision), 1);
 }
@@ -56,16 +57,32 @@ int main(int argc, char * args[]) {
 	// custom event class poc
 	subscribe<PlayerDamagedEvent>(onPlayerDamaged);
 	triggerEvent(PlayerDamagedEvent(50, 1));
-    subscribe<KeyPressedEvent>(onKeyPressed,1,false);
-    subscribe<KeyPressedEvent>(onKeyPressed1,false);
-    // queueEvent(std::move(anotherKeyPressEvent));
-    triggerEvent(KeyPressedEvent(42), 1);
-	
+	subscribe<KeyPressedEvent>(onKeyPressed, 1, false);
+	subscribe<KeyPressedEvent>(onKeyPressed1, false);
+	// queueEvent(std::move(anotherKeyPressEvent));
+	triggerEvent(KeyPressedEvent(42), 1);
+
 	EventManager::getInstance().dispatchEvents();
 	//collision event call
 	testCollisionEvent();
-	
+
 	gameLoop.setup();
 	gameLoop.loop();
 	return 0;
 }
+// void collisionUpdate(){
+// 	int count;
+// 	//iedere collision
+// 	for (int i = 0; i < count; i++)
+// 	{
+// 		//trigger object 1
+// 		//triger object 2
+// 		triggerEvent(CollisionEvent(1,2),1);
+// 		triggerEvent(CollisionEvent(1,2),2);
+// 	}
+
+// }
+// int main(){
+
+// 	return 0;
+// }