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

feat: keeping assets alive during current frame (temporary solution)

Browse source
This commit is contained in:
MihailRis 2026-02-28 00:27:08 +03:00
parent ad758fd718
commit ded0964827
4 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/assets/Assets.cpp
View file

@ -1,6 +1,15 @@
#include "Assets.hpp"
Assets::~Assets() = default;
Assets::Assets(util::ObjectsKeeper& vault) : vault(vault) {
}
Assets::~Assets() {
for (auto& [_, map] : assets) {
for (auto& [__, asset] : map) {
vault.keepAlive(std::move(asset));
}
}
}
const std::vector<TextureAnimation>& Assets::getAnimations() {
return animations;

16
src/assets/Assets.hpp
View file

@ -12,6 +12,7 @@
#include <vector>
#include "util/stringutil.hpp"
#include "util/ObjectsKeeper.hpp"
#include "graphics/core/TextureAnimation.hpp"
class Assets;
@ -64,13 +65,14 @@ namespace assetload {
}
class Assets {
util::ObjectsKeeper& vault;
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<assetload::setupfunc> setupFuncs;
public:
Assets() = default;
Assets(util::ObjectsKeeper& vault);
Assets(const Assets&) = delete;
~Assets();
@ -79,12 +81,20 @@ public:
template <class T>
void store(std::unique_ptr<T> asset, const std::string& name) {
assets[typeid(T)][name].reset(asset.release());
auto& dst = assets[typeid(T)][name];
if (dst != nullptr) {
vault.keepAlive(std::move(dst));
}
dst.reset(asset.release());
}
template <class T>
void store(std::shared_ptr<T> asset, const std::string& name) {
assets[typeid(T)][name] = std::move(asset);
auto& dst = assets[typeid(T)][name];
if (dst != nullptr) {
vault.keepAlive(std::move(dst));
}
dst = std::move(asset);
}
template <class T>