From bc3c691eb067da8bc525ae23b6c9e489b5460851 Mon Sep 17 00:00:00 2001 From: milerius Date: Fri, 25 Oct 2019 13:33:01 +0200 Subject: [PATCH] fix: include flappy birds --- tutorials/flappy-bird/step_7/CMakeLists.txt | 2 +- tutorials/flappy-bird/step_7/flappy-bird.cpp | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tutorials/flappy-bird/step_7/CMakeLists.txt b/tutorials/flappy-bird/step_7/CMakeLists.txt index 924e77da..7fbdeb65 100644 --- a/tutorials/flappy-bird/step_7/CMakeLists.txt +++ b/tutorials/flappy-bird/step_7/CMakeLists.txt @@ -43,4 +43,4 @@ init_apple_env() add_executable(${PROJECT_NAME} flappy-bird.cpp) ##! We link the SDK modules that we want to use to our executable -target_link_libraries(${PROJECT_NAME} PUBLIC antara::world antara::sfml) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} PUBLIC antara::world antara::sfml antara::collisions) \ No newline at end of file diff --git a/tutorials/flappy-bird/step_7/flappy-bird.cpp b/tutorials/flappy-bird/step_7/flappy-bird.cpp index 060916ed..ea93adf3 100644 --- a/tutorials/flappy-bird/step_7/flappy-bird.cpp +++ b/tutorials/flappy-bird/step_7/flappy-bird.cpp @@ -1,16 +1,14 @@ -#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include #include #include -// TODO: antara/gaming/collisions/basic.collision.system.hpp not found -#include "cmake-build-debug/_deps/antara-gaming-sdk-src/modules/collisions/antara/gaming/collisions/basic.collision.system.hpp" -#include -#include +#include //! For convenience using namespace antara::gaming; @@ -486,8 +484,9 @@ class game_scene final : public scenes::base_scene { void reset_game() { entt::registry ®istry = this->entity_registry_; + ecs::system_manager& system_mgr = this->system_manager; this->~game_scene(); - new(this) game_scene(registry, system_manager); + new(this) game_scene(registry, system_mgr); } };