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

Lua templating reading (part 4): s16, v2s16, v2f (#7512)

Browse source
This commit is contained in:
Loïc Blot 2018-07-08 23:06:33 +02:00 • committed by GitHub
parent 94cd2bfeac
commit a61e1a4dbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 61 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/script/lua_api/l_noise.cpp
View file

@ -40,7 +40,7 @@ int LuaPerlinNoise::l_get_2d(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
LuaPerlinNoise *o = checkobject(L, 1);
v2f p = check_v2f(L, 2);
v2f p = readParam<v2f>(L, 2);
lua_Number val = NoisePerlin2D(&o->np, p.X, p.Y, 0);
lua_pushnumber(L, val);
return 1;
@ -166,7 +166,7 @@ int LuaPerlinNoiseMap::l_get_2d_map(lua_State *L)
size_t i = 0;
LuaPerlinNoiseMap *o = checkobject(L, 1);
v2f p = check_v2f(L, 2);
v2f p = readParam<v2f>(L, 2);
Noise *n = o->noise;
n->perlinMap2D(p.X, p.Y);
@ -189,8 +189,8 @@ int LuaPerlinNoiseMap::l_get_2d_map_flat(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaPerlinNoiseMap *o = checkobject(L, 1);
v2f p = check_v2f(L, 2);
bool use_buffer = lua_istable(L, 3);
v2f p = readParam<v2f>(L, 2);
bool use_buffer = lua_istable(L, 3);
Noise *n = o->noise;
n->perlinMap2D(p.X, p.Y);
@ -275,7 +275,7 @@ int LuaPerlinNoiseMap::l_calc_2d_map(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaPerlinNoiseMap *o = checkobject(L, 1);
v2f p = check_v2f(L, 2);
v2f p = readParam<v2f>(L, 2);
Noise *n = o->noise;
n->perlinMap2D(p.X, p.Y);

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

@ -458,7 +458,7 @@ int ObjectRef::l_set_animation(lua_State *L)
// Do it
v2f frames = v2f(1, 1);
if (!lua_isnil(L, 2))
frames = read_v2f(L, 2);
frames = readParam<v2f>(L, 2);
float frame_speed = 15;
if (!lua_isnil(L, 3))
frame_speed = lua_tonumber(L, 3);
@ -955,7 +955,7 @@ int ObjectRef::l_set_sprite(lua_State *L)
// Do it
v2s16 p(0,0);
if (!lua_isnil(L, 2))
p = read_v2s16(L, 2);
p = readParam<v2s16>(L, 2);
int num_frames = 1;
if (!lua_isnil(L, 3))
num_frames = lua_tonumber(L, 3);