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

layout test

Browse source
This commit is contained in:
MihailRis 2024-02-09 10:34:34 +03:00
parent 07adbd04ea
commit 9ad371862c
8 changed files with 41 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/assets/Assets.cpp
View file

@ -87,6 +87,9 @@ void Assets::extend(const Assets& assets) {
for (auto entry : assets.atlases) {
atlases[entry.first] = entry.second;
}
for (auto entry : assets.layouts) {
layouts[entry.first] = entry.second;
}
animations.clear();
for (auto entry : assets.animations) {
animations.emplace_back(entry);

3
src/assets/AssetsLoader.cpp
View file

@ -9,9 +9,6 @@
#include "../constants.h"
#include "../files/engine_paths.h"
using std::filesystem::path;
using std::unique_ptr;
AssetsLoader::AssetsLoader(Assets* assets, const ResPaths* paths)
: assets(assets), paths(paths) {
}

2
src/assets/AssetsLoader.h
View file

@ -15,7 +15,7 @@ const short ASSET_LAYOUT = 5;
class ResPaths;
class Assets;
typedef std::function<bool(Assets*, const ResPaths*, const std::string&, const std::string&)> aloader_func;
using aloader_func = std::function<bool(Assets*, const ResPaths*, const std::string&, const std::string&)>;
struct aloader_entry {
int tag;