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

Add optional buffer param for bulk data array writes in Lua

Browse Source
This commit is contained in:
kwolekr 2015-05-17 00:07:45 -04:00
parent 28b2476b11
commit 3ffb5f5761
3 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/lua_api.txt
View File

@ -2647,7 +2647,9 @@ for 2D noise, and it must be must be larger than 1 for 3D noise (otherwise
of 3D noise with values starting at `pos={x=,y=,z=}` of 3D noise with values starting at `pos={x=,y=,z=}`
* `get2dMap_flat(pos)`: returns a flat `<size.x * size.y>` element array of 2D noise * `get2dMap_flat(pos)`: returns a flat `<size.x * size.y>` element array of 2D noise
with values starting at `pos={x=,y=}` with values starting at `pos={x=,y=}`
* if the param `buffer` is present, this table will be used to store the result instead
* `get3dMap_flat(pos)`: Same as `get2dMap_flat`, but 3D noise * `get3dMap_flat(pos)`: Same as `get2dMap_flat`, but 3D noise
* if the param `buffer` is present, this table will be used to store the result instead
### `VoxelManip` ### `VoxelManip`
An interface to the `MapVoxelManipulator` for Lua. An interface to the `MapVoxelManipulator` for Lua.
@ -2665,8 +2667,9 @@ The map will be pre-loaded if two positions are passed to either.
the `VoxelManip` at that position the `VoxelManip` at that position
* `set_node_at(pos, node)`: Sets a specific `MapNode` in the `VoxelManip` at * `set_node_at(pos, node)`: Sets a specific `MapNode` in the `VoxelManip` at
that position that position
* `get_data()`: Gets the data read into the `VoxelManip` object * `get_data(buffer)`: Gets the data read into the `VoxelManip` object
* returns raw node data is in the form of an array of node content IDs * returns raw node data in the form of an array of node content IDs
* if the param `buffer` is present, this table will be used to store the result instead
* `set_data(data)`: Sets the data contents of the `VoxelManip` object * `set_data(data)`: Sets the data contents of the `VoxelManip` object
* `update_map()`: Update map after writing chunk back to map. * `update_map()`: Update map after writing chunk back to map.
* To be used only by `VoxelManip` objects created by the mod itself; * To be used only by `VoxelManip` objects created by the mod itself;

20
src/script/lua_api/l_noise.cpp
View File

@ -174,9 +174,9 @@ int LuaPerlinNoiseMap::l_get2dMap(lua_State *L)
n->perlinMap2D(p.X, p.Y); n->perlinMap2D(p.X, p.Y);
lua_newtable(L); lua_newtable(L);
for (int y = 0; y != n->sy; y++) { for (u32 y = 0; y != n->sy; y++) {
lua_newtable(L); lua_newtable(L);
for (int x = 0; x != n->sx; x++) { for (u32 x = 0; x != n->sx; x++) {
lua_pushnumber(L, n->result[i++]); lua_pushnumber(L, n->result[i++]);
lua_rawseti(L, -2, x + 1); lua_rawseti(L, -2, x + 1);
} }
@ -192,13 +192,18 @@ int LuaPerlinNoiseMap::l_get2dMap_flat(lua_State *L)
LuaPerlinNoiseMap *o = checkobject(L, 1); LuaPerlinNoiseMap *o = checkobject(L, 1);
v2f p = check_v2f(L, 2); v2f p = check_v2f(L, 2);
bool use_buffer = lua_istable(L, 3);
Noise *n = o->noise; Noise *n = o->noise;
n->perlinMap2D(p.X, p.Y); n->perlinMap2D(p.X, p.Y);
size_t maplen = n->sx * n->sy; size_t maplen = n->sx * n->sy;
if (use_buffer)
lua_pushvalue(L, 3);
else
lua_newtable(L); lua_newtable(L);
for (size_t i = 0; i != maplen; i++) { for (size_t i = 0; i != maplen; i++) {
lua_pushnumber(L, n->result[i]); lua_pushnumber(L, n->result[i]);
lua_rawseti(L, -2, i + 1); lua_rawseti(L, -2, i + 1);
@ -222,11 +227,11 @@ int LuaPerlinNoiseMap::l_get3dMap(lua_State *L)
n->perlinMap3D(p.X, p.Y, p.Z); n->perlinMap3D(p.X, p.Y, p.Z);
lua_newtable(L); lua_newtable(L);
for (int z = 0; z != n->sz; z++) { for (u32 z = 0; z != n->sz; z++) {
lua_newtable(L); lua_newtable(L);
for (int y = 0; y != n->sy; y++) { for (u32 y = 0; y != n->sy; y++) {
lua_newtable(L); lua_newtable(L);
for (int x = 0; x != n->sx; x++) { for (u32 x = 0; x != n->sx; x++) {
lua_pushnumber(L, n->result[i++]); lua_pushnumber(L, n->result[i++]);
lua_rawseti(L, -2, x + 1); lua_rawseti(L, -2, x + 1);
} }
@ -244,6 +249,7 @@ int LuaPerlinNoiseMap::l_get3dMap_flat(lua_State *L)
LuaPerlinNoiseMap *o = checkobject(L, 1); LuaPerlinNoiseMap *o = checkobject(L, 1);
v3f p = check_v3f(L, 2); v3f p = check_v3f(L, 2);
bool use_buffer = lua_istable(L, 3);
if (!o->m_is3d) if (!o->m_is3d)
return 0; return 0;
@ -253,7 +259,11 @@ int LuaPerlinNoiseMap::l_get3dMap_flat(lua_State *L)
size_t maplen = n->sx * n->sy * n->sz; size_t maplen = n->sx * n->sy * n->sz;
if (use_buffer)
lua_pushvalue(L, 3);
else
lua_newtable(L); lua_newtable(L);
for (size_t i = 0; i != maplen; i++) { for (size_t i = 0; i != maplen; i++) {
lua_pushnumber(L, n->result[i]); lua_pushnumber(L, n->result[i]);
lua_rawseti(L, -2, i + 1); lua_rawseti(L, -2, i + 1);

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

@ -63,12 +63,18 @@ int LuaVoxelManip::l_get_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;
int volume = vm->m_area.getVolume(); u32 volume = vm->m_area.getVolume();
if (use_buffer)
lua_pushvalue(L, 2);
else
lua_newtable(L); lua_newtable(L);
for (int i = 0; i != volume; i++) {
for (u32 i = 0; i != volume; i++) {
lua_Integer cid = vm->m_data[i].getContent(); lua_Integer cid = vm->m_data[i].getContent();
lua_pushinteger(L, cid); lua_pushinteger(L, cid);
lua_rawseti(L, -2, i + 1); lua_rawseti(L, -2, i + 1);
@ -87,8 +93,8 @@ int LuaVoxelManip::l_set_data(lua_State *L)
if (!lua_istable(L, 2)) if (!lua_istable(L, 2))
return 0; return 0;
int volume = vm->m_area.getVolume(); u32 volume = vm->m_area.getVolume();
for (int i = 0; i != volume; i++) { for (u32 i = 0; i != volume; i++) {
lua_rawgeti(L, 2, i + 1); lua_rawgeti(L, 2, i + 1);
content_t c = lua_tointeger(L, -1); content_t c = lua_tointeger(L, -1);
@ -228,10 +234,10 @@ int LuaVoxelManip::l_get_light_data(lua_State *L)
LuaVoxelManip *o = checkobject(L, 1); LuaVoxelManip *o = checkobject(L, 1);
MMVManip *vm = o->vm; MMVManip *vm = o->vm;
int volume = vm->m_area.getVolume(); u32 volume = vm->m_area.getVolume();
lua_newtable(L); lua_newtable(L);
for (int 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);
lua_rawseti(L, -2, i + 1); lua_rawseti(L, -2, i + 1);
@ -250,8 +256,8 @@ int LuaVoxelManip::l_set_light_data(lua_State *L)
if (!lua_istable(L, 2)) if (!lua_istable(L, 2))
return 0; return 0;
int volume = vm->m_area.getVolume(); u32 volume = vm->m_area.getVolume();
for (int i = 0; i != volume; i++) { for (u32 i = 0; i != volume; i++) {
lua_rawgeti(L, 2, i + 1); lua_rawgeti(L, 2, i + 1);
u8 light = lua_tointeger(L, -1); u8 light = lua_tointeger(L, -1);
@ -270,10 +276,10 @@ int LuaVoxelManip::l_get_param2_data(lua_State *L)
LuaVoxelManip *o = checkobject(L, 1); LuaVoxelManip *o = checkobject(L, 1);
MMVManip *vm = o->vm; MMVManip *vm = o->vm;
int volume = vm->m_area.getVolume(); u32 volume = vm->m_area.getVolume();
lua_newtable(L); lua_newtable(L);
for (int i = 0; i != volume; i++) { for (u32 i = 0; i != volume; i++) {
lua_Integer param2 = vm->m_data[i].param2; lua_Integer param2 = vm->m_data[i].param2;
lua_pushinteger(L, param2); lua_pushinteger(L, param2);
lua_rawseti(L, -2, i + 1); lua_rawseti(L, -2, i + 1);
@ -292,8 +298,8 @@ int LuaVoxelManip::l_set_param2_data(lua_State *L)
if (!lua_istable(L, 2)) if (!lua_istable(L, 2))
return 0; return 0;
int volume = vm->m_area.getVolume(); u32 volume = vm->m_area.getVolume();
for (int i = 0; i != volume; i++) { for (u32 i = 0; i != volume; i++) {
lua_rawgeti(L, 2, i + 1); lua_rawgeti(L, 2, i + 1);
u8 param2 = lua_tointeger(L, -1); u8 param2 = lua_tointeger(L, -1);