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

lua: 'core' prefix support + minor refactor

Browse Source
This commit is contained in:
MihailRis 2024-01-23 23:52:42 +03:00
parent 2aaa37bb7d
commit e457e3da39
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/graphics/TextureAnimation.cpp
View File

@ -52,10 +52,9 @@ void TextureAnimator::update(float delta) {
glBlitFramebuffer(frame.srcPos.x, srcPosY, frame.srcPos.x + frame.size.x, srcPosY + frame.size.y, glBlitFramebuffer(frame.srcPos.x, srcPosY, frame.srcPos.x + frame.size.x, srcPosY + frame.size.y,
frame.dstPos.x, frame.dstPos.y, frame.dstPos.x + frame.size.x, frame.dstPos.y + frame.size.y, frame.dstPos.x, frame.dstPos.y, frame.dstPos.x + frame.size.x, frame.dstPos.y + frame.size.y,
GL_COLOR_BUFFER_BIT, GL_NEAREST); GL_COLOR_BUFFER_BIT, GL_NEAREST);
}
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
}
} }
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
for (auto& elem : changedTextures) { for (auto& elem : changedTextures) {

6
src/logic/scripting/api_lua.cpp
View File

@ -43,6 +43,12 @@ static const luaL_Reg timelib [] = {
/* == pack library == */ /* == pack library == */
static int l_pack_get_folder(lua_State* L) { static int l_pack_get_folder(lua_State* L) {
std::string packName = lua_tostring(L, 1); std::string packName = lua_tostring(L, 1);
if (packName == "core") {
auto folder = scripting::engine->getPaths()
->getResources().u8string()+"/";
lua_pushstring(L, folder.c_str());
return 1;
}
for (auto& pack : scripting::engine->getContentPacks()) { for (auto& pack : scripting::engine->getContentPacks()) {
if (pack.id == packName) { if (pack.id == packName) {
lua_pushstring(L, (pack.folder.u8string()+"/").c_str()); lua_pushstring(L, (pack.folder.u8string()+"/").c_str());