mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-05 19:11:50 +00:00
Merge branch 'main' into debugging-client
This commit is contained in:
commit
0760a5b552
7 changed files with 102 additions and 10 deletions
|
|
@ -3,6 +3,7 @@
|
|||
#include "io/io.hpp"
|
||||
#include "io/devices/MemoryDevice.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "content/ContentControl.hpp"
|
||||
#include "engine/Engine.hpp"
|
||||
#include "engine/EnginePaths.hpp"
|
||||
#include "network/Network.hpp"
|
||||
|
|
@ -50,10 +51,43 @@ 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) {
|
||||
if (!lua::istable(L, 1)) {
|
||||
throw std::runtime_error("table expected as argument 1");
|
||||
}
|
||||
int len = lua::objlen(L, 1);
|
||||
std::vector<io::path> sources;
|
||||
for (int i = 0; i < len; i++) {
|
||||
lua::rawgeti(L, i + 1);
|
||||
sources.emplace_back(std::string(lua::require_lstring(L, -1)));
|
||||
lua::pop(L);
|
||||
}
|
||||
engine->getContentControl().setContentSources(std::move(sources));
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int l_reset_content_sources(lua::State* L) {
|
||||
engine->getContentControl().resetContentSources();
|
||||
return 0;
|
||||
}
|
||||
|
||||
const luaL_Reg applib[] = {
|
||||
{"start_debug_instance", lua::wrap<l_start_debug_instance>},
|
||||
{"focus", lua::wrap<l_focus>},
|
||||
{"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>},
|
||||
{"reset_content_sources", lua::wrap<l_reset_content_sources>},
|
||||
// for other functions see libcore.cpp and stdlib.lua
|
||||
{nullptr, nullptr}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue