diff options
author | Andy <drumsetmonkey@gmail.com> | 2017-01-20 10:37:21 -0500 |
---|---|---|
committer | Andy <drumsetmonkey@gmail.com> | 2017-01-20 10:37:21 -0500 |
commit | 4d8f9974156068e4595bf219cacfd9fcd2fd7174 (patch) | |
tree | f3e938c0e49537a9dea661f46eed6ee74950b48a /include/engine.hpp | |
parent | 1894e311bdeb098c3bef9bd342e0eaf78d197a9b (diff) | |
parent | 1ac412a5496fb6c63c47f199dfc7facd5f4c080a (diff) |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'include/engine.hpp')
-rw-r--r-- | include/engine.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/engine.hpp b/include/engine.hpp index 417522d..fda9980 100644 --- a/include/engine.hpp +++ b/include/engine.hpp @@ -6,10 +6,12 @@ #ifndef ENGINE_HPP_ #define ENGINE_HPP_ +#include <atomic> +#include <chrono> +#include <thread> + #include <entityx/entityx.h> -#include <entityx/deps/Dependencies.h> -#include <texture.hpp> #include <components.hpp> #include <events.hpp> @@ -63,9 +65,6 @@ public: } }; -#include <atomic> -#include <chrono> - class LockableEntityManager : public entityx::EntityManager { private: std::atomic_bool locked; |