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

Merge branch 'main' into heightmaps

Browse Source
This commit is contained in:
MihailRis
2024-09-19 15:16:14 +03:00
parent 5e26d826b3 cf77da3bd1
commit bf9f81a98c
74 changed files with 1885 additions and 1782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/EngineController.cpp
+6 -7
View File
@@ -88,16 +88,15 @@ void show_convert_request(
static void show_content_missing(
Engine* engine, const std::shared_ptr<ContentLUT>& lut
) {
using namespace dynamic;
auto root = create_map();
auto& contentEntries = root->putList("content");
auto root = dv::object();
auto& contentEntries = root.list("content");
for (auto& entry : lut->getMissingContent()) {
std::string contentName = ContentType_name(entry.type);
auto& contentEntry = contentEntries.putMap();
contentEntry.put("type", contentName);
contentEntry.put("name", entry.name);
auto& contentEntry = contentEntries.object();
contentEntry["type"] = contentName;
contentEntry["name"] = entry.name;
}
menus::show(engine, "reports/missing_content", {root});
menus::show(engine, "reports/missing_content", {std::move(root)});
}
static bool loadWorldContent(Engine* engine, const fs::path& folder) {