Work in progress

khromatizo · Nov 22, 2023 · bb99400 · bb99400
1 parent 41c8d8f
commit bb99400
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,8 +32,8 @@ endif()
 if (${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
   # target_link_libraries(${PROJECT_NAME} "--profiling")
   # target_link_libraries(${PROJECT_NAME} "-s RUNTIME_DEBUG")
-  # target_link_libraries(${PROJECT_NAME} "-s ASSERTIONS=1")
-  # target_link_libraries(${PROJECT_NAME} "-s NO_DISABLE_EXCEPTION_CATCHING")
+  target_link_libraries(${PROJECT_NAME} "-s ASSERTIONS=1")
+  target_link_libraries(${PROJECT_NAME} "-s NO_DISABLE_EXCEPTION_CATCHING")
 
   target_link_libraries(${PROJECT_NAME} "-s ALLOW_MEMORY_GROWTH=1")
   target_link_libraries(${PROJECT_NAME} "-s INITIAL_MEMORY=134217728")

diff --git a/src/engine.cpp b/src/engine.cpp
@@ -121,7 +121,7 @@ void engine::_loop() {
   const auto now = SDL_GetTicks();
 
   _resourcemanager->update();
-  _eventmanager->update();
+  // _eventmanager->update();
   _entitymanager->update();
   _renderer->begin();
   _entitymanager->draw();

diff --git a/src/eventmanager.cpp b/src/eventmanager.cpp
@@ -6,28 +6,27 @@
 using namespace input;
 
 void eventmanager::update() {
-  // SDL_Event event;
-
-  // SDL_PollEvent(&event);
-
-  // while (SDL_PollEvent(&event)) {
-  //  switch (event.type) {
-  //  case SDL_QUIT:
-  //    std::for_each(_receivers.begin(), _receivers.end(),
-  //                  std::bind(&eventreceiver::on_quit, std::placeholders::_1));
-  //    break;
-
-  // case SDL_KEYDOWN:
-  //   std::for_each(_receivers.begin(), _receivers.end(),
-  //                 std::bind(&eventreceiver::on_keydown, std::placeholders::_1, keyevent(event.key.keysym.sym)));
-  //   break;
-
-  // case SDL_KEYUP:
-  //   std::for_each(_receivers.begin(), _receivers.end(),
-  //                 std::bind(&eventreceiver::on_keyup, std::placeholders::_1, keyevent(event.key.keysym.sym)));
-  //   break;
-  // }
-  //}
+  SDL_FlushEvents(SDL_FIRSTEVENT, SDL_LASTEVENT);
+
+  SDL_Event event;
+  while (SDL_PollEvent(&event)) {
+    switch (event.type) {
+    case SDL_QUIT:
+      std::for_each(_receivers.begin(), _receivers.end(),
+                    std::bind(&eventreceiver::on_quit, std::placeholders::_1));
+      break;
+
+    case SDL_KEYDOWN:
+      std::for_each(_receivers.begin(), _receivers.end(),
+                    std::bind(&eventreceiver::on_keydown, std::placeholders::_1, keyevent(event.key.keysym.sym)));
+      break;
+
+    case SDL_KEYUP:
+      std::for_each(_receivers.begin(), _receivers.end(),
+                    std::bind(&eventreceiver::on_keyup, std::placeholders::_1, keyevent(event.key.keysym.sym)));
+      break;
+    }
+  }
 }
 
 void eventmanager::add_receiver(std::shared_ptr<eventreceiver> receiver) {