Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lua compiles again

This commit is contained in:
Ricardo Quesada 2014-05-01 18:07:25 -07:00
parent 49045d81cc
commit b67f3008a5
2 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp
View File

@ -74,7 +74,7 @@ tolua_lerror:
return 0;
}
int lua_cocos2dx_physics_PhysicsWorld_getLayer(lua_State* tolua_S)
int lua_cocos2dx_physics_PhysicsWorld_getScene(lua_State* tolua_S)
{
int argc = 0;
cocos2d::PhysicsWorld* cobj = nullptr;
@ -93,7 +93,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getLayer(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getLayer'", NULL);
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getScene'", NULL);
return 0;
}
#endif
@ -103,7 +103,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getLayer(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::Layer& ret = cobj->getLayer();
cocos2d::Scene& ret = cobj->getScene();
do {
std::string hashName = typeid(ret).name();
@ -112,7 +112,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getLayer(lua_State* tolua_S)
if(iter != g_luaType.end()){
className = iter->second.c_str();
} else {
className = "cc.Layer";
className = "cc.Scene";
}
int ID = (int)(ret._ID);
@ -122,12 +122,12 @@ int lua_cocos2dx_physics_PhysicsWorld_getLayer(lua_State* tolua_S)
}while (0);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayer",argc, 0);
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScene",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getLayer'.",&tolua_err);
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getScene'.",&tolua_err);
#endif
return 0;
@ -334,11 +334,11 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S)
}} while (0);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createPolygon(arg0, arg1);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
do {
if (nullptr != ret)
{
@ -366,11 +366,11 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S)
ok &= luaval_to_physics_material(tolua_S, 3, &arg2);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createPolygon(arg0, arg1, arg2);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
do {
if (nullptr != ret)
@ -401,11 +401,11 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S)
ok &= luaval_to_vector2(tolua_S, 4, &arg3);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createPolygon(arg0, arg1, arg2, arg3);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
do {
if (nullptr != ret)
{
@ -455,11 +455,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S)
}} while (0);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgePolygon(arg0, arg1);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
do {
if (nullptr != ret)
{
@ -487,11 +487,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S)
ok &= luaval_to_physics_material(tolua_S, 3, &arg2);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgePolygon(arg0, arg1, arg2);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
do {
if (nullptr != ret)
{
@ -521,11 +521,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S)
ok &= luaval_to_number(tolua_S, 4,&arg3);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgePolygon(arg0, arg1, arg2, arg3);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
do {
if (nullptr != ret)
{
@ -575,11 +575,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S)
}} while (0);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeChain(arg0, arg1);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
do {
if (nullptr != ret)
{
@ -607,11 +607,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S)
ok &= luaval_to_physics_material(tolua_S, 3, &arg2);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeChain(arg0, arg1, arg2);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
do {
if (nullptr != ret)
{
@ -641,11 +641,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S)
ok &= luaval_to_number(tolua_S, 4,&arg3);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeChain(arg0, arg1, arg2, arg3);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
do {
if (nullptr != ret)
{
@ -695,12 +695,12 @@ int lua_cocos2dx_physics_PhysicsShape_recenterPoints(lua_State* tolua_S)
}} while (0);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShape::recenterPoints(arg0, arg1);
vector2_array_to_luaval(tolua_S, arg0, arg1);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
@ -717,12 +717,12 @@ int lua_cocos2dx_physics_PhysicsShape_recenterPoints(lua_State* tolua_S)
ok &= luaval_to_vector2(tolua_S, 3, &arg2);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShape::recenterPoints(arg0, arg1, arg2);
vector2_array_to_luaval(tolua_S, arg0, arg1);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "recenterPoints",argc, 2);
@ -760,11 +760,11 @@ int lua_cocos2dx_physics_PhysicsShape_getPolyonCenter(lua_State* tolua_S)
}} while (0);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::Vector2 ret = cocos2d::PhysicsShape::getPolyonCenter(arg0, arg1);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -890,11 +890,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S)
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShapePolygon* ret = cocos2d::PhysicsShapePolygon::create(arg0, arg1);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
object_to_luaval<cocos2d::PhysicsShapePolygon>(tolua_S, "cc.PhysicsShapePolygon",(cocos2d::PhysicsShapePolygon*)ret);
return 1;
}
@ -911,11 +911,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S)
ok &= luaval_to_physics_material(tolua_S, 3, &arg2);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShapePolygon* ret = cocos2d::PhysicsShapePolygon::create(arg0, arg1, arg2);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
object_to_luaval<cocos2d::PhysicsShapePolygon>(tolua_S, "cc.PhysicsShapePolygon",(cocos2d::PhysicsShapePolygon*)ret);
return 1;
}
@ -934,11 +934,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S)
ok &= luaval_to_vector2(tolua_S, 4, &arg3);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShapePolygon* ret = cocos2d::PhysicsShapePolygon::create(arg0, arg1, arg2, arg3);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
object_to_luaval<cocos2d::PhysicsShapePolygon>(tolua_S, "cc.PhysicsShapePolygon",(cocos2d::PhysicsShapePolygon*)ret);
return 1;
}
@ -976,11 +976,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateArea(lua_State* tolua_S)
}} while (0);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
double ret = cocos2d::PhysicsShapePolygon::calculateArea(arg0, arg1);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
@ -1020,11 +1020,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateMoment(lua_State* tolua_S)
}} while (0);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg1);
CC_SAFE_FREE(arg1);
return 0;
}
double ret = cocos2d::PhysicsShapePolygon::calculateMoment(arg0, arg1, arg2);
CC_SAFE_DELETE_ARRAY(arg1);
CC_SAFE_FREE(arg1);
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
@ -1043,11 +1043,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateMoment(lua_State* tolua_S)
ok &= luaval_to_vector2(tolua_S, 4, &arg3);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg1);
CC_SAFE_FREE(arg1);
return 0;
}
double ret = cocos2d::PhysicsShapePolygon::calculateMoment(arg0, arg1, arg2, arg3);
CC_SAFE_DELETE_ARRAY(arg1);
CC_SAFE_FREE(arg1);
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
@ -1322,11 +1322,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S)
}} while (0);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShapeEdgePolygon* ret = cocos2d::PhysicsShapeEdgePolygon::create(arg0, arg1);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
object_to_luaval<cocos2d::PhysicsShapeEdgePolygon>(tolua_S, "cc.PhysicsShapeEdgePolygon",(cocos2d::PhysicsShapeEdgePolygon*)ret);
return 1;
}
@ -1343,11 +1343,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S)
ok &= luaval_to_physics_material(tolua_S, 3, &arg2);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShapeEdgePolygon* ret = cocos2d::PhysicsShapeEdgePolygon::create(arg0, arg1, arg2);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
object_to_luaval<cocos2d::PhysicsShapeEdgePolygon>(tolua_S, "cc.PhysicsShapeEdgePolygon",(cocos2d::PhysicsShapeEdgePolygon*)ret);
return 1;
}
@ -1366,11 +1366,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S)
ok &= luaval_to_number(tolua_S, 4,&arg3);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShapeEdgePolygon* ret = cocos2d::PhysicsShapeEdgePolygon::create(arg0, arg1, arg2, arg3);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
object_to_luaval<cocos2d::PhysicsShapeEdgePolygon>(tolua_S, "cc.PhysicsShapeEdgePolygon",(cocos2d::PhysicsShapeEdgePolygon*)ret);
return 1;
}
@ -1409,11 +1409,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S)
}} while (0);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShapeEdgeChain* ret = cocos2d::PhysicsShapeEdgeChain::create(arg0, arg1);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
object_to_luaval<cocos2d::PhysicsShapeEdgeChain>(tolua_S, "cc.PhysicsShapeEdgeChain",(cocos2d::PhysicsShapeEdgeChain*)ret);
return 1;
}
@ -1430,11 +1430,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S)
ok &= luaval_to_physics_material(tolua_S, 3, &arg2);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShapeEdgeChain* ret = cocos2d::PhysicsShapeEdgeChain::create(arg0, arg1, arg2);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
object_to_luaval<cocos2d::PhysicsShapeEdgeChain>(tolua_S, "cc.PhysicsShapeEdgeChain",(cocos2d::PhysicsShapeEdgeChain*)ret);
return 1;
}
@ -1453,11 +1453,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S)
ok &= luaval_to_number(tolua_S, 4,&arg3);
if(!ok)
{
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
return 0;
}
cocos2d::PhysicsShapeEdgeChain* ret = cocos2d::PhysicsShapeEdgeChain::create(arg0, arg1, arg2, arg3);
CC_SAFE_DELETE_ARRAY(arg0);
CC_SAFE_FREE(arg0);
object_to_luaval<cocos2d::PhysicsShapeEdgeChain>(tolua_S, "cc.PhysicsShapeEdgeChain",(cocos2d::PhysicsShapeEdgeChain*)ret);
return 1;
}
@ -1573,8 +1573,8 @@ int register_all_cocos2dx_physics_manual(lua_State* tolua_S)
lua_rawget(tolua_S, LUA_REGISTRYINDEX);
if (lua_istable(tolua_S,-1))
{
lua_pushstring(tolua_S,"getLayer");
lua_pushcfunction(tolua_S, lua_cocos2dx_physics_PhysicsWorld_getLayer );
lua_pushstring(tolua_S,"getScene");
lua_pushcfunction(tolua_S, lua_cocos2dx_physics_PhysicsWorld_getScene );
lua_rawset(tolua_S,-3);
lua_pushstring(tolua_S,"queryPoint");
lua_pushcfunction(tolua_S, lua_cocos2dx_physics_PhysicsWorld_queryPoint );

2
tools/tolua/cocos2dx_physics.ini
View File

@ -42,7 +42,7 @@ skip = PhysicsBody::[getJoints createPolygon createEdgeChain createEdgePolygon],
PhysicsShapePolygon::[create calculateArea calculateMoment ^getPoints$],
PhysicsShapeEdgePolygon::[create ^getPoints$],
PhysicsShapeEdgeChain::[create ^getPoints$],
PhysicsWorld::[getLayer queryPoint queryRect rayCast],
PhysicsWorld::[getScene queryPoint queryRect rayCast],
PhysicsContact::[getData setData]