voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-04 18:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into volume-renderer

Browse source
This commit is contained in:
MihailRis 2026-01-29 22:34:34 +03:00
commit d9a7afad05
42 changed files with 539 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/assets/AssetsLoader.cpp
View file

@ -319,28 +319,31 @@ void AssetsLoader::addDefaults(AssetsLoader& loader, const Content* content) {
}
bool AssetsLoader::loadExternalTexture(
Assets* assets,
AssetsLoader& loader,
const std::string& name,
const std::vector<io::path>& alternatives
) {
if (assets->get<Texture>(name) != nullptr) {
if (loader.getAssets().get<Texture>(name) != nullptr) {
return true;
}
for (auto& path : alternatives) {
if (io::exists(path)) {
try {
auto image = imageio::read(path);
assets->store(Texture::from(image.get()), name);
return true;
} catch (const std::exception& err) {
logger.error() << "error while loading external "
<< path.string() << ": " << err.what();
}
loader.add(
AssetType::TEXTURE,
(path.parent() / path.stem()).string(),
name,
nullptr
);
return true;
}
}
return false;
}
Assets& AssetsLoader::getAssets() {
return assets;
}
Engine& AssetsLoader::getEngine() {
return engine;
}
@ -368,14 +371,24 @@ public:
}
};
std::shared_ptr<Task> AssetsLoader::startTask(runnable onDone) {
std::shared_ptr<Task> AssetsLoader::startTask(runnable onDone, int maxWorkers) {
auto pool =
std::make_shared<util::ThreadPool<aloader_entry, assetload::postfunc>>(
"assets-loader-pool",
[=]() { return std::make_unique<LoaderWorker>(this); },
[this](assetload::postfunc&& func) { func(&assets); }
[this](const assetload::postfunc& func) { func(&assets); },
maxWorkers
);
pool->setOnComplete(std::move(onDone));
pool->setJobsSource([this]() -> std::optional<aloader_entry> {
if (entries.empty()) {
return std::nullopt;
}
aloader_entry entry = std::move(entries.front());
entries.pop();
return entry;
});
while (!entries.empty()) {
aloader_entry entry = std::move(entries.front());
entries.pop();