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 --- src/components.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/components.cpp') diff --git a/src/components.cpp b/src/components.cpp index 5b85f51..d9b9b60 100644 --- a/src/components.cpp +++ b/src/components.cpp @@ -47,9 +47,24 @@ void PhysicsSystem::update(entityx::EntityManager &en, entityx::EventManager &ev }); } +GLuint RenderSystem::loadTexture(const std::string& file) +{ + loadTexString = file; + loadTexResult = 0xFFFF; + while (loadTexResult == 0xFFFF) + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + return loadTexResult; +} + void RenderSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) { (void)ev; + + if (!loadTexString.empty()) { + loadTexResult = Texture::loadTexture(loadTexString); + loadTexString.clear(); + } + Render::worldShader.use(); en.each([dt](entityx::Entity entity, Visible &visible, Sprite &sprite, Position &pos) { -- cgit v1.2.3