LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add second body anchor point to FrictionJoint/WeldJoint constructors

Browse Source 
--HG--
branch : box2d-update
This commit is contained in:
Bill Meltsner
2011-10-02 10:06:31 -04:00
parent 735c52b228
commit f38655a934
7 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/wrap_Physics.cpp
+28 -8
View File
@@ -234,10 +234,20 @@ namespace box2d
{
Body * body1 = luax_checktype<Body>(L, 1, "Body", PHYSICS_BODY_T);
Body * body2 = luax_checktype<Body>(L, 2, "Body", PHYSICS_BODY_T);
float x = (float)luaL_checknumber(L, 3);
float y = (float)luaL_checknumber(L, 4);
bool collideConnected = luax_optboolean(L, 5, false);
FrictionJoint * j = instance->newFrictionJoint(body1, body2, x, y, collideConnected);
float xA = (float)luaL_checknumber(L, 3);
float yA = (float)luaL_checknumber(L, 4);
float xB, yB;
bool collideConnected;
if (lua_gettop(L) >= 6) {
xB = (float)luaL_checknumber(L, 5);
yB = (float)luaL_checknumber(L, 6);
collideConnected = luax_optboolean(L, 7, false);
} else {
xB = xA;
yB = yA;
collideConnected = luax_optboolean(L, 5, false);
}
FrictionJoint * j = instance->newFrictionJoint(body1, body2, xA, yA, xB, yB, collideConnected);
luax_newtype(L, "FrictionJoint", PHYSICS_FRICTION_JOINT_T, (void*)j);
return 1;
}
@@ -246,10 +256,20 @@ namespace box2d
{
Body * body1 = luax_checktype<Body>(L, 1, "Body", PHYSICS_BODY_T);
Body * body2 = luax_checktype<Body>(L, 2, "Body", PHYSICS_BODY_T);
float x = (float)luaL_checknumber(L, 3);
float y = (float)luaL_checknumber(L, 4);
bool collideConnected = luax_optboolean(L, 5, false);
WeldJoint * j = instance->newWeldJoint(body1, body2, x, y, collideConnected);
float xA = (float)luaL_checknumber(L, 3);
float yA = (float)luaL_checknumber(L, 4);
float xB, yB;
bool collideConnected;
if (lua_gettop(L) >= 6) {
xB = (float)luaL_checknumber(L, 5);
yB = (float)luaL_checknumber(L, 6);
collideConnected = luax_optboolean(L, 7, false);
} else {
xB = xA;
yB = yA;
collideConnected = luax_optboolean(L, 5, false);
}
WeldJoint * j = instance->newWeldJoint(body1, body2, xA, yA, xB, yB, collideConnected);
luax_newtype(L, "WeldJoint", PHYSICS_WELD_JOINT_T, (void*)j);
return 1;
}