Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow buffer argument to VoxelManip:get_light_data (#12682)

Browse Source
This commit is contained in:
Jude Melton-Houghton 2022-08-13 02:53:47 -04:00 committed by GitHub
parent 59601eb922
commit ab8dfb45b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/game/features.lua
View File

@ -24,6 +24,7 @@ core.features = {
particlespawner_tweenable = true, particlespawner_tweenable = true,
dynamic_add_media_table = true, dynamic_add_media_table = true,
get_sky_as_table = true, get_sky_as_table = true,
get_light_data_buffer = true,
} }
function core.has_feature(arg) function core.has_feature(arg)

7
doc/lua_api.txt
View File

@ -4386,12 +4386,15 @@ Methods
`minetest.get_mapgen_object`. `minetest.get_mapgen_object`.
* (`p1`, `p2`) is the area in which lighting is set, defaults to the whole * (`p1`, `p2`) is the area in which lighting is set, defaults to the whole
area if left out. area if left out.
* `get_light_data()`: Gets the light data read into the `VoxelManip` object * `get_light_data([buffer])`: Gets the light data read into the
`VoxelManip` object
* Returns an array (indices 1 to volume) of integers ranging from `0` to * Returns an array (indices 1 to volume) of integers ranging from `0` to
`255`. `255`.
* Each value is the bitwise combination of day and night light values * Each value is the bitwise combination of day and night light values
(`0` to `15` each). (`0` to `15` each).
* `light = day + (night * 16)` * `light = day + (night * 16)`
* If the param `buffer` is present, this table will be used to store the
result instead.
* `set_light_data(light_data)`: Sets the `param1` (light) contents of each node * `set_light_data(light_data)`: Sets the `param1` (light) contents of each node
in the `VoxelManip`. in the `VoxelManip`.
* expects lighting data in the same format that `get_light_data()` returns * expects lighting data in the same format that `get_light_data()` returns
@ -4863,6 +4866,8 @@ Utilities
particlespawner_tweenable = true, particlespawner_tweenable = true,
-- allows get_sky to return a table instead of separate values (5.6.0) -- allows get_sky to return a table instead of separate values (5.6.0)
get_sky_as_table = true, get_sky_as_table = true,
-- VoxelManip:get_light_data accepts an optional buffer argument (5.7.0)
get_light_data_buffer = true,
} }
* `minetest.has_feature(arg)`: returns `boolean, missing_features` * `minetest.has_feature(arg)`: returns `boolean, missing_features`

6
src/script/lua_api/l_vmanip.cpp
View File

@ -260,11 +260,17 @@ int LuaVoxelManip::l_get_light_data(lua_State *L)
NO_MAP_LOCK_REQUIRED; NO_MAP_LOCK_REQUIRED;
LuaVoxelManip *o = checkobject(L, 1); LuaVoxelManip *o = checkobject(L, 1);
bool use_buffer = lua_istable(L, 2);
MMVManip *vm = o->vm; MMVManip *vm = o->vm;
u32 volume = vm->m_area.getVolume(); u32 volume = vm->m_area.getVolume();
if (use_buffer)
lua_pushvalue(L, 2);
else
lua_createtable(L, volume, 0); lua_createtable(L, volume, 0);
for (u32 i = 0; i != volume; i++) { for (u32 i = 0; i != volume; i++) {
lua_Integer light = vm->m_data[i].param1; lua_Integer light = vm->m_data[i].param1;
lua_pushinteger(L, light); lua_pushinteger(L, light);