emscripten, mostly working
parent
7c7e97872d
commit
0233ce7549
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.25)
|
||||
|
||||
set(BLT_GRAPHICS_VERSION 0.10.2)
|
||||
set(BLT_GRAPHICS_VERSION 0.11.0)
|
||||
set(BLT_GRAPHICS_TEST_VERSION 0.0.1)
|
||||
|
||||
project(BLT_WITH_GRAPHICS VERSION ${BLT_GRAPHICS_VERSION})
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 1772e9a6d7fe3bd866c4daac5546347634178cb4
|
||||
Subproject commit c8ce910fe17ecbc64ad728aac731c1fda8e84c33
|
|
@ -35,6 +35,7 @@ namespace blt::gfx
|
|||
|
||||
void resource_manager::load_resources(std::size_t threads)
|
||||
{
|
||||
#ifndef __EMSCRIPTEN__
|
||||
blt::thread_pool<false> pool{threads, [&]() {
|
||||
loadable_texture texture;
|
||||
{
|
||||
|
@ -71,8 +72,19 @@ namespace blt::gfx
|
|||
}
|
||||
}
|
||||
} while (true);
|
||||
#else
|
||||
for (const auto& texture : textures_to_load)
|
||||
{
|
||||
BLT_DEBUG("Loading texture file %s", texture.path.c_str());
|
||||
loaded_textures.push_back(new texture_file(texture.path, texture.name));
|
||||
}
|
||||
textures_to_load.clear();
|
||||
#endif
|
||||
|
||||
#ifndef __EMSCRIPTEN__
|
||||
pool.stop();
|
||||
while (!pool.complete());
|
||||
#endif
|
||||
while (!loaded_textures.empty())
|
||||
{
|
||||
auto* back = loaded_textures.back();
|
||||
|
|
Loading…
Reference in New Issue