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

test worlds panel with XML + lua

Browse Source
This commit is contained in:
MihailRis
2024-03-22 10:40:28 +03:00
parent 71f4dff32f
commit 9a817a86ff
10 changed files with 93 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/UiDocument.cpp
+4 -4
View File
@@ -58,13 +58,13 @@ void UiDocument::collect(uinodes_map& map, std::shared_ptr<gui::UINode> node) {
}
}
std::unique_ptr<UiDocument> UiDocument::read(int penv, std::string namesp, fs::path file) {
std::unique_ptr<UiDocument> UiDocument::read(int penv, std::string name, fs::path file) {
const std::string text = files::read_string(file);
auto xmldoc = xml::parse(file.u8string(), text);
auto env = penv == -1
? std::make_unique<scripting::Environment>(0)
: scripting::create_doc_environment(penv, namesp);
: scripting::create_doc_environment(penv, name);
gui::UiXmlReader reader(*env);
InventoryView::createReaders(reader);
@@ -75,9 +75,9 @@ std::unique_ptr<UiDocument> UiDocument::read(int penv, std::string namesp, fs::p
uidocscript script {};
auto scriptFile = fs::path(file.u8string()+".lua");
if (fs::is_regular_file(scriptFile)) {
scripting::load_layout_script(env->getId(), namesp, scriptFile, script);
scripting::load_layout_script(env->getId(), name, scriptFile, script);
}
return std::make_unique<UiDocument>(namesp, script, view, std::move(env));
return std::make_unique<UiDocument>(name, script, view, std::move(env));
}
std::shared_ptr<gui::UINode> UiDocument::readElement(fs::path file) {