voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-06 03:21:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #940 from MihailRis/fix-assets-pipeline

Browse source 
update assets pipeline (moving to animation branch)
This commit is contained in:
MihailRis 2026-08-22 00:35:47 +03:00 • committed by GitHub
commit 2c6cffcf19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 211 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/logic/scripting/lua/libs/libapp.cpp
View file

@ -92,6 +92,17 @@ static int l_reconfig_packs(lua::State* L) {
return 0;
}
/// @brief Get current content packs configuration
static int l_get_content(lua::State* L) {
const auto& configuration = content_control->getContentPacks();
lua::createtable(L, configuration.size(), 0);
for (int i = 0; i < configuration.size(); i++) {
lua::pushlstring(L, configuration[i].id);
lua::rawseti(L, i + 1);
}
return 1;
}
/// @brief Get content sources list
static int l_get_content_sources(lua::State* L) {
const auto& sources = engine->getContentControl().getContentSources();
@ -453,6 +464,7 @@ const luaL_Reg applib[] = {
{"load_content", lua::wrap<l_load_content>},
{"reset_content", lua::wrap<l_reset_content>},
{"reconfig_packs", lua::wrap<l_reconfig_packs>},
{"get_content", lua::wrap<l_get_content>},
{"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>},

5
src/logic/scripting/lua/lua_engine.cpp
View file

@ -74,6 +74,11 @@ static void create_libs(State* L, StateType stateType) {
getglobal(L, "__vc_app");
setregistry(L, "app");
createtable(L, 0, 0);
pushvalue(L, -1);
setglobal(L, "__vc_internals");
setregistry(L, "internals");
if (stateType == StateType::SCRIPT) {
getregistry(L, "app");
setglobal(L, "app");

18
src/logic/scripting/scripting.cpp
View file

@ -288,7 +288,23 @@ void scripting::on_content_load(Content* content) {
lua::setfield(L, "properties");
lua::pop(L);
}
load_script("post_content.lua", true);
lua::getregistry(L, "app");
lua::setglobal(L, "__vc_app");
lua::getregistry(L, "internals");
lua::setglobal(L, "__vc_internals");
try {
load_script("post_content.lua", true);
} catch (const std::exception&) {
lua::pushnil(L);
lua::setglobal(L, "__vc_app");
throw;
}
lua::pushnil(L);
lua::setglobal(L, "__vc_app");
lua::pushnil(L);
lua::setglobal(L, "__vc_internals");
load_script("stdcmd.lua", true);
}