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

fix block model is not loading automatically

Browse source
This commit is contained in:
MihailRis 2024-11-07 07:30:47 +03:00
parent 86b5f5d82b
commit 04c25ef214
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/assets/AssetsLoader.cpp
View file

@ -235,6 +235,15 @@ void AssetsLoader::addDefaults(AssetsLoader& loader, const Content* content) {
} }
} }
} }
for (const auto& [_, def] : content->blocks.getDefs()) {
if (def->modelName.find(':') == std::string::npos) {
loader.add(
AssetType::MODEL,
MODELS_FOLDER + "/" + def->modelName,
def->modelName
);
}
}
for (const auto& [_, def] : content->items.getDefs()) { for (const auto& [_, def] : content->items.getDefs()) {
if (def->modelName.find(':') == std::string::npos) { if (def->modelName.find(':') == std::string::npos) {
loader.add( loader.add(

2
src/frontend/ContentGfxCache.cpp
View file

@ -11,8 +11,6 @@
#include "maths/UVRegion.hpp" #include "maths/UVRegion.hpp"
#include "voxels/Block.hpp" #include "voxels/Block.hpp"
#include <iostream>
ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets) ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets)
: content(content) { : content(content) {
auto indices = content->getIndices(); auto indices = content->getIndices();