add app.get_content_sources, app.set_content_sources

This commit is contained in:
MihailRis 2025-11-17 17:58:16 +03:00
parent c0c0352959
commit 614d5f4ae4
5 changed files with 55 additions and 10 deletions

View File

@ -16,6 +16,13 @@ static void load_configs(Input& input, const io::path& root) {
auto configFolder = root / "config";
}
static std::vector<io::path> default_content_sources {
"world:content",
"user:content",
"project:content",
"res:content",
};
ContentControl::ContentControl(
const Project& project,
EnginePaths& paths,
@ -27,12 +34,7 @@ ContentControl::ContentControl(
postContent(std::move(postContent)),
basePacks(project.basePacks),
manager(std::make_unique<PacksManager>()) {
manager->setSources({
"world:content",
"user:content",
"project:content",
"res:content",
});
manager->setSources(default_content_sources);
}
ContentControl::~ContentControl() = default;
@ -68,6 +70,7 @@ void ContentControl::resetContent(const std::vector<std::string>& nonReset) {
scripting::on_content_reset();
setContentPacksRaw(manager->getAll(basePacks));
resetContentSources();
postContent();
}
@ -139,3 +142,15 @@ PacksManager& ContentControl::scan() {
manager->scan();
return *manager;
}
void ContentControl::setContentSources(std::vector<io::path> sources) {
manager->setSources(std::move(sources));
}
void ContentControl::resetContentSources() {
manager->setSources(default_content_sources);
}
const std::vector<io::path>& ContentControl::getContentSources() const {
return manager->getSources();
}

View File

@ -5,6 +5,7 @@
#include <string>
#include <functional>
#include "io/path.hpp"
#include "ContentPack.hpp"
class Content;
@ -13,10 +14,6 @@ class EnginePaths;
class Input;
struct Project;
namespace io {
class path;
}
class ContentControl {
public:
ContentControl(
@ -46,6 +43,10 @@ public:
const std::vector<ContentPack>& getAllContentPacks() const;
PacksManager& scan();
void setContentSources(std::vector<io::path> sources);
void resetContentSources();
const std::vector<io::path>& getContentSources() const;
private:
EnginePaths& paths;
Input& input;

View File

@ -9,6 +9,10 @@
PacksManager::PacksManager() = default;
const std::vector<io::path>& PacksManager::getSources() const {
return sources;
}
void PacksManager::setSources(std::vector<io::path> sources) {
this->sources = std::move(sources);
}

View File

@ -12,6 +12,9 @@ class PacksManager {
public:
PacksManager();
/// @brief Get current content packs sources
const std::vector<io::path>& getSources() const;
/// @brief Set content packs sources (search folders)
void setSources(std::vector<io::path> sources);

View File

@ -2,6 +2,11 @@
#include "io/io.hpp"
#include "io/devices/MemoryDevice.hpp"
#include "engine/Engine.hpp"
#include "content/ContentControl.hpp"
#include "logic/scripting/scripting.hpp"
using namespace scripting;
static int l_create_memory_device(lua::State* L) {
std::string name = lua::require_string(L, 1);
@ -18,8 +23,25 @@ static int l_create_memory_device(lua::State* L) {
return 0;
}
static int l_get_content_sources(lua::State* L) {
const auto& sources = engine->getContentControl().getContentSources();
lua::createtable(L, static_cast<int>(sources.size()), 0);
for (size_t i = 0; i < sources.size(); i++) {
lua::pushlstring(L, sources[i].string());
lua::rawseti(L, static_cast<int>(i + 1));
}
return 1;
}
static int l_set_content_sources(lua::State* L) {
engine->getContentControl().resetContentSources();
return 0;
}
const luaL_Reg applib[] = {
{"create_memory_device", lua::wrap<l_create_memory_device>},
{"get_content_sources", lua::wrap<l_get_content_sources>},
{"set_content_sources", lua::wrap<l_set_content_sources>},
// see libcore.cpp an stdlib.lua
{nullptr, nullptr}
};