Skip to content

Commit 3d4244c

Browse files
kwolekrkwolekr
committedApr 20, 2015
Add 'persistence' alias for Lua noiseparams and validate more vector parameters
·
5.11.00.4.13
1 parent 687d969 commit 3d4244c

File tree

4 files changed

+74
-14
lines changed

4 files changed

+74
-14
lines changed
 

‎src/script/common/c_content.cpp

+10-8
Original file line numberDiff line numberDiff line change
@@ -983,14 +983,16 @@ bool read_noiseparams(lua_State *L, int index, NoiseParams *np)
983983
if (!lua_istable(L, index))
984984
return false;
985985

986-
np->offset = getfloatfield_default(L, index, "offset", 0.0);
987-
np->scale = getfloatfield_default(L, index, "scale", 0.0);
988-
np->persist = getfloatfield_default(L, index, "persist", 0.0);
989-
np->lacunarity = getfloatfield_default(L, index, "lacunarity", 2.0);
990-
np->seed = getintfield_default(L, index, "seed", 0);
991-
np->octaves = getintfield_default(L, index, "octaves", 0);
992-
993-
u32 flags = 0, flagmask = 0;
986+
getfloatfield(L, index, "offset", np->offset);
987+
getfloatfield(L, index, "scale", np->scale);
988+
getfloatfield(L, index, "persist", np->persist);
989+
getfloatfield(L, index, "persistence", np->persist);
990+
getfloatfield(L, index, "lacunarity", np->lacunarity);
991+
getintfield(L, index, "seed", np->seed);
992+
getintfield(L, index, "octaves", np->octaves);
993+
994+
u32 flags = 0;
995+
u32 flagmask = 0;
994996
np->flags = getflagsfield(L, index, "flags", flagdesc_noiseparams,
995997
&flags, &flagmask) ? flags : NOISE_FLAG_DEFAULTS;
996998

‎src/script/common/c_converter.cpp

+52
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,19 @@ v2s16 read_v2s16(lua_State *L, int index)
5959
return p;
6060
}
6161

62+
v2s16 check_v2s16(lua_State *L, int index)
63+
{
64+
v2s16 p;
65+
luaL_checktype(L, index, LUA_TTABLE);
66+
lua_getfield(L, index, "x");
67+
p.X = luaL_checknumber(L, -1);
68+
lua_pop(L, 1);
69+
lua_getfield(L, index, "y");
70+
p.Y = luaL_checknumber(L, -1);
71+
lua_pop(L, 1);
72+
return p;
73+
}
74+
6275
v2s32 read_v2s32(lua_State *L, int index)
6376
{
6477
v2s32 p;
@@ -85,6 +98,19 @@ v2f read_v2f(lua_State *L, int index)
8598
return p;
8699
}
87100

101+
v2f check_v2f(lua_State *L, int index)
102+
{
103+
v2f p;
104+
luaL_checktype(L, index, LUA_TTABLE);
105+
lua_getfield(L, index, "x");
106+
p.X = luaL_checknumber(L, -1);
107+
lua_pop(L, 1);
108+
lua_getfield(L, index, "y");
109+
p.Y = luaL_checknumber(L, -1);
110+
lua_pop(L, 1);
111+
return p;
112+
}
113+
88114
v3f read_v3f(lua_State *L, int index)
89115
{
90116
v3f pos;
@@ -285,6 +311,32 @@ bool getintfield(lua_State *L, int table,
285311
return got;
286312
}
287313

314+
bool getintfield(lua_State *L, int table,
315+
const char *fieldname, u16 &result)
316+
{
317+
lua_getfield(L, table, fieldname);
318+
bool got = false;
319+
if(lua_isnumber(L, -1)){
320+
result = lua_tonumber(L, -1);
321+
got = true;
322+
}
323+
lua_pop(L, 1);
324+
return got;
325+
}
326+
327+
bool getintfield(lua_State *L, int table,
328+
const char *fieldname, u32 &result)
329+
{
330+
lua_getfield(L, table, fieldname);
331+
bool got = false;
332+
if(lua_isnumber(L, -1)){
333+
result = lua_tonumber(L, -1);
334+
got = true;
335+
}
336+
lua_pop(L, 1);
337+
return got;
338+
}
339+
288340
bool getfloatfield(lua_State *L, int table,
289341
const char *fieldname, float &result)
290342
{

‎src/script/common/c_converter.h

+6
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ size_t getstringlistfield(lua_State *L, int table,
5353
std::vector<std::string> *result);
5454
bool getintfield(lua_State *L, int table,
5555
const char *fieldname, int &result);
56+
bool getintfield(lua_State *L, int table,
57+
const char *fieldname, u16 &result);
58+
bool getintfield(lua_State *L, int table,
59+
const char *fieldname, u32 &result);
5660
void read_groups(lua_State *L, int index,
5761
std::map<std::string, int> &result);
5862
bool getboolfield(lua_State *L, int table,
@@ -72,6 +76,8 @@ void setboolfield(lua_State *L, int table,
7276

7377

7478
v3f checkFloatPos (lua_State *L, int index);
79+
v2f check_v2f (lua_State *L, int index);
80+
v2s16 check_v2s16 (lua_State *L, int index);
7581
v3f check_v3f (lua_State *L, int index);
7682
v3s16 check_v3s16 (lua_State *L, int index);
7783

‎src/script/lua_api/l_noise.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ int LuaPerlinNoise::l_get2d(lua_State *L)
4343
{
4444
NO_MAP_LOCK_REQUIRED;
4545
LuaPerlinNoise *o = checkobject(L, 1);
46-
v2f p = read_v2f(L, 2);
46+
v2f p = check_v2f(L, 2);
4747
lua_Number val = NoisePerlin2D(&o->np, p.X, p.Y, 0);
4848
lua_pushnumber(L, val);
4949
return 1;
@@ -54,7 +54,7 @@ int LuaPerlinNoise::l_get3d(lua_State *L)
5454
{
5555
NO_MAP_LOCK_REQUIRED;
5656
LuaPerlinNoise *o = checkobject(L, 1);
57-
v3f p = read_v3f(L, 2);
57+
v3f p = check_v3f(L, 2);
5858
lua_Number val = NoisePerlin3D(&o->np, p.X, p.Y, p.Z, 0);
5959
lua_pushnumber(L, val);
6060
return 1;
@@ -168,7 +168,7 @@ int LuaPerlinNoiseMap::l_get2dMap(lua_State *L)
168168
size_t i = 0;
169169

170170
LuaPerlinNoiseMap *o = checkobject(L, 1);
171-
v2f p = read_v2f(L, 2);
171+
v2f p = check_v2f(L, 2);
172172

173173
Noise *n = o->noise;
174174
n->perlinMap2D(p.X, p.Y);
@@ -191,7 +191,7 @@ int LuaPerlinNoiseMap::l_get2dMap_flat(lua_State *L)
191191
NO_MAP_LOCK_REQUIRED;
192192

193193
LuaPerlinNoiseMap *o = checkobject(L, 1);
194-
v2f p = read_v2f(L, 2);
194+
v2f p = check_v2f(L, 2);
195195

196196
Noise *n = o->noise;
197197
n->perlinMap2D(p.X, p.Y);
@@ -213,7 +213,7 @@ int LuaPerlinNoiseMap::l_get3dMap(lua_State *L)
213213
size_t i = 0;
214214

215215
LuaPerlinNoiseMap *o = checkobject(L, 1);
216-
v3f p = read_v3f(L, 2);
216+
v3f p = check_v3f(L, 2);
217217

218218
if (!o->m_is3d)
219219
return 0;
@@ -243,7 +243,7 @@ int LuaPerlinNoiseMap::l_get3dMap_flat(lua_State *L)
243243
NO_MAP_LOCK_REQUIRED;
244244

245245
LuaPerlinNoiseMap *o = checkobject(L, 1);
246-
v3f p = read_v3f(L, 2);
246+
v3f p = check_v3f(L, 2);
247247

248248
if (!o->m_is3d)
249249
return 0;

0 commit comments

Comments
 (0)
Please sign in to comment.