From 6f7aeb504f96ae1a73573eec1e4776ca84eac5c2 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 18 Jul 2026 14:52:38 +0300 Subject: [PATCH] overwrite assets in preload.json --- src/assets/AssetsLoader.cpp | 11 +++++++---- src/assets/AssetsLoader.hpp | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index 23b316e6b..5f339af29 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -47,9 +47,10 @@ void AssetsLoader::add( AssetType tag, const std::string& filename, const std::string& alias, - std::shared_ptr settings + std::shared_ptr settings, + bool overwrite ) { - if (enqueued.find({tag, alias}) != enqueued.end()){ + if (!overwrite && enqueued.find({tag, alias}) != enqueued.end()){ return; } entries.push(aloader_entry {tag, filename, alias, std::move(settings)}); @@ -154,11 +155,12 @@ void AssetsLoader::processPreload( std::string defFolder = assets_def_folder(tag); std::string path = defFolder + "/" + name; if (map == nullptr) { - add(tag, path, name); + add(tag, path, name, nullptr, true); return; } std::shared_ptr config = nullptr; map.at("path").get(path); + logger.debug() << "processing preload " << util::quote(name) << " path: " << util::quote(path); switch (tag) { case AssetType::SOUND: { bool keepPCM = false; @@ -196,7 +198,7 @@ void AssetsLoader::processPreload( default: break; } - add(tag, path, name, std::move(config)); + add(tag, path, name, std::move(config), true); } void AssetsLoader::processPreloadList(AssetType tag, const dv::value& list) { @@ -218,6 +220,7 @@ void AssetsLoader::processPreloadList(AssetType tag, const dv::value& list) { } void AssetsLoader::processPreloadConfig(const io::path& file) { + logger.debug() << "===== PRELOAD FILE: " << file.string(); auto root = io::read_json(file); processPreloadList(AssetType::ATLAS, root["atlases"]); processPreloadList(AssetType::FONT, root["fonts"]); diff --git a/src/assets/AssetsLoader.hpp b/src/assets/AssetsLoader.hpp index e237e01e9..d919d1f08 100644 --- a/src/assets/AssetsLoader.hpp +++ b/src/assets/AssetsLoader.hpp @@ -110,7 +110,8 @@ public: AssetType tag, const std::string& filename, const std::string& alias, - std::shared_ptr settings = nullptr + std::shared_ptr settings = nullptr, + bool overwrite = false ); bool hasNext() const;