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

some more Shape fixes

Browse Source 
--HG--
branch : box2d-update
This commit is contained in:
Bill Meltsner
2011-03-13 10:09:17 -04:00
parent c3d69746c1
commit be146c5f61
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/wrap_Physics.cpp
+30 -21
View File
@@ -63,22 +63,21 @@ namespace box2d
int w_newCircleShape(lua_State * L) int w_newCircleShape(lua_State * L)
{ {
Body * body = luax_checktype<Body>(L, 1, "Body", PHYSICS_BODY_T);
int top = lua_gettop(L); int top = lua_gettop(L);
if(top == 2) if(top == 1)
{ {
float radius = (float)luaL_checknumber(L, 2); float radius = (float)luaL_checknumber(L, 1);
CircleShape * shape = instance->newCircleShape(body, radius); CircleShape * shape = instance->newCircleShape(radius);
luax_newtype(L, "CircleShape", PHYSICS_CIRCLE_SHAPE_T, (void*)shape); luax_newtype(L, "CircleShape", PHYSICS_CIRCLE_SHAPE_T, (void*)shape);
return 1; return 1;
} }
else if(top == 4) else if(top == 3)
{ {
float x = (float)luaL_checknumber(L, 2); float x = (float)luaL_checknumber(L, 1);
float y = (float)luaL_checknumber(L, 3); float y = (float)luaL_checknumber(L, 2);
float radius = (float)luaL_checknumber(L, 4); float radius = (float)luaL_checknumber(L, 3);
CircleShape * shape = instance->newCircleShape(body, x, y, radius); CircleShape * shape = instance->newCircleShape(x, y, radius);
luax_newtype(L, "CircleShape", PHYSICS_CIRCLE_SHAPE_T, (void*)shape); luax_newtype(L, "CircleShape", PHYSICS_CIRCLE_SHAPE_T, (void*)shape);
return 1; return 1;
} }
@@ -88,25 +87,24 @@ namespace box2d
int w_newRectangleShape(lua_State * L) int w_newRectangleShape(lua_State * L)
{ {
Body * body = luax_checktype<Body>(L, 1, "Body", PHYSICS_BODY_T);
int top = lua_gettop(L); int top = lua_gettop(L);
if(top == 3) if(top == 2)
{ {
float w = (float)luaL_checknumber(L, 2); float w = (float)luaL_checknumber(L, 1);
float h = (float)luaL_checknumber(L, 3); float h = (float)luaL_checknumber(L, 2);
PolygonShape * shape = instance->newRectangleShape(body, w, h); PolygonShape * shape = instance->newRectangleShape(w, h);
luax_newtype(L, "PolygonShape", PHYSICS_POLYGON_SHAPE_T, (void*)shape); luax_newtype(L, "PolygonShape", PHYSICS_POLYGON_SHAPE_T, (void*)shape);
return 1; return 1;
} }
else if(top == 5 || top == 6) else if(top == 4 || top == 5)
{ {
float x = (float)luaL_checknumber(L, 2); float x = (float)luaL_checknumber(L, 1);
float y = (float)luaL_checknumber(L, 3); float y = (float)luaL_checknumber(L, 2);
float w = (float)luaL_checknumber(L, 4); float w = (float)luaL_checknumber(L, 3);
float h = (float)luaL_checknumber(L, 5); float h = (float)luaL_checknumber(L, 4);
float angle = (float)luaL_optnumber(L, 6, 0); float angle = (float)luaL_optnumber(L, 5, 0);
PolygonShape * shape = instance->newRectangleShape(body, x, y, w, h, angle); PolygonShape * shape = instance->newRectangleShape(x, y, w, h, angle);
luax_newtype(L, "PolygonShape", PHYSICS_POLYGON_SHAPE_T, (void*)shape); luax_newtype(L, "PolygonShape", PHYSICS_POLYGON_SHAPE_T, (void*)shape);
return 1; return 1;
} }
@@ -114,6 +112,17 @@ namespace box2d
return luaL_error(L, "Incorrect number of parameters"); return luaL_error(L, "Incorrect number of parameters");
} }
int w_newEdgeShape(lua_State * L)
{
float x1 = (float)luaL_checknumber(L, 1);
float y1 = (float)luaL_checknumber(L, 2);
float x2 = (float)luaL_checknumber(L, 3);
float y2 = (float)luaL_checknumber(L, 4);
PolygonShape * shape = instance->newEdgeShape(x1, y1, x2, y2);
luax_newtype(L, "PolygonShape", PHYSICS_POLYGON_SHAPE_T, (void*)shape);
return 1;
}
int w_newPolygonShape(lua_State * L) int w_newPolygonShape(lua_State * L)
{ {
return instance->newPolygonShape(L); return instance->newPolygonShape(L);
src/modules/physics/box2d/wrap_Physics.h
+2 -1
View File
@@ -48,7 +48,8 @@ namespace box2d
int w_newBody(lua_State * L); int w_newBody(lua_State * L);
int w_newCircleShape(lua_State * L); int w_newCircleShape(lua_State * L);
int w_newRectangleShape(lua_State * L); int w_newRectangleShape(lua_State * L);
int w_newPolygonShape(lua_State * L);; int w_newEdgeShape(lua_State * L);
int w_newPolygonShape(lua_State * L);
int w_newDistanceJoint(lua_State * L); int w_newDistanceJoint(lua_State * L);
int w_newMouseJoint(lua_State * L); int w_newMouseJoint(lua_State * L);
int w_newRevoluteJoint(lua_State * L); int w_newRevoluteJoint(lua_State * L);