From 04c25ef214627ac87f42b7e2b98839a5b867aa0e Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 7 Nov 2024 07:30:47 +0300 Subject: [PATCH] fix block model is not loading automatically --- src/assets/AssetsLoader.cpp | 9 +++++++++ src/frontend/ContentGfxCache.cpp | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index ce2d1c30..d1370338 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -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()) { if (def->modelName.find(':') == std::string::npos) { loader.add( diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index 24297cb8..7d3944b7 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -11,8 +11,6 @@ #include "maths/UVRegion.hpp" #include "voxels/Block.hpp" -#include - ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets) : content(content) { auto indices = content->getIndices();