PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor: moved funcs to assetload

Browse Source
This commit is contained in:
MihailRis 2024-07-01 17:15:48 +03:00
parent 4a3487f17b
commit 824231bfd6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/assets/Assets.hpp
View File

@ -17,19 +17,19 @@ class Assets;
namespace assetload {
/// @brief final work to do in the main thread
using postfunc = std::function<void(Assets*)>;
using setupfunc = std::function<void(const Assets*)>;
template<class T>
void assets_setup(const Assets*);
}
template<class T>
void assets_setup(const Assets*);
using assetssetupfunc = std::function<void(const Assets*)>;
class Assets {
std::vector<TextureAnimation> animations;
using assets_map = std::unordered_map<std::string, std::shared_ptr<void>>;
std::unordered_map<std::type_index, assets_map> assets;
std::vector<assetssetupfunc> setupFuncs;
std::vector<assetload::setupfunc> setupFuncs;
public:
Assets() {}
Assets(const Assets&) = delete;
@ -72,13 +72,13 @@ public:
}
}
void addSetupFunc(assetssetupfunc setupfunc) {
void addSetupFunc(assetload::setupfunc setupfunc) {
setupFuncs.push_back(setupfunc);
}
};
template<class T>
void assets_setup(const Assets* assets) {
void assetload::assets_setup(const Assets* assets) {
if (auto mapPtr = assets->getMap<T>()) {
for (const auto& entry : **mapPtr) {
static_cast<T*>(entry.second.get())->setup(assets);

2
src/engine.cpp
View File

@ -245,7 +245,7 @@ void Engine::loadAssets() {
Shader::preprocessor->setPaths(resPaths.get());
auto new_assets = std::make_unique<Assets>();
new_assets->addSetupFunc(assets_setup<rigging::RigConfig>);
new_assets->addSetupFunc(assetload::assets_setup<rigging::RigConfig>);
AssetsLoader loader(new_assets.get(), resPaths.get());
AssetsLoader::addDefaults(loader, content.get());