diff --git a/src/logic/scripting/lua/libvecn.cpp b/src/logic/scripting/lua/libvecn.cpp index 62f4b163..a2a8a4a5 100644 --- a/src/logic/scripting/lua/libvecn.cpp +++ b/src/logic/scripting/lua/libvecn.cpp @@ -2,42 +2,83 @@ #include -template< - uint n, - glm::vec(*tofunc)(lua::State*, int), - int(*setfunc)(lua::State*, int, glm::vec) -> -static int l_add(lua::State* L) { +template class Op> +static int l_binop(lua::State* L) { uint argc = lua::gettop(L); - auto a = tofunc(L, 1); - auto b = tofunc(L, 2); + auto a = lua::tovec(L, 1); + auto b = lua::tovec(L, 2); + Op op; switch (argc) { case 2: lua::createtable(L, n, 0); for (uint i = 0; i < n; i++) { - lua::pushnumber(L, a[i]+b[i]); + lua::pushnumber(L, op(a[i], b[i])); lua::rawseti(L, i+1); } return 1; case 3: - return setfunc(L, 3, a + b); + return lua::setvec(L, 3, op(a, b)); default: { throw std::runtime_error("invalid arguments number (2 or 3 expected)"); } } } +template +static int l_normalize(lua::State* L) { + uint argc = lua::gettop(L); + auto vec = glm::normalize(lua::tovec(L, 1)); + switch (argc) { + case 1: + lua::createtable(L, n, 0); + for (uint i = 0; i < n; i++) { + lua::pushnumber(L, vec[i]); + lua::rawseti(L, i+1); + } + return 1; + case 3: + return lua::setvec(L, 3, vec); + default: { + throw std::runtime_error("invalid arguments number (1 or 2 expected)"); + } + } +} + +template +static int l_len(lua::State* L) { + auto vec = lua::tovec(L, 1); + if (lua::gettop(L) != 1) { + throw std::runtime_error("invalid arguments number (1 expected)"); + } + return lua::pushnumber(L, glm::length(vec)); +} + const luaL_Reg vec2lib [] = { - {"add", lua::wrap>>}, + {"add", lua::wrap>}, + {"sub", lua::wrap>}, + {"mul", lua::wrap>}, + {"div", lua::wrap>}, + {"normalize", lua::wrap>}, + {"length", lua::wrap>}, {NULL, NULL} }; const luaL_Reg vec3lib [] = { - {"add", lua::wrap>>}, + {"add", lua::wrap>}, + {"sub", lua::wrap>}, + {"mul", lua::wrap>}, + {"div", lua::wrap>}, + {"normalize", lua::wrap>}, + {"length", lua::wrap>}, {NULL, NULL} }; const luaL_Reg vec4lib [] = { - {"add", lua::wrap>>}, + {"add", lua::wrap>}, + {"sub", lua::wrap>}, + {"mul", lua::wrap>}, + {"div", lua::wrap>}, + {"normalize", lua::wrap>}, + {"length", lua::wrap>}, {NULL, NULL} }; diff --git a/src/logic/scripting/lua/lua_util.hpp b/src/logic/scripting/lua/lua_util.hpp index 308ef83e..82e71d24 100644 --- a/src/logic/scripting/lua/lua_util.hpp +++ b/src/logic/scripting/lua/lua_util.hpp @@ -328,6 +328,22 @@ namespace lua { setglobal(L, name); } + template + inline glm::vec tovec(lua::State* L, int idx) { + pushvalue(L, idx); + if (!istable(L, idx) || objlen(L, idx) < n) { + throw std::runtime_error("value must be an array of "+std::to_string(n)+" numbers"); + } + glm::vec vec; + for (int i = 0; i < n; i++) { + rawgeti(L, 1); + vec[i] = tonumber(L, -1); + pop(L); + } + pop(L); + return vec; + } + inline glm::vec2 tovec2(lua::State* L, int idx) { pushvalue(L, idx); if (!istable(L, idx) || objlen(L, idx) < 2) {