voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-13 06:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix glm quaternions issues

Browse source
This commit is contained in:
MihailRis 2024-10-23 09:45:31 +03:00
parent 8aab119e7d
commit 55128f2b94
1 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/logic/scripting/lua/lua_util.hpp
View file

@ -106,18 +106,34 @@ namespace lua {
inline int pushquat(lua::State* L, glm::quat quat) { inline int pushquat(lua::State* L, glm::quat quat) {
createtable(L, 4, 0); createtable(L, 4, 0);
for (size_t i = 0; i < 4; i++) {
pushnumber(L, quat[i]); pushnumber(L, quat.w);
rawseti(L, i + 1); rawseti(L, 1);
}
pushnumber(L, quat.x);
rawseti(L, 2);
pushnumber(L, quat.y);
rawseti(L, 3);
pushnumber(L, quat.z);
rawseti(L, 4);
return 1; return 1;
} }
inline int setquat(lua::State* L, int idx, glm::quat quat) { inline int setquat(lua::State* L, int idx, glm::quat quat) {
pushvalue(L, idx); pushvalue(L, idx);
for (int i = 0; i < 4; i++) {
pushnumber(L, quat[i]); pushnumber(L, quat.w);
rawseti(L, i + 1); rawseti(L, 1);
}
pushnumber(L, quat.x);
rawseti(L, 2);
pushnumber(L, quat.y);
rawseti(L, 3);
pushnumber(L, quat.z);
rawseti(L, 4);
return 1; return 1;
} }
inline int pushmat4(lua::State* L, glm::mat4 matrix) { inline int pushmat4(lua::State* L, glm::mat4 matrix) {
@ -337,17 +353,18 @@ namespace lua {
throw std::runtime_error("value must be an array of four numbers"); throw std::runtime_error("value must be an array of four numbers");
} }
rawgeti(L, 1); rawgeti(L, 1);
auto x = tonumber(L, -1);
pop(L);
rawgeti(L, 2);
auto y = tonumber(L, -1);
pop(L);
rawgeti(L, 3);
auto z = tonumber(L, -1);
pop(L);
rawgeti(L, 4);
auto w = tonumber(L, -1); auto w = tonumber(L, -1);
pop(L); pop(L);
rawgeti(L, 2);
auto x = tonumber(L, -1);
pop(L);
rawgeti(L, 3);
auto y = tonumber(L, -1);
pop(L);
rawgeti(L, 4);
auto z = tonumber(L, -1);
pop(L);
pop(L); pop(L);
return glm::quat(x, y, z, w); return glm::quat(x, y, z, w);
} }