mirror of
https://github.com/bjornbytes/lovr.git
synced 2024-07-05 22:03:36 +00:00
Fix vec3:set;
This commit is contained in:
parent
49b0aaa986
commit
c7fa8f8497
|
@ -92,7 +92,7 @@ ffi.metatype(vec3, {
|
||||||
set = function(v, x, y, z)
|
set = function(v, x, y, z)
|
||||||
checkvec3(v)
|
checkvec3(v)
|
||||||
if x == nil or type(x) == 'number' then
|
if x == nil or type(x) == 'number' then
|
||||||
v.x, v.y, v.z = x or 0, y or 0, z or 0
|
v.x, v.y, v.z = x or 0, y or x or 0, z or x or 0
|
||||||
else
|
else
|
||||||
checkvec3(x, 1)
|
checkvec3(x, 1)
|
||||||
v.x, v.y, v.z = x.x, x.y, x.z
|
v.x, v.y, v.z = x.x, x.y, x.z
|
||||||
|
|
1101
src/api/math.lua.h
1101
src/api/math.lua.h
File diff suppressed because it is too large
Load diff
|
@ -66,8 +66,9 @@ static int l_lovrVec3Unpack(lua_State* L) {
|
||||||
|
|
||||||
int l_lovrVec3Set(lua_State* L) {
|
int l_lovrVec3Set(lua_State* L) {
|
||||||
vec3 v = luax_checkmathtype(L, 1, MATH_VEC3, NULL);
|
vec3 v = luax_checkmathtype(L, 1, MATH_VEC3, NULL);
|
||||||
if (lua_type(L, 2) == LUA_TNUMBER) {
|
if (lua_isnoneornil(L, 2) || lua_type(L, 2) == LUA_TNUMBER) {
|
||||||
vec3_set(v, luaL_checknumber(L, 2), luaL_checknumber(L, 3), luaL_checknumber(L, 4));
|
float x = luaL_optnumber(L, 2, 0.);
|
||||||
|
vec3_set(v, x, luaL_optnumber(L, 3, x), luaL_optnumber(L, 4, x));
|
||||||
} else {
|
} else {
|
||||||
vec3 u = luax_checkmathtype(L, 2, MATH_VEC3, "vec3 or number");
|
vec3 u = luax_checkmathtype(L, 2, MATH_VEC3, "vec3 or number");
|
||||||
vec3_init(v, u);
|
vec3_init(v, u);
|
||||||
|
|
Loading…
Reference in a new issue