Merge default into minor.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-01-12 22:52:24 -04:00
9 changed files with 22 additions and 8 deletions
+4
View File
@@ -61,6 +61,10 @@ float RopeJoint::getMaxLength() const
return Physics::scaleUp(joint->GetMaxLength());
}
void RopeJoint::setMaxLength(float maxLength)
{
joint->SetMaxLength(Physics::scaleDown(maxLength));
}
} // box2d
} // physics
+1
View File
@@ -52,6 +52,7 @@ public:
* Gets the maximum length of the rope.
**/
float getMaxLength() const;
void setMaxLength(float length);
private:
// The Box2D RopeJoint object.
@@ -42,9 +42,18 @@ int w_RopeJoint_getMaxLength(lua_State *L)
return 1;
}
int w_RopeJoint_setMaxLength(lua_State *L)
{
RopeJoint *t = luax_checkropejoint(L, 1);
float arg1 = (float)luaL_checknumber(L, 2);
t->setMaxLength(arg1);
return 0;
}
static const luaL_Reg w_RopeJoint_functions[] =
{
{ "getMaxLength", w_RopeJoint_getMaxLength },
{ "setMaxLength", w_RopeJoint_setMaxLength },
{ 0, 0 }
};