PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix func

Browse Source
This commit is contained in:
Cogi Asd
2024-07-08 23:15:53 +03:00
parent e55d6a36e3
commit 175cfdf488
1 changed files with 24 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/scripting/lua/libvecn.cpp
+24 -73
View File
@@ -75,61 +75,31 @@ static int l_pow(lua::State* L) {
if (argc != 2 && argc != 3) { if (argc != 2 && argc != 3) {
throw std::runtime_error("invalid arguments number (2 or 3 expected)"); throw std::runtime_error("invalid arguments number (2 or 3 expected)");
} }
const auto& a = lua::tovec<n>(L, 1); //vector auto a = lua::tovec<n>(L, 1);
if (lua::isnumber(L, 2)) { // scalar second operand overload if (lua::isnumber(L, 2)) {
const auto& b = lua::tonumber(L, 2); //scalar (pow) auto b = lua::tonumber(L, 2);
if (argc == 2) { if (argc == 2) {
glm::vec<n, float> result_vector;
for (int i = 0; i < n; i++) {
result_vector[i] = pow(a[i], b);
}
lua::createtable(L, n, 0); lua::createtable(L, n, 0);
for (uint i = 0; i < n; i++) { for (uint i = 0; i < n; i++) {
lua::pushnumber(L, result_vector[i]); lua::pushnumber(L, pow(a[i], b));
lua::rawseti(L, i+1); lua::rawseti(L, i+1);
} }
return 1; return 1;
} else { } else {
glm::vec<n, float> result_vector; return lua::setvec(L, 3, pow(a, glm::vec<n, float>(b)));
for (int i = 0; i < n; i++) {
result_vector[i] = pow(a[i], b);
}
lua::pushvalue(L, 3);
lua::createtable(L, n, 0);
for (uint i = 0; i < n; i++) {
lua::pushnumber(L, result_vector[i]);
lua::rawseti(L, i+1);
}
lua_settable(L, 3);
return 0;
} }
} else { } else {
const auto& b = lua::tovec<n>(L, 2); //vector auto b = lua::tovec<n>(L, 2);
if (argc == 2) { if (argc == 2) {
glm::vec<n, float> result_vector;
for (int i = 0; i < n; i++) {
result_vector[i] = pow(a[i], b[i]);
}
lua::createtable(L, n, 0); lua::createtable(L, n, 0);
for (uint i = 0; i < n; i++) { for (uint i = 0; i < n; i++) {
lua::pushnumber(L, result_vector[i]); lua::pushnumber(L, pow(a[i], b[i]));
lua::rawseti(L, i+1); lua::rawseti(L, i+1);
} }
return 1; return 1;
} else { } else {
glm::vec<n, float> result_vector; return lua::setvec(L, 3, pow(a, b));
for (int i = 0; i < n; i++) {
result_vector[i] = pow(a[i], b[i]);
}
lua::pushvalue(L, 3);
lua::createtable(L, n, 0);
for (uint i = 0; i < n; i++) {
lua::pushnumber(L, result_vector[i]);
lua::rawseti(L, i+1);
}
lua_settable(L, 3);
return 0;
} }
} }
} }
@@ -137,50 +107,31 @@ static int l_pow(lua::State* L) {
template<int n> template<int n>
static int l_dot(lua::State* L) { static int l_dot(lua::State* L) {
uint argc = lua::gettop(L); uint argc = lua::gettop(L);
if (argc != 2 && argc != 3) { if (argc != 1) {
throw std::runtime_error("invalid arguments number (2 or 3 expected)"); throw std::runtime_error("invalid arguments number (1 expected)");
} }
const auto& a = lua::tovec<n>(L, 1); const auto& a = lua::tovec<n>(L, 1);
const auto& b = lua::tovec<n>(L, 2); const auto& b = lua::tovec<n>(L, 2);
if (argc == 2) { return lua::pushnumber(L, glm::dot(a, b));
lua::pushnumber(L, glm::dot(a, b));
return 1;
} else {
lua::pushnumber(L, glm::dot(a, b));
lua_settable(L, 3);
return 0;
}
} }
template<int n> template<int n>
static int l_inverse(lua::State* L) { static int l_inverse(lua::State* L) {
uint argc = lua::gettop(L); uint argc = lua::gettop(L);
if (argc != 1 && argc != 2) { auto vec = lua::tovec<n>(L, 1);
throw std::runtime_error("invalid arguments number (1 or 2 expected)"); switch (argc) {
} case 1:
const auto& _vector = lua::tovec<n>(L, 1); //vector lua::createtable(L, n, 0);
glm::vec<n, float> result_vector; for (uint i = 0; i < n; i++) {
lua::pushnumber(L, (-1)*vec[i]);
for (int i = 0; i < n; i++) { lua::rawseti(L, i+1);
result_vector[i] = -_vector[i]; }
} return 1;
case 2:
if (argc == 1) { return lua::setvec(L, 2, -vec);
lua::createtable(L, n, 0); default: {
for (uint i = 0; i < n; i++) { throw std::runtime_error("invalid arguments number (1 or 2 expected)");
lua::pushnumber(L, result_vector[i]);
lua::rawseti(L, i+1);
} }
return 1;
} else {
lua::pushvalue(L, 2);
lua::createtable(L, n, 0);
for (uint i = 0; i < n; i++) {
lua::pushnumber(L, result_vector[i]);
lua::rawseti(L, i+1);
}
lua_settable(L, 2);
return 0;
} }
} }