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

fix animation loading

Browse Source
This commit is contained in:
MihailRis 2024-08-22 23:50:46 +03:00
parent 5500fe34ac
commit 719135fe19
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/assets/AssetsLoader.cpp
View File

@ -194,6 +194,9 @@ void AssetsLoader::processPreloadConfigs(const Content* content) {
return; return;
} }
for (auto& entry : content->getPacks()) { for (auto& entry : content->getPacks()) {
if (entry.first == "core") {
continue;
}
const auto& pack = entry.second; const auto& pack = entry.second;
auto preloadFile = pack->getInfo().folder / fs::path("preload.json"); auto preloadFile = pack->getInfo().folder / fs::path("preload.json");
if (fs::exists(preloadFile)) { if (fs::exists(preloadFile)) {

5
src/assets/assetload_funcs.cpp
View File

@ -12,6 +12,7 @@
#include "coders/obj.hpp" #include "coders/obj.hpp"
#include "constants.hpp" #include "constants.hpp"
#include "data/dynamic.hpp" #include "data/dynamic.hpp"
#include "debug/Logger.hpp"
#include "files/engine_paths.hpp" #include "files/engine_paths.hpp"
#include "files/files.hpp" #include "files/files.hpp"
#include "frontend/UiDocument.hpp" #include "frontend/UiDocument.hpp"
@ -26,6 +27,8 @@
#include "Assets.hpp" #include "Assets.hpp"
#include "AssetsLoader.hpp" #include "AssetsLoader.hpp"
static debug::Logger logger("assetload-funcs");
namespace fs = std::filesystem; namespace fs = std::filesystem;
static bool animation( static bool animation(
@ -263,7 +266,7 @@ static TextureAnimation create_animation(
for (const auto& elem : frameList) { for (const auto& elem : frameList) {
if (!srcAtlas->has(elem.first)) { if (!srcAtlas->has(elem.first)) {
std::cerr << "Unknown frame name: " << elem.first << std::endl; logger.error() << "unknown frame name: " << elem.first;
continue; continue;
} }
region = srcAtlas->get(elem.first); region = srcAtlas->get(elem.first);