From b1d3354d93187a6bededc280ddb6dee5b159bbe7 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Sun, 27 Nov 2016 18:49:32 -0500 Subject: menu, indoor fixes --- include/components.hpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/components.hpp b/include/components.hpp index 58f5aea..367b8a3 100644 --- a/include/components.hpp +++ b/include/components.hpp @@ -14,6 +14,8 @@ #include #include +#include + /** * @struct Position * @brief Stores the position of an entity on the xy plane. @@ -275,7 +277,11 @@ public: }; class RenderSystem : public entityx::System { +private: + std::string loadTexString; + std::atomic loadTexResult; public: + GLuint loadTexture(const std::string& file); void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override; }; -- cgit v1.2.3