oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Apply review.

Browse source
This commit is contained in:
SFENCE 2025-06-15 19:46:34 +02:00
parent 3e5f6036ac
commit 24a33e7a19
2 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/script/lua_api/l_object.cpp
View file

@ -2695,37 +2695,30 @@ int ObjectRef::l_set_lighting(lua_State *L)
}
lua_pop(L, 1); // bloom
lua_getfield(L, 2, "vision_effects");
lua_getfield(L, 2, "color_transform_matrix");
// if none or nil, keep color transform matrix unchanged
if (!lua_isnoneornil(L, -1)) {
if (!lua_istable(L, -1))
throw LuaError("vision_effects is not a table");
throw LuaError("vision_effects.color_transform_matrix is not a table");
lua_getfield(L, 3, "color_transform_matrix");
// if none or nil, keep color transform matrix unchanged
if (!lua_isnoneornil(L, -1)) {
for (int row = 1; row <= 3; ++row) {
lua_rawgeti(L, -1, row);
if (!lua_istable(L, -1))
throw LuaError("vision_effects.color_transform_matrix is not a table");
throw LuaError("color_transform_matrix should be in format {{a, b, c},{d, e, f},{g, a, h}}");
for (int row = 1; row <= 3; ++row) {
lua_rawgeti(L, -1, row);
if (!lua_istable(L, -1))
for (int col = 1; col <= 3; ++col) {
lua_rawgeti(L, -1, col);
if (!lua_isnumber(L, -1))
throw LuaError("color_transform_matrix should be in format {{a, b, c},{d, e, f},{g, a, h}}");
for (int col = 1; col <= 3; ++col) {
lua_rawgeti(L, -1, col);
if (!lua_isnumber(L, -1))
throw LuaError("color_transform_matrix should be in format {{a, b, c},{d, e, f},{g, a, h}}");
lighting.vision_effects.color_transform_matrix[(row - 1) * 3 + (col - 1)] = (float)lua_tonumber(L, -1);
lua_pop(L, 1); // Pop the value at [row][col]
}
lua_pop(L, 1); // Pop the row table
lighting.vision_effects.color_transform_matrix[(row - 1) * 3 + (col - 1)] = (float)lua_tonumber(L, -1);
lua_pop(L, 1); // Pop the value at [row][col]
}
lua_pop(L, 1); // Pop the row table
}
lua_pop(L, 1); // color_transform_matrix
}
lua_pop(L, 1); // vision_effects
lua_pop(L, 1); // color_transform_matrix
}
getServer(L)->setLighting(player, lighting);
@ -2778,7 +2771,6 @@ int ObjectRef::l_get_lighting(lua_State *L)
lua_pushnumber(L, lighting.bloom_radius);
lua_setfield(L, -2, "radius");
lua_setfield(L, -2, "bloom");
lua_newtable(L); // "vision_effects"
lua_newtable(L); // "color_transform_matrix"
// Create the nested table structure {{a, b, c}, {d, e, f}, {g, h, i}}
for (int row = 0; row < 3; row++) {
@ -2790,7 +2782,6 @@ int ObjectRef::l_get_lighting(lua_State *L)
lua_rawseti(L, -2, row + 1); // Set inner table in the outer matrix table
}
lua_setfield(L, -2, "color_transform_matrix");
lua_setfield(L, -2, "vision_effects");
return 1;
}