From bca4de179d15d5c6a9ec0218319068228508f32e Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 18 Mar 2024 19:06:50 +0300
Subject: [PATCH] assets loading removed from UiXmlReader. Use preload.json
 instead

---
 src/assets/assetload_funcs.cpp |  2 +-
 src/frontend/UiDocument.cpp    |  4 ++--
 src/frontend/UiDocument.h      |  4 +---
 src/frontend/gui/gui_xml.cpp   | 10 +---------
 src/frontend/gui/gui_xml.h     |  8 +-------
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index 833b8850..6eac5cbd 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -151,7 +151,7 @@ bool assetload::layout(
 ) {
     try {
         auto cfg = dynamic_cast<LayoutCfg*>(config.get());
-        auto document = UiDocument::read(loader, cfg->env, name, file);
+        auto document = UiDocument::read(cfg->env, name, file);
         assets->store(document.release(), name);
         return true;
     } catch (const parsing_error& err) {
diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp
index 0690eaa9..bb3b0a6d 100644
--- a/src/frontend/UiDocument.cpp
+++ b/src/frontend/UiDocument.cpp
@@ -59,12 +59,12 @@ void UiDocument::collect(uinodes_map& map, std::shared_ptr<gui::UINode> node) {
     }
 }
 
-std::unique_ptr<UiDocument> UiDocument::read(AssetsLoader& loader, int penv, std::string namesp, fs::path file) {
+std::unique_ptr<UiDocument> UiDocument::read(int penv, std::string namesp, fs::path file) {
     const std::string text = files::read_string(file);
     auto xmldoc = xml::parse(file.u8string(), text);
 
     auto env = scripting::create_doc_environment(penv, namesp);
-    gui::UiXmlReader reader(*env, loader);
+    gui::UiXmlReader reader(*env);
     InventoryView::createReaders(reader);
     auto view = reader.readXML(
         file.u8string(), xmldoc->getRoot()
diff --git a/src/frontend/UiDocument.h b/src/frontend/UiDocument.h
index 8dad5cb0..05185879 100644
--- a/src/frontend/UiDocument.h
+++ b/src/frontend/UiDocument.h
@@ -24,8 +24,6 @@ struct uidocscript {
 
 using uinodes_map = std::unordered_map<std::string, std::shared_ptr<gui::UINode>>;
 
-class AssetsLoader;
-
 class UiDocument {
     std::string id;
     uidocscript script;
@@ -49,7 +47,7 @@ public:
     /* Collect map of all uinodes having identifiers */
     static void collect(uinodes_map& map, std::shared_ptr<gui::UINode> node);
 
-    static std::unique_ptr<UiDocument> read(AssetsLoader& loader, int env, std::string namesp, fs::path file);
+    static std::unique_ptr<UiDocument> read(int env, std::string namesp, fs::path file);
 };
 
 #endif // FRONTEND_UI_DOCUMENT_H_
diff --git a/src/frontend/gui/gui_xml.cpp b/src/frontend/gui/gui_xml.cpp
index 8ddb4494..2370b922 100644
--- a/src/frontend/gui/gui_xml.cpp
+++ b/src/frontend/gui/gui_xml.cpp
@@ -6,7 +6,6 @@
 #include "containers.h"
 #include "controls.h"
 
-#include "../../assets/AssetsLoader.h"
 #include "../locale/langs.h"
 #include "../../logic/scripting/scripting.h"
 #include "../../util/stringutil.h"
@@ -289,7 +288,6 @@ static std::shared_ptr<UINode> readImage(UiXmlReader& reader, xml::xmlelement el
     std::string src = element->attr("src", "").getText();
     auto image = std::make_shared<Image>(src);
     _readUINode(reader, element, *image);
-    reader.getAssetsLoader().add(AssetType::texture, "textures/"+src, src, nullptr);
     return image;
 }
 
@@ -323,9 +321,7 @@ static std::shared_ptr<UINode> readTrackBar(UiXmlReader& reader, xml::xmlelement
     return bar;
 }
 
-UiXmlReader::UiXmlReader(const scripting::Environment& env, AssetsLoader& assetsLoader) 
-: env(env), assetsLoader(assetsLoader)
-{
+UiXmlReader::UiXmlReader(const scripting::Environment& env) : env(env) {
     add("image", readImage);
     add("label", readLabel);
     add("panel", readPanel);
@@ -386,7 +382,3 @@ const std::string& UiXmlReader::getFilename() const {
 const scripting::Environment& UiXmlReader::getEnvironment() const {
     return env;
 }
-
-AssetsLoader& UiXmlReader::getAssetsLoader() {
-    return assetsLoader;
-}
diff --git a/src/frontend/gui/gui_xml.h b/src/frontend/gui/gui_xml.h
index 1bbf6153..02dae2ba 100644
--- a/src/frontend/gui/gui_xml.h
+++ b/src/frontend/gui/gui_xml.h
@@ -12,8 +12,6 @@ namespace scripting {
     class Environment;
 }
 
-class AssetsLoader;
-
 namespace gui {
     class UiXmlReader;
 
@@ -24,10 +22,8 @@ namespace gui {
         std::unordered_set<std::string> ignored;
         std::string filename;
         const scripting::Environment& env;
-        AssetsLoader& assetsLoader;
-        
     public:
-        UiXmlReader(const scripting::Environment& env, AssetsLoader& assetsLoader);
+        UiXmlReader(const scripting::Environment& env);
 
         void add(const std::string& tag, uinode_reader reader);
         bool hasReader(const std::string& tag) const;
@@ -59,8 +55,6 @@ namespace gui {
 
         const scripting::Environment& getEnvironment() const;
         const std::string& getFilename() const;
-
-        AssetsLoader& getAssetsLoader();
     };
 }