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

Map box2d asserts to love::Exception and catch them in constructors

Browse Source 
Should be added to other functions commonly failing sometime.
This commit is contained in:
Bart van Strien
2011-06-08 21:44:21 +02:00
parent 3460bf918c
commit 6e28c49a20
2 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/Source/Common/b2Settings.h
+4 -4
View File
@@ -19,13 +19,13 @@
#ifndef B2_SETTINGS_H #ifndef B2_SETTINGS_H
#define B2_SETTINGS_H #define B2_SETTINGS_H
#include <assert.h> //#include <assert.h>
//#include <common/Exception.h> #include <common/Exception.h>
#include <cmath> #include <cmath>
#define B2_NOT_USED(x) x #define B2_NOT_USED(x) x
#define b2Assert(A) assert(A) //#define b2Assert(A) assert(A)
//#define b2Assert(A) {if(!(A)) throw love::Exception("Box2D error: " #A);} #define b2Assert(A) {if(!(A)) throw love::Exception(#A);}
// need to include NDS jtypes.h instead of // need to include NDS jtypes.h instead of
src/modules/physics/box2d/wrap_Physics.cpp
+53 -32
View File
@@ -66,24 +66,31 @@ namespace box2d
Body * body = luax_checktype<Body>(L, 1, "Body", PHYSICS_BODY_T); Body * body = luax_checktype<Body>(L, 1, "Body", PHYSICS_BODY_T);
int top = lua_gettop(L); int top = lua_gettop(L);
if(top == 2) try
{ {
float radius = (float)luaL_checknumber(L, 2); if(top == 2)
CircleShape * shape = instance->newCircleShape(body, radius); {
luax_newtype(L, "CircleShape", PHYSICS_CIRCLE_SHAPE_T, (void*)shape); float radius = (float)luaL_checknumber(L, 2);
return 1; CircleShape * shape = instance->newCircleShape(body, radius);
luax_newtype(L, "CircleShape", PHYSICS_CIRCLE_SHAPE_T, (void*)shape);
return 1;
}
else if(top == 4)
{
float x = (float)luaL_checknumber(L, 2);
float y = (float)luaL_checknumber(L, 3);
float radius = (float)luaL_checknumber(L, 4);
CircleShape * shape = instance->newCircleShape(body, x, y, radius);
luax_newtype(L, "CircleShape", PHYSICS_CIRCLE_SHAPE_T, (void*)shape);
return 1;
}
else
return luaL_error(L, "Incorrect number of parameters");
} }
else if(top == 4) catch (love::Exception e)
{ {
float x = (float)luaL_checknumber(L, 2); return luaL_error(L, "Box2D error: %s", e.what());
float y = (float)luaL_checknumber(L, 3);
float radius = (float)luaL_checknumber(L, 4);
CircleShape * shape = instance->newCircleShape(body, x, y, radius);
luax_newtype(L, "CircleShape", PHYSICS_CIRCLE_SHAPE_T, (void*)shape);
return 1;
} }
else
return luaL_error(L, "Incorrect number of parameters");
} }
int w_newRectangleShape(lua_State * L) int w_newRectangleShape(lua_State * L)
@@ -91,32 +98,46 @@ namespace box2d
Body * body = luax_checktype<Body>(L, 1, "Body", PHYSICS_BODY_T); Body * body = luax_checktype<Body>(L, 1, "Body", PHYSICS_BODY_T);
int top = lua_gettop(L); int top = lua_gettop(L);
if(top == 3) try
{ {
float w = (float)luaL_checknumber(L, 2); if(top == 3)
float h = (float)luaL_checknumber(L, 3); {
PolygonShape * shape = instance->newRectangleShape(body, w, h); float w = (float)luaL_checknumber(L, 2);
luax_newtype(L, "PolygonShape", PHYSICS_POLYGON_SHAPE_T, (void*)shape); float h = (float)luaL_checknumber(L, 3);
return 1; PolygonShape * shape = instance->newRectangleShape(body, w, h);
luax_newtype(L, "PolygonShape", PHYSICS_POLYGON_SHAPE_T, (void*)shape);
return 1;
}
else if(top == 5 || top == 6)
{
float x = (float)luaL_checknumber(L, 2);
float y = (float)luaL_checknumber(L, 3);
float w = (float)luaL_checknumber(L, 4);
float h = (float)luaL_checknumber(L, 5);
float angle = (float)luaL_optnumber(L, 6, 0);
PolygonShape * shape = instance->newRectangleShape(body, x, y, w, h, angle);
luax_newtype(L, "PolygonShape", PHYSICS_POLYGON_SHAPE_T, (void*)shape);
return 1;
}
else
return luaL_error(L, "Incorrect number of parameters");
} }
else if(top == 5 || top == 6) catch (love::Exception e)
{ {
float x = (float)luaL_checknumber(L, 2); return luaL_error(L, "Box2D error: %s", e.what());
float y = (float)luaL_checknumber(L, 3);
float w = (float)luaL_checknumber(L, 4);
float h = (float)luaL_checknumber(L, 5);
float angle = (float)luaL_optnumber(L, 6, 0);
PolygonShape * shape = instance->newRectangleShape(body, x, y, w, h, angle);
luax_newtype(L, "PolygonShape", PHYSICS_POLYGON_SHAPE_T, (void*)shape);
return 1;
} }
else
return luaL_error(L, "Incorrect number of parameters");
} }
int w_newPolygonShape(lua_State * L) int w_newPolygonShape(lua_State * L)
{ {
return instance->newPolygonShape(L); try
{
return instance->newPolygonShape(L);
}
catch (love::Exception e)
{
return luaL_error(L, "Box2D error: %s", e.what());
}
} }
int w_newDistanceJoint(lua_State * L) int w_newDistanceJoint(lua_State * L)