add pack.assemble(...), app.config_packs(...)

This commit is contained in:
MihailRis
2025-01-03 23:51:36 +03:00
parent 3187243a7d
commit bd9018dafe
12 changed files with 93 additions and 10 deletions
+1 -1
View File
@@ -116,7 +116,7 @@ static bool resolve_dependencies(
return satisfied;
}
std::vector<std::string> PacksManager::assembly(
std::vector<std::string> PacksManager::assemble(
const std::vector<std::string>& names
) const {
std::vector<std::string> allNames = names;
+1 -1
View File
@@ -38,7 +38,7 @@ public:
/// @return resulting ordered vector of pack names
/// @throws contentpack_error if required dependency not found or
/// circular dependency detected
std::vector<std::string> assembly(const std::vector<std::string>& names
std::vector<std::string> assemble(const std::vector<std::string>& names
) const;
/// @brief Collect all pack names (identifiers) into a new vector
+3 -3
View File
@@ -346,7 +346,7 @@ void Engine::loadContent() {
paths.setContentPacks(&contentPacks);
PacksManager manager = createPacksManager(paths.getCurrentWorldFolder());
manager.scan();
names = manager.assembly(names);
names = manager.assemble(names);
contentPacks = manager.getAll(names);
auto corePack = ContentPack::createCore(paths);
@@ -417,7 +417,7 @@ void Engine::loadWorldContent(const fs::path& folder) {
paths.getResourcesFolder()/fs::path("content")
});
manager.scan();
contentPacks = manager.getAll(manager.assembly(packNames));
contentPacks = manager.getAll(manager.assemble(packNames));
paths.setCurrentWorldFolder(folder);
loadContent();
}
@@ -426,7 +426,7 @@ void Engine::loadAllPacks() {
PacksManager manager = createPacksManager(paths.getCurrentWorldFolder());
manager.scan();
auto allnames = manager.getAllNames();
contentPacks = manager.getAll(manager.assembly(allnames));
contentPacks = manager.getAll(manager.assemble(allnames));
}
void Engine::setScreen(std::shared_ptr<Screen> screen) {
+1 -1
View File
@@ -322,7 +322,7 @@ void EngineController::reconfigPacks(
manager.exclude(id);
names.erase(std::find(names.begin(), names.end(), id));
}
names = manager.assembly(names);
names = manager.assemble(names);
engine.getContentPacks() = manager.getAll(names);
} catch (const contentpack_error& err) {
throw std::runtime_error(
+1
View File
@@ -1,5 +1,6 @@
#include "api_lua.hpp"
const luaL_Reg applib[] = {
// see libcore.cpp an stdlib.lua
{NULL, NULL}
};
+28
View File
@@ -211,10 +211,38 @@ static int l_pack_get_base_packs(lua::State* L) {
return 1;
}
static int l_pack_assemble(lua::State* L) {
if (!lua::istable(L, 1)) {
throw std::runtime_error("table expected");
}
std::vector<std::string> ids;
size_t len = lua::objlen(L, 1);
for (size_t i = 1; i <= len; i++) {
lua::rawgeti(L, i);
ids.push_back(lua::require_string(L, -1));
lua::pop(L);
}
fs::path worldFolder("");
if (level) {
worldFolder = level->getWorld()->wfile->getFolder();
}
auto manager = engine->createPacksManager(worldFolder);
manager.scan();
ids = std::move(manager.assemble(ids));
lua::createtable(L, ids.size(), 0);
for (size_t i = 0; i < ids.size(); i++) {
lua::pushstring(L, ids[i]);
lua::rawseti(L, i + 1);
}
return 1;
}
const luaL_Reg packlib[] = {
{"get_folder", lua::wrap<l_pack_get_folder>},
{"get_installed", lua::wrap<l_pack_get_installed>},
{"get_available", lua::wrap<l_pack_get_available>},
{"get_info", lua::wrap<l_pack_get_info>},
{"get_base_packs", lua::wrap<l_pack_get_base_packs>},
{"assemble", lua::wrap<l_pack_assemble>},
{NULL, NULL}};