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

Fix types of get_mapgen_setting_noiseparams (#12025)

Browse source
This commit is contained in:
Lars Müller 2022-02-04 20:28:43 +01:00 • committed by GitHub
parent 1c73902005
commit 1ee37148a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/script/common/c_content.cpp
View file

@ -1697,24 +1697,19 @@ bool read_noiseparams(lua_State *L, int index, NoiseParams *np)
void push_noiseparams(lua_State *L, NoiseParams *np)
{
lua_newtable(L);
push_float_string(L, np->offset);
lua_setfield(L, -2, "offset");
push_float_string(L, np->scale);
lua_setfield(L, -2, "scale");
push_float_string(L, np->persist);
lua_setfield(L, -2, "persistence");
push_float_string(L, np->lacunarity);
lua_setfield(L, -2, "lacunarity");
lua_pushnumber(L, np->seed);
lua_setfield(L, -2, "seed");
lua_pushnumber(L, np->octaves);
lua_setfield(L, -2, "octaves");
setfloatfield(L, -1, "offset", np->offset);
setfloatfield(L, -1, "scale", np->scale);
setfloatfield(L, -1, "persist", np->persist);
setfloatfield(L, -1, "persistence", np->persist);
setfloatfield(L, -1, "lacunarity", np->lacunarity);
setintfield( L, -1, "seed", np->seed);
setintfield( L, -1, "octaves", np->octaves);
push_flags_string(L, flagdesc_noiseparams, np->flags,
np->flags);
lua_setfield(L, -2, "flags");
push_v3_float_string(L, np->spread);
push_v3f(L, np->spread);
lua_setfield(L, -2, "spread");
}

27
src/script/common/c_converter.cpp
View file

@ -73,13 +73,6 @@ static void set_vector_metatable(lua_State *L)
lua_pop(L, 1);
}
void push_float_string(lua_State *L, float value)
{
auto str = ftos(value);
lua_pushstring(L, str.c_str());
}
void push_v3f(lua_State *L, v3f p)
{
lua_createtable(L, 0, 3);
@ -101,26 +94,6 @@ void push_v2f(lua_State *L, v2f p)
lua_setfield(L, -2, "y");
}
void push_v3_float_string(lua_State *L, v3f p)
{
lua_createtable(L, 0, 3);
push_float_string(L, p.X);
lua_setfield(L, -2, "x");
push_float_string(L, p.Y);
lua_setfield(L, -2, "y");
push_float_string(L, p.Z);
lua_setfield(L, -2, "z");
}
void push_v2_float_string(lua_State *L, v2f p)
{
lua_createtable(L, 0, 2);
push_float_string(L, p.X);
lua_setfield(L, -2, "x");
push_float_string(L, p.Y);
lua_setfield(L, -2, "y");
}
v2s16 read_v2s16(lua_State *L, int index)
{
v2s16 p;

3
src/script/common/c_converter.h
View file

@ -118,9 +118,6 @@ std::vector<aabb3f> read_aabb3f_vector (lua_State *L, int index, f32 scale);
size_t read_stringlist (lua_State *L, int index,
std::vector<std::string> *result);
void push_float_string (lua_State *L, float value);
void push_v3_float_string(lua_State *L, v3f p);
void push_v2_float_string(lua_State *L, v2f p);
void push_v2s16 (lua_State *L, v2s16 p);
void push_v2s32 (lua_State *L, v2s32 p);
void push_v3s16 (lua_State *L, v3s16 p);