From a2fcdef91e1e839e55d0db295abe80961a8a2dc0 Mon Sep 17 00:00:00 2001 From: sanine-a Date: Thu, 23 Mar 2023 14:21:30 -0500 Subject: fix dContact paramenters getting parsed as integers instead of numbers --- src/ode/joint.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/ode/joint.c b/src/ode/joint.c index 7ff4c22..f735d6a 100644 --- a/src/ode/joint.c +++ b/src/ode/joint.c @@ -70,46 +70,46 @@ static int parse_surface_params(lua_State *L, struct dSurfaceParameters *surface if (!lua_isnil(L, -1)) surface->mode = lua_tointeger(L, -1); get_field(L, tbl, "mu", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->mu = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->mu = lua_tonumber(L, -1); get_field(L, tbl, "mu2", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->mu2 = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->mu2 = lua_tonumber(L, -1); get_field(L, tbl, "rho", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->rho = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->rho = lua_tonumber(L, -1); get_field(L, tbl, "rho2", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->rho2 = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->rho2 = lua_tonumber(L, -1); get_field(L, tbl, "rhoN", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->rhoN = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->rhoN = lua_tonumber(L, -1); get_field(L, tbl, "bounce", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->bounce = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->bounce = lua_tonumber(L, -1); get_field(L, tbl, "bounce_vel", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->bounce_vel = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->bounce_vel = lua_tonumber(L, -1); get_field(L, tbl, "soft_erp", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->soft_erp = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->soft_erp = lua_tonumber(L, -1); get_field(L, tbl, "soft_cfm", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->soft_cfm = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->soft_cfm = lua_tonumber(L, -1); get_field(L, tbl, "motion1", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->motion1 = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->motion1 = lua_tonumber(L, -1); get_field(L, tbl, "motion2", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->motion2 = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->motion2 = lua_tonumber(L, -1); get_field(L, tbl, "motionN", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->motionN = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->motionN = lua_tonumber(L, -1); get_field(L, tbl, "slip1", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->slip1 = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->slip1 = lua_tonumber(L, -1); get_field(L, tbl, "slip2", LUA_TNUMBER); - if (!lua_isnil(L, -1)) surface->slip2 = lua_tointeger(L, -1); + if (!lua_isnil(L, -1)) surface->slip2 = lua_tonumber(L, -1); lua_pop(L, 15); } -- cgit v1.2.1