math cocos2d fixes

This commit is contained in:
Ricardo Quesada 2014-05-05 17:42:11 -07:00
parent f12ea26611
commit afaa701cff
10 changed files with 272 additions and 272 deletions

View File

@ -718,7 +718,7 @@ int lua_cocos2dx_GLProgram_setUniformsForBuiltins(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
do{
if (argc == 1) {
cocos2d::math::Matrix arg0;
cocos2d::Matrix arg0;
ok &= luaval_to_matrix(tolua_S, 2, &arg0);
if (!ok) { break; }
@ -1598,7 +1598,7 @@ int lua_cocos2dx_Touch_getPreviousLocationInView(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getPreviousLocationInView();
cocos2d::Vector2 ret = cobj->getPreviousLocationInView();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -1642,7 +1642,7 @@ int lua_cocos2dx_Touch_getLocation(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getLocation();
cocos2d::Vector2 ret = cobj->getLocation();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -1686,7 +1686,7 @@ int lua_cocos2dx_Touch_getDelta(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getDelta();
cocos2d::Vector2 ret = cobj->getDelta();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -1730,7 +1730,7 @@ int lua_cocos2dx_Touch_getStartLocationInView(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getStartLocationInView();
cocos2d::Vector2 ret = cobj->getStartLocationInView();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -1774,7 +1774,7 @@ int lua_cocos2dx_Touch_getStartLocation(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getStartLocation();
cocos2d::Vector2 ret = cobj->getStartLocation();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -1914,7 +1914,7 @@ int lua_cocos2dx_Touch_getLocationInView(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getLocationInView();
cocos2d::Vector2 ret = cobj->getLocationInView();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -1958,7 +1958,7 @@ int lua_cocos2dx_Touch_getPreviousLocation(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getPreviousLocation();
cocos2d::Vector2 ret = cobj->getPreviousLocation();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -3640,7 +3640,7 @@ int lua_cocos2dx_Texture2D_drawAtPoint(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -5406,12 +5406,12 @@ int lua_cocos2dx_Node_convertToWorldSpaceAR(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->convertToWorldSpaceAR(arg0);
cocos2d::Vector2 ret = cobj->convertToWorldSpaceAR(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -5952,7 +5952,7 @@ int lua_cocos2dx_Node_getNodeToWorldTransform(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Matrix ret = cobj->getNodeToWorldTransform();
cocos2d::Matrix ret = cobj->getNodeToWorldTransform();
matrix_to_luaval(tolua_S, ret);
return 1;
}
@ -5996,7 +5996,7 @@ int lua_cocos2dx_Node_getPosition3D(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector3 ret = cobj->getPosition3D();
cocos2d::Vector3 ret = cobj->getPosition3D();
vector3_to_luaval(tolua_S, ret);
return 1;
}
@ -6097,12 +6097,12 @@ int lua_cocos2dx_Node_convertToWorldSpace(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->convertToWorldSpace(arg0);
cocos2d::Vector2 ret = cobj->convertToWorldSpace(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -6373,7 +6373,7 @@ int lua_cocos2dx_Node_convertTouchToNodeSpace(lua_State* tolua_S)
ok &= luaval_to_object<cocos2d::Touch>(tolua_S, 2, "cc.Touch",&arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->convertTouchToNodeSpace(arg0);
cocos2d::Vector2 ret = cobj->convertTouchToNodeSpace(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -6600,7 +6600,7 @@ int lua_cocos2dx_Node_getRotation3D(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector3 ret = cobj->getRotation3D();
cocos2d::Vector3 ret = cobj->getRotation3D();
vector3_to_luaval(tolua_S, ret);
return 1;
}
@ -6644,7 +6644,7 @@ int lua_cocos2dx_Node_getNodeToParentTransform(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Matrix& ret = cobj->getNodeToParentTransform();
const cocos2d::Matrix& ret = cobj->getNodeToParentTransform();
matrix_to_luaval(tolua_S, ret);
return 1;
}
@ -6691,7 +6691,7 @@ int lua_cocos2dx_Node_convertTouchToNodeSpaceAR(lua_State* tolua_S)
ok &= luaval_to_object<cocos2d::Touch>(tolua_S, 2, "cc.Touch",&arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->convertTouchToNodeSpaceAR(arg0);
cocos2d::Vector2 ret = cobj->convertTouchToNodeSpaceAR(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -6733,12 +6733,12 @@ int lua_cocos2dx_Node_convertToNodeSpace(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->convertToNodeSpace(arg0);
cocos2d::Vector2 ret = cobj->convertToNodeSpace(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -6877,7 +6877,7 @@ int lua_cocos2dx_Node_setPosition(lua_State* tolua_S)
ok = true;
do{
if (argc == 1) {
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if (!ok) { break; }
@ -7111,7 +7111,7 @@ int lua_cocos2dx_Node_setRotation3D(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector3 arg0;
cocos2d::Vector3 arg0;
ok &= luaval_to_vector3(tolua_S, 2, &arg0);
if(!ok)
@ -7203,7 +7203,7 @@ int lua_cocos2dx_Node_setNodeToParentTransform(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Matrix arg0;
cocos2d::Matrix arg0;
ok &= luaval_to_matrix(tolua_S, 2, &arg0);
if(!ok)
@ -7251,7 +7251,7 @@ int lua_cocos2dx_Node_getAnchorPoint(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getAnchorPoint();
const cocos2d::Vector2& ret = cobj->getAnchorPoint();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -7468,12 +7468,12 @@ int lua_cocos2dx_Node_convertToNodeSpaceAR(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->convertToNodeSpaceAR(arg0);
cocos2d::Vector2 ret = cobj->convertToNodeSpaceAR(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -7654,7 +7654,7 @@ int lua_cocos2dx_Node_getAnchorPointInPoints(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getAnchorPointInPoints();
const cocos2d::Vector2& ret = cobj->getAnchorPointInPoints();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -8017,8 +8017,8 @@ int lua_cocos2dx_Node_setAdditionalTransform(lua_State* tolua_S)
ok = true;
do{
if (argc == 1) {
cocos2d::math::Matrix* arg0;
ok &= luaval_to_object<cocos2d::math::Matrix>(tolua_S, 2, "cc.math::Matrix",&arg0);
cocos2d::Matrix* arg0;
ok &= luaval_to_object<cocos2d::Matrix>(tolua_S, 2, "cc.math::Matrix",&arg0);
if (!ok) { break; }
cobj->setAdditionalTransform(arg0);
@ -8801,7 +8801,7 @@ int lua_cocos2dx_Node_getParentToNodeTransform(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Matrix& ret = cobj->getParentToNodeTransform();
const cocos2d::Matrix& ret = cobj->getParentToNodeTransform();
matrix_to_luaval(tolua_S, ret);
return 1;
}
@ -9671,7 +9671,7 @@ int lua_cocos2dx_Node_draw(lua_State* tolua_S)
ok &= luaval_to_object<cocos2d::Renderer>(tolua_S, 2, "cc.Renderer",&arg0);
if (!ok) { break; }
cocos2d::math::Matrix arg1;
cocos2d::Matrix arg1;
ok &= luaval_to_matrix(tolua_S, 3, &arg1);
if (!ok) { break; }
@ -9817,7 +9817,7 @@ int lua_cocos2dx_Node_setPosition3D(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector3 arg0;
cocos2d::Vector3 arg0;
ok &= luaval_to_vector3(tolua_S, 2, &arg0);
if(!ok)
@ -9954,7 +9954,7 @@ int lua_cocos2dx_Node_getWorldToNodeTransform(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Matrix ret = cobj->getWorldToNodeTransform();
cocos2d::Matrix ret = cobj->getWorldToNodeTransform();
matrix_to_luaval(tolua_S, ret);
return 1;
}
@ -11726,7 +11726,7 @@ int lua_cocos2dx_Director_loadMatrix(lua_State* tolua_S)
if (argc == 2)
{
cocos2d::MATRIX_STACK_TYPE arg0;
cocos2d::math::Matrix arg1;
cocos2d::Matrix arg1;
ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
@ -11952,7 +11952,7 @@ int lua_cocos2dx_Director_getVisibleOrigin(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getVisibleOrigin();
cocos2d::Vector2 ret = cobj->getVisibleOrigin();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -12171,12 +12171,12 @@ int lua_cocos2dx_Director_convertToUI(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->convertToUI(arg0);
cocos2d::Vector2 ret = cobj->convertToUI(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -12836,12 +12836,12 @@ int lua_cocos2dx_Director_convertToGL(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->convertToGL(arg0);
cocos2d::Vector2 ret = cobj->convertToGL(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -13154,7 +13154,7 @@ int lua_cocos2dx_Director_getMatrix(lua_State* tolua_S)
ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
if(!ok)
return 0;
cocos2d::math::Matrix ret = cobj->getMatrix(arg0);
cocos2d::Matrix ret = cobj->getMatrix(arg0);
matrix_to_luaval(tolua_S, ret);
return 1;
}
@ -13825,7 +13825,7 @@ int lua_cocos2dx_Director_multiplyMatrix(lua_State* tolua_S)
if (argc == 2)
{
cocos2d::MATRIX_STACK_TYPE arg0;
cocos2d::math::Matrix arg1;
cocos2d::Matrix arg1;
ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
@ -17335,7 +17335,7 @@ int lua_cocos2dx_SpriteFrame_initWithTexture(lua_State* tolua_S)
ok &= luaval_to_boolean(tolua_S, 4,&arg2);
if (!ok) { break; }
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg3;
ok &= luaval_to_vector2(tolua_S, 5, &arg3);
if (!ok) { break; }
@ -17537,7 +17537,7 @@ int lua_cocos2dx_SpriteFrame_setOffsetInPixels(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -17763,7 +17763,7 @@ int lua_cocos2dx_SpriteFrame_setOffset(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -17811,7 +17811,7 @@ int lua_cocos2dx_SpriteFrame_getOffset(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getOffset();
const cocos2d::Vector2& ret = cobj->getOffset();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -17904,7 +17904,7 @@ int lua_cocos2dx_SpriteFrame_initWithTextureFilename(lua_State* tolua_S)
ok &= luaval_to_boolean(tolua_S, 4,&arg2);
if (!ok) { break; }
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg3;
ok &= luaval_to_vector2(tolua_S, 5, &arg3);
if (!ok) { break; }
@ -18020,7 +18020,7 @@ int lua_cocos2dx_SpriteFrame_getOffsetInPixels(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getOffsetInPixels();
const cocos2d::Vector2& ret = cobj->getOffsetInPixels();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -18105,7 +18105,7 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S)
bool arg2;
ok &= luaval_to_boolean(tolua_S, 4,&arg2);
if (!ok) { break; }
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg3;
ok &= luaval_to_vector2(tolua_S, 5, &arg3);
if (!ok) { break; }
cocos2d::Size arg4;
@ -18168,7 +18168,7 @@ int lua_cocos2dx_SpriteFrame_createWithTexture(lua_State* tolua_S)
bool arg2;
ok &= luaval_to_boolean(tolua_S, 4,&arg2);
if (!ok) { break; }
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg3;
ok &= luaval_to_vector2(tolua_S, 5, &arg3);
if (!ok) { break; }
cocos2d::Size arg4;
@ -20038,7 +20038,7 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S)
double arg0;
ok &= luaval_to_number(tolua_S, 2,&arg0);
if (!ok) { break; }
cocos2d::math::Vector3 arg1;
cocos2d::Vector3 arg1;
ok &= luaval_to_vector3(tolua_S, 3, &arg1);
if (!ok) { break; }
cocos2d::RotateBy* ret = cocos2d::RotateBy::create(arg0, arg1);
@ -20093,7 +20093,7 @@ int lua_cocos2dx_MoveBy_create(lua_State* tolua_S)
if (argc == 2)
{
double arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_number(tolua_S, 2,&arg0);
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
if(!ok)
@ -20148,7 +20148,7 @@ int lua_cocos2dx_MoveTo_create(lua_State* tolua_S)
if (argc == 2)
{
double arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_number(tolua_S, 2,&arg0);
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
if(!ok)
@ -20317,7 +20317,7 @@ int lua_cocos2dx_JumpBy_create(lua_State* tolua_S)
if (argc == 4)
{
double arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
double arg2;
int arg3;
ok &= luaval_to_number(tolua_S, 2,&arg0);
@ -20376,7 +20376,7 @@ int lua_cocos2dx_JumpTo_create(lua_State* tolua_S)
if (argc == 4)
{
double arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
double arg2;
int arg3;
ok &= luaval_to_number(tolua_S, 2,&arg0);
@ -21474,7 +21474,7 @@ int lua_cocos2dx_ActionCamera_setEye(lua_State* tolua_S)
ok = true;
do{
if (argc == 1) {
cocos2d::math::Vector3 arg0;
cocos2d::Vector3 arg0;
ok &= luaval_to_vector3(tolua_S, 2, &arg0);
if (!ok) { break; }
@ -21523,7 +21523,7 @@ int lua_cocos2dx_ActionCamera_getEye(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector3& ret = cobj->getEye();
const cocos2d::Vector3& ret = cobj->getEye();
vector3_to_luaval(tolua_S, ret);
return 1;
}
@ -21565,7 +21565,7 @@ int lua_cocos2dx_ActionCamera_setUp(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector3 arg0;
cocos2d::Vector3 arg0;
ok &= luaval_to_vector3(tolua_S, 2, &arg0);
if(!ok)
@ -21613,7 +21613,7 @@ int lua_cocos2dx_ActionCamera_getCenter(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector3& ret = cobj->getCenter();
const cocos2d::Vector3& ret = cobj->getCenter();
vector3_to_luaval(tolua_S, ret);
return 1;
}
@ -21655,7 +21655,7 @@ int lua_cocos2dx_ActionCamera_setCenter(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector3 arg0;
cocos2d::Vector3 arg0;
ok &= luaval_to_vector3(tolua_S, 2, &arg0);
if(!ok)
@ -21703,7 +21703,7 @@ int lua_cocos2dx_ActionCamera_getUp(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector3& ret = cobj->getUp();
const cocos2d::Vector3& ret = cobj->getUp();
vector3_to_luaval(tolua_S, ret);
return 1;
}
@ -25101,7 +25101,7 @@ int lua_cocos2dx_Place_create(lua_State* tolua_S)
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
@ -25965,7 +25965,7 @@ int lua_cocos2dx_Lens3D_setPosition(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -26105,7 +26105,7 @@ int lua_cocos2dx_Lens3D_getPosition(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getPosition();
const cocos2d::Vector2& ret = cobj->getPosition();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -26182,7 +26182,7 @@ int lua_cocos2dx_Lens3D_create(lua_State* tolua_S)
{
double arg0;
cocos2d::Size arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
double arg3;
ok &= luaval_to_number(tolua_S, 2,&arg0);
ok &= luaval_to_size(tolua_S, 3, &arg1);
@ -26435,7 +26435,7 @@ int lua_cocos2dx_Ripple3D_setPosition(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -26483,7 +26483,7 @@ int lua_cocos2dx_Ripple3D_getPosition(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getPosition();
const cocos2d::Vector2& ret = cobj->getPosition();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -26516,7 +26516,7 @@ int lua_cocos2dx_Ripple3D_create(lua_State* tolua_S)
{
double arg0;
cocos2d::Size arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
double arg3;
unsigned int arg4;
double arg5;
@ -27323,7 +27323,7 @@ int lua_cocos2dx_Twirl_setPosition(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -27371,7 +27371,7 @@ int lua_cocos2dx_Twirl_getPosition(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getPosition();
const cocos2d::Vector2& ret = cobj->getPosition();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -27404,7 +27404,7 @@ int lua_cocos2dx_Twirl_create(lua_State* tolua_S)
{
double arg0;
cocos2d::Size arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
unsigned int arg3;
double arg4;
ok &= luaval_to_number(tolua_S, 2,&arg0);
@ -27765,7 +27765,7 @@ int lua_cocos2dx_ShuffleTiles_placeTile(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 2)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
cocos2d::Tile* arg1;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -27970,7 +27970,7 @@ int lua_cocos2dx_FadeOutTRTiles_turnOnTile(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -28016,7 +28016,7 @@ int lua_cocos2dx_FadeOutTRTiles_turnOffTile(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -28062,7 +28062,7 @@ int lua_cocos2dx_FadeOutTRTiles_transformTile(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 2)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
double arg1;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -28275,7 +28275,7 @@ int lua_cocos2dx_FadeOutUpTiles_transformTile(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 2)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
double arg1;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -28435,7 +28435,7 @@ int lua_cocos2dx_TurnOffTiles_turnOnTile(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -28481,7 +28481,7 @@ int lua_cocos2dx_TurnOffTiles_turnOffTile(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -29355,7 +29355,7 @@ int lua_cocos2dx_CardinalSplineTo_updatePosition(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -29704,9 +29704,9 @@ int lua_cocos2dx_DrawNode_drawQuadraticBezier(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 5)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
cocos2d::Vector2 arg2;
unsigned int arg3;
cocos2d::Color4F arg4;
@ -29762,7 +29762,7 @@ int lua_cocos2dx_DrawNode_onDraw(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 2)
{
cocos2d::math::Matrix arg0;
cocos2d::Matrix arg0;
bool arg1;
ok &= luaval_to_matrix(tolua_S, 2, &arg0);
@ -29854,9 +29854,9 @@ int lua_cocos2dx_DrawNode_drawTriangle(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 4)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
cocos2d::Vector2 arg2;
cocos2d::Color4F arg3;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -29909,7 +29909,7 @@ int lua_cocos2dx_DrawNode_drawDot(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 3)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
double arg1;
cocos2d::Color4F arg2;
@ -29961,10 +29961,10 @@ int lua_cocos2dx_DrawNode_drawCubicBezier(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 6)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::math::Vector2 arg2;
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
cocos2d::Vector2 arg2;
cocos2d::Vector2 arg3;
unsigned int arg4;
cocos2d::Color4F arg5;
@ -30022,8 +30022,8 @@ int lua_cocos2dx_DrawNode_drawSegment(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 4)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
double arg2;
cocos2d::Color4F arg3;
@ -33219,7 +33219,7 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S)
if (argc == 2)
{
std::string arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_std_string(tolua_S, 2,&arg0);
@ -34452,7 +34452,7 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S)
std::string arg1;
cocos2d::TextHAlignment arg2;
int arg3;
cocos2d::math::Vector2 arg4;
cocos2d::Vector2 arg4;
ok &= luaval_to_std_string(tolua_S, 2,&arg0);
ok &= luaval_to_std_string(tolua_S, 3,&arg1);
ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2);
@ -35135,7 +35135,7 @@ int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S)
std::string arg1;
double arg2;
cocos2d::TextHAlignment arg3;
cocos2d::math::Vector2 arg4;
cocos2d::Vector2 arg4;
ok &= luaval_to_std_string(tolua_S, 2,&arg0);
@ -35291,7 +35291,7 @@ int lua_cocos2dx_LabelBMFont_setFntFile(lua_State* tolua_S)
if (argc == 2)
{
std::string arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_std_string(tolua_S, 2,&arg0);
@ -35500,7 +35500,7 @@ int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S)
cocos2d::TextHAlignment arg3;
ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3);
if (!ok) { break; }
cocos2d::math::Vector2 arg4;
cocos2d::Vector2 arg4;
ok &= luaval_to_vector2(tolua_S, 6, &arg4);
if (!ok) { break; }
cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2, arg3, arg4);
@ -36024,7 +36024,7 @@ int lua_cocos2dx_LayerGradient_setVector(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -36210,7 +36210,7 @@ int lua_cocos2dx_LayerGradient_getVector(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getVector();
const cocos2d::Vector2& ret = cobj->getVector();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -36454,7 +36454,7 @@ int lua_cocos2dx_LayerGradient_create(lua_State* tolua_S)
cocos2d::Color4B arg1;
ok &=luaval_to_color4b(tolua_S, 3, &arg1);
if (!ok) { break; }
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
if (!ok) { break; }
cocos2d::LayerGradient* ret = cocos2d::LayerGradient::create(arg0, arg1, arg2);
@ -43045,7 +43045,7 @@ int lua_cocos2dx_Sprite_getOffsetPosition(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getOffsetPosition();
const cocos2d::Vector2& ret = cobj->getOffsetPosition();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -44204,7 +44204,7 @@ int lua_cocos2dx_ProgressTimer_setBarChangeRate(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -44428,7 +44428,7 @@ int lua_cocos2dx_ProgressTimer_setMidpoint(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -44476,7 +44476,7 @@ int lua_cocos2dx_ProgressTimer_getBarChangeRate(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getBarChangeRate();
cocos2d::Vector2 ret = cobj->getBarChangeRate();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -44573,7 +44573,7 @@ int lua_cocos2dx_ProgressTimer_getMidpoint(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getMidpoint();
cocos2d::Vector2 ret = cobj->getMidpoint();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -45521,7 +45521,7 @@ int lua_cocos2dx_RenderTexture_setVirtualViewport(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 3)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
cocos2d::Rect arg1;
cocos2d::Rect arg2;
@ -47840,7 +47840,7 @@ int lua_cocos2dx_ParticleSystem_setPosVar(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -48476,7 +48476,7 @@ int lua_cocos2dx_ParticleSystem_getGravity(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getGravity();
const cocos2d::Vector2& ret = cobj->getGravity();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -48882,7 +48882,7 @@ int lua_cocos2dx_ParticleSystem_getPosVar(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getPosVar();
const cocos2d::Vector2& ret = cobj->getPosVar();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -49146,7 +49146,7 @@ int lua_cocos2dx_ParticleSystem_getSourcePosition(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getSourcePosition();
const cocos2d::Vector2& ret = cobj->getSourcePosition();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -49327,7 +49327,7 @@ int lua_cocos2dx_ParticleSystem_updateQuadWithParticle(lua_State* tolua_S)
if (argc == 2)
{
cocos2d::sParticle* arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
#pragma warning NO CONVERSION TO NATIVE FOR sParticle*;
@ -50184,7 +50184,7 @@ int lua_cocos2dx_ParticleSystem_setSourcePosition(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -51044,7 +51044,7 @@ int lua_cocos2dx_ParticleSystem_setGravity(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -53672,7 +53672,7 @@ int lua_cocos2dx_GridBase_getStep(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getStep();
const cocos2d::Vector2& ret = cobj->getStep();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -53757,7 +53757,7 @@ int lua_cocos2dx_GridBase_setStep(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -55133,7 +55133,7 @@ int lua_cocos2dx_GLViewProtocol_getVisibleOrigin(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getVisibleOrigin();
cocos2d::Vector2 ret = cobj->getVisibleOrigin();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -58417,8 +58417,8 @@ int lua_cocos2dx_ParallaxNode_addChild(lua_State* tolua_S)
{
cocos2d::Node* arg0;
int arg1;
cocos2d::math::Vector2 arg2;
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg2;
cocos2d::Vector2 arg3;
ok &= luaval_to_object<cocos2d::Node>(tolua_S, 2, "cc.Node",&arg0);
@ -58617,7 +58617,7 @@ int lua_cocos2dx_TMXObjectGroup_setPositionOffset(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -58712,7 +58712,7 @@ int lua_cocos2dx_TMXObjectGroup_getPositionOffset(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getPositionOffset();
const cocos2d::Vector2& ret = cobj->getPositionOffset();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -61008,7 +61008,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -61019,7 +61019,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S)
}
if (argc == 2)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
cocos2d::TMXTileFlags_* arg1;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -61069,12 +61069,12 @@ int lua_cocos2dx_TMXLayer_getPositionAt(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getPositionAt(arg0);
cocos2d::Vector2 ret = cobj->getPositionAt(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -61477,7 +61477,7 @@ int lua_cocos2dx_TMXLayer_removeTileAt(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -61618,7 +61618,7 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S)
ok &= luaval_to_uint32(tolua_S, 2,&arg0);
if (!ok) { break; }
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
if (!ok) { break; }
@ -61637,7 +61637,7 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S)
ok &= luaval_to_uint32(tolua_S, 2,&arg0);
if (!ok) { break; }
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
if (!ok) { break; }
@ -62002,7 +62002,7 @@ int lua_cocos2dx_TMXLayer_getTileAt(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -63002,7 +63002,7 @@ int lua_cocos2dx_TileMapAtlas_getTileAt(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -63050,7 +63050,7 @@ int lua_cocos2dx_TileMapAtlas_setTile(lua_State* tolua_S)
if (argc == 2)
{
cocos2d::Color3B arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_color3b(tolua_S, 2, &arg0);

View File

@ -2027,7 +2027,7 @@ int lua_cocos2dx_extension_Control_getTouchLocation(lua_State* tolua_S)
ok &= luaval_to_object<cocos2d::Touch>(tolua_S, 2, "cc.Touch",&arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getTouchLocation(arg0);
cocos2d::Vector2 ret = cobj->getTouchLocation(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -2506,7 +2506,7 @@ int lua_cocos2dx_extension_ControlButton_setLabelAnchorPoint(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -2554,7 +2554,7 @@ int lua_cocos2dx_extension_ControlButton_getLabelAnchorPoint(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getLabelAnchorPoint();
const cocos2d::Vector2& ret = cobj->getLabelAnchorPoint();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -4170,7 +4170,7 @@ int lua_cocos2dx_extension_ControlHuePicker_initWithTargetAndPos(lua_State* tolu
if (argc == 2)
{
cocos2d::Node* arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_object<cocos2d::Node>(tolua_S, 2, "cc.Node",&arg0);
@ -4267,7 +4267,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getStartPos(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getStartPos();
cocos2d::Vector2 ret = cobj->getStartPos();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -4613,7 +4613,7 @@ int lua_cocos2dx_extension_ControlHuePicker_create(lua_State* tolua_S)
if (argc == 2)
{
cocos2d::Node* arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_object<cocos2d::Node>(tolua_S, 2, "cc.Node",&arg0);
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
if(!ok)
@ -4769,7 +4769,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_initWithTargetAndPo
if (argc == 2)
{
cocos2d::Node* arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_object<cocos2d::Node>(tolua_S, 2, "cc.Node",&arg0);
@ -4820,7 +4820,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getStartPos(lua_Sta
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getStartPos();
cocos2d::Vector2 ret = cobj->getStartPos();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -5118,7 +5118,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_create(lua_State* t
if (argc == 2)
{
cocos2d::Node* arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_object<cocos2d::Node>(tolua_S, 2, "cc.Node",&arg0);
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
if(!ok)
@ -5828,7 +5828,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_setPreviousLocation(lua_State* t
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -6008,10 +6008,10 @@ int lua_cocos2dx_extension_ControlPotentiometer_angleInDegreesBetweenLineFromPoi
argc = lua_gettop(tolua_S)-1;
if (argc == 4)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::math::Vector2 arg2;
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
cocos2d::Vector2 arg2;
cocos2d::Vector2 arg3;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -6064,7 +6064,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerBegan(lua_State* to
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -6292,7 +6292,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getPreviousLocation(lua_State* t
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getPreviousLocation();
cocos2d::Vector2 ret = cobj->getPreviousLocation();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -6334,8 +6334,8 @@ int lua_cocos2dx_extension_ControlPotentiometer_distanceBetweenPointAndPoint(lua
argc = lua_gettop(tolua_S)-1;
if (argc == 2)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -6384,7 +6384,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerEnded(lua_State* to
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -6619,7 +6619,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerMoved(lua_State* to
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -6824,7 +6824,7 @@ int lua_cocos2dx_extension_ControlSlider_locationFromTouch(lua_State* tolua_S)
ok &= luaval_to_object<cocos2d::Touch>(tolua_S, 2, "cc.Touch",&arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->locationFromTouch(arg0);
cocos2d::Vector2 ret = cobj->locationFromTouch(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -8249,7 +8249,7 @@ int lua_cocos2dx_extension_ControlStepper_updateLayoutUsingTouchLocation(lua_Sta
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -9374,7 +9374,7 @@ int lua_cocos2dx_extension_ControlSwitch_locationFromTouch(lua_State* tolua_S)
ok &= luaval_to_object<cocos2d::Touch>(tolua_S, 2, "cc.Touch",&arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->locationFromTouch(arg0);
cocos2d::Vector2 ret = cobj->locationFromTouch(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -9688,7 +9688,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffsetInDuration(lua_State* tolu
argc = lua_gettop(tolua_S)-1;
if (argc == 2)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
double arg1;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -10253,7 +10253,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffset(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -10263,7 +10263,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffset(lua_State* tolua_S)
}
if (argc == 2)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
bool arg1;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -10541,7 +10541,7 @@ int lua_cocos2dx_extension_ScrollView_getContentOffset(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getContentOffset();
cocos2d::Vector2 ret = cobj->getContentOffset();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -10816,7 +10816,7 @@ int lua_cocos2dx_extension_ScrollView_maxContainerOffset(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->maxContainerOffset();
cocos2d::Vector2 ret = cobj->maxContainerOffset();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -11001,7 +11001,7 @@ int lua_cocos2dx_extension_ScrollView_minContainerOffset(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->minContainerOffset();
cocos2d::Vector2 ret = cobj->minContainerOffset();
vector2_to_luaval(tolua_S, ret);
return 1;
}

View File

@ -35,7 +35,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getGravity(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getGravity();
cocos2d::Vector2 ret = cobj->getGravity();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -121,7 +121,7 @@ int lua_cocos2dx_physics_PhysicsWorld_setGravity(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -413,7 +413,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getShapes(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -513,7 +513,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getShape(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -1335,7 +1335,7 @@ int lua_cocos2dx_physics_PhysicsShape_containsPoint(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -1516,7 +1516,7 @@ int lua_cocos2dx_physics_PhysicsShape_getCenter(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getCenter();
cocos2d::Vector2 ret = cobj->getCenter();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -1828,7 +1828,7 @@ int lua_cocos2dx_physics_PhysicsShape_getOffset(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getOffset();
cocos2d::Vector2 ret = cobj->getOffset();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -2293,7 +2293,7 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_create(lua_State* tolua_S)
{
double arg0;
cocos2d::PhysicsMaterial arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_number(tolua_S, 2,&arg0);
ok &= luaval_to_physics_material(tolua_S, 3, &arg1);
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
@ -2375,7 +2375,7 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_calculateMoment(lua_State* tolua_S)
{
double arg0;
double arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_number(tolua_S, 2,&arg0);
ok &= luaval_to_number(tolua_S, 3,&arg1);
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
@ -2545,7 +2545,7 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S)
{
cocos2d::Size arg0;
cocos2d::PhysicsMaterial arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_size(tolua_S, 2, &arg0);
ok &= luaval_to_physics_material(tolua_S, 3, &arg1);
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
@ -2627,7 +2627,7 @@ int lua_cocos2dx_physics_PhysicsShapeBox_calculateMoment(lua_State* tolua_S)
{
double arg0;
cocos2d::Size arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_number(tolua_S, 2,&arg0);
ok &= luaval_to_size(tolua_S, 3, &arg1);
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
@ -2746,7 +2746,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_getPoint(lua_State* tolua_S)
ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getPoint(arg0);
cocos2d::Vector2 ret = cobj->getPoint(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -2811,7 +2811,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_getPointB(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getPointB();
cocos2d::Vector2 ret = cobj->getPointB();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -2855,7 +2855,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_getPointA(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getPointA();
cocos2d::Vector2 ret = cobj->getPointA();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -2886,8 +2886,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S)
if (argc == 2)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
if(!ok)
@ -2898,8 +2898,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S)
}
if (argc == 3)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
cocos2d::PhysicsMaterial arg2;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
@ -2912,8 +2912,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S)
}
if (argc == 4)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
cocos2d::PhysicsMaterial arg2;
double arg3;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -3056,7 +3056,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S)
cocos2d::Size arg0;
cocos2d::PhysicsMaterial arg1;
double arg2;
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg3;
ok &= luaval_to_size(tolua_S, 2, &arg0);
ok &= luaval_to_physics_material(tolua_S, 3, &arg1);
ok &= luaval_to_number(tolua_S, 4,&arg2);
@ -3644,11 +3644,11 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
do{
if (argc == 2) {
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if (!ok) { break; }
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
if (!ok) { break; }
@ -3659,7 +3659,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S)
ok = true;
do{
if (argc == 1) {
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if (!ok) { break; }
@ -3747,11 +3747,11 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
do{
if (argc == 2) {
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if (!ok) { break; }
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg1;
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
if (!ok) { break; }
@ -3762,7 +3762,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S)
ok = true;
do{
if (argc == 1) {
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if (!ok) { break; }
@ -4008,7 +4008,7 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocity(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getVelocity();
cocos2d::Vector2 ret = cobj->getVelocity();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -4287,7 +4287,7 @@ int lua_cocos2dx_physics_PhysicsBody_getPositionOffset(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getPositionOffset();
cocos2d::Vector2 ret = cobj->getPositionOffset();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -4465,7 +4465,7 @@ int lua_cocos2dx_physics_PhysicsBody_getPosition(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getPosition();
cocos2d::Vector2 ret = cobj->getPosition();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -4733,12 +4733,12 @@ int lua_cocos2dx_physics_PhysicsBody_local2World(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->local2World(arg0);
cocos2d::Vector2 ret = cobj->local2World(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -5048,12 +5048,12 @@ int lua_cocos2dx_physics_PhysicsBody_world2Local(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->world2Local(arg0);
cocos2d::Vector2 ret = cobj->world2Local(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -5314,7 +5314,7 @@ int lua_cocos2dx_physics_PhysicsBody_setVelocity(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -5452,7 +5452,7 @@ int lua_cocos2dx_physics_PhysicsBody_setPositionOffset(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -5632,12 +5632,12 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityAtLocalPoint(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getVelocityAtLocalPoint(arg0);
cocos2d::Vector2 ret = cobj->getVelocityAtLocalPoint(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -5862,12 +5862,12 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityAtWorldPoint(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getVelocityAtWorldPoint(arg0);
cocos2d::Vector2 ret = cobj->getVelocityAtWorldPoint(arg0);
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -6099,7 +6099,7 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S)
{
cocos2d::Size arg0;
cocos2d::PhysicsMaterial arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_size(tolua_S, 2, &arg0);
ok &= luaval_to_physics_material(tolua_S, 3, &arg1);
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
@ -6134,8 +6134,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S)
if (argc == 2)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
if(!ok)
@ -6146,8 +6146,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S)
}
if (argc == 3)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
cocos2d::PhysicsMaterial arg2;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
ok &= luaval_to_vector2(tolua_S, 3, &arg1);
@ -6160,8 +6160,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S)
}
if (argc == 4)
{
cocos2d::math::Vector2 arg0;
cocos2d::math::Vector2 arg1;
cocos2d::Vector2 arg0;
cocos2d::Vector2 arg1;
cocos2d::PhysicsMaterial arg2;
double arg3;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
@ -6299,7 +6299,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S)
cocos2d::Size arg0;
cocos2d::PhysicsMaterial arg1;
double arg2;
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg3;
ok &= luaval_to_size(tolua_S, 2, &arg0);
ok &= luaval_to_physics_material(tolua_S, 3, &arg1);
ok &= luaval_to_number(tolua_S, 4,&arg2);
@ -6359,7 +6359,7 @@ int lua_cocos2dx_physics_PhysicsBody_createCircle(lua_State* tolua_S)
{
double arg0;
cocos2d::PhysicsMaterial arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_number(tolua_S, 2,&arg0);
ok &= luaval_to_physics_material(tolua_S, 3, &arg1);
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
@ -6913,7 +6913,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_getSurfaceVelocity(lua_State* to
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getSurfaceVelocity();
cocos2d::Vector2 ret = cobj->getSurfaceVelocity();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -6955,7 +6955,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_setSurfaceVelocity(lua_State* to
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -7119,7 +7119,7 @@ int lua_cocos2dx_physics_PhysicsContactPostSolve_getSurfaceVelocity(lua_State* t
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getSurfaceVelocity();
cocos2d::Vector2 ret = cobj->getSurfaceVelocity();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -8184,7 +8184,7 @@ int lua_cocos2dx_physics_PhysicsJointFixed_construct(lua_State* tolua_S)
{
cocos2d::PhysicsBody* arg0;
cocos2d::PhysicsBody* arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 2, "cc.PhysicsBody",&arg0);
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 3, "cc.PhysicsBody",&arg1);
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
@ -8250,7 +8250,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setAnchr2(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -8296,7 +8296,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setAnchr1(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -8390,7 +8390,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getAnchr2(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getAnchr2();
cocos2d::Vector2 ret = cobj->getAnchr2();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -8434,7 +8434,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getAnchr1(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getAnchr1();
cocos2d::Vector2 ret = cobj->getAnchr1();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -8606,10 +8606,10 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S)
cocos2d::PhysicsBody* arg1;
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 3, "cc.PhysicsBody",&arg1);
if (!ok) { break; }
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
if (!ok) { break; }
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg3;
ok &= luaval_to_vector2(tolua_S, 5, &arg3);
if (!ok) { break; }
double arg4;
@ -8634,10 +8634,10 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S)
cocos2d::PhysicsBody* arg1;
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 3, "cc.PhysicsBody",&arg1);
if (!ok) { break; }
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
if (!ok) { break; }
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg3;
ok &= luaval_to_vector2(tolua_S, 5, &arg3);
if (!ok) { break; }
cocos2d::PhysicsJointLimit* ret = cocos2d::PhysicsJointLimit::construct(arg0, arg1, arg2, arg3);
@ -8701,7 +8701,7 @@ int lua_cocos2dx_physics_PhysicsJointPin_construct(lua_State* tolua_S)
{
cocos2d::PhysicsBody* arg0;
cocos2d::PhysicsBody* arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 2, "cc.PhysicsBody",&arg0);
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 3, "cc.PhysicsBody",&arg1);
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
@ -8848,8 +8848,8 @@ int lua_cocos2dx_physics_PhysicsJointDistance_construct(lua_State* tolua_S)
{
cocos2d::PhysicsBody* arg0;
cocos2d::PhysicsBody* arg1;
cocos2d::math::Vector2 arg2;
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg2;
cocos2d::Vector2 arg3;
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 2, "cc.PhysicsBody",&arg0);
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 3, "cc.PhysicsBody",&arg1);
ok &= luaval_to_vector2(tolua_S, 4, &arg2);
@ -8918,7 +8918,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setAnchr2(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -8964,7 +8964,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setAnchr1(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -9146,7 +9146,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getAnchr2(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getAnchr2();
cocos2d::Vector2 ret = cobj->getAnchr2();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -9190,7 +9190,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getAnchr1(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getAnchr1();
cocos2d::Vector2 ret = cobj->getAnchr1();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -9359,8 +9359,8 @@ int lua_cocos2dx_physics_PhysicsJointSpring_construct(lua_State* tolua_S)
{
cocos2d::PhysicsBody* arg0;
cocos2d::PhysicsBody* arg1;
cocos2d::math::Vector2 arg2;
cocos2d::math::Vector2 arg3;
cocos2d::Vector2 arg2;
cocos2d::Vector2 arg3;
double arg4;
double arg5;
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 2, "cc.PhysicsBody",&arg0);
@ -9441,7 +9441,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setAnchr2(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -9487,7 +9487,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setGrooveA(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -9533,7 +9533,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setGrooveB(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -9581,7 +9581,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getGrooveA(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getGrooveA();
cocos2d::Vector2 ret = cobj->getGrooveA();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -9625,7 +9625,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getGrooveB(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getGrooveB();
cocos2d::Vector2 ret = cobj->getGrooveB();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -9669,7 +9669,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getAnchr2(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getAnchr2();
cocos2d::Vector2 ret = cobj->getAnchr2();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -9702,9 +9702,9 @@ int lua_cocos2dx_physics_PhysicsJointGroove_construct(lua_State* tolua_S)
{
cocos2d::PhysicsBody* arg0;
cocos2d::PhysicsBody* arg1;
cocos2d::math::Vector2 arg2;
cocos2d::math::Vector2 arg3;
cocos2d::math::Vector2 arg4;
cocos2d::Vector2 arg2;
cocos2d::Vector2 arg3;
cocos2d::Vector2 arg4;
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 2, "cc.PhysicsBody",&arg0);
ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 3, "cc.PhysicsBody",&arg1);
ok &= luaval_to_vector2(tolua_S, 4, &arg2);

View File

@ -122,7 +122,7 @@ int lua_cocos2dx_spine_Skeleton_onDraw(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 2)
{
cocos2d::math::Matrix arg0;
cocos2d::Matrix arg0;
bool arg1;
ok &= luaval_to_matrix(tolua_S, 2, &arg0);

View File

@ -3026,7 +3026,7 @@ int lua_cocos2dx_studio_ContourData_addVertex(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -3813,7 +3813,7 @@ int lua_cocos2dx_studio_DisplayManager_getAnchorPointInPoints(lua_State* tolua_S
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getAnchorPointInPoints();
cocos2d::Vector2 ret = cobj->getAnchorPointInPoints();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -4198,7 +4198,7 @@ int lua_cocos2dx_studio_DisplayManager_containPoint(lua_State* tolua_S)
ok = true;
do{
if (argc == 1) {
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if (!ok) { break; }
@ -4434,7 +4434,7 @@ int lua_cocos2dx_studio_DisplayManager_getAnchorPoint(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getAnchorPoint();
cocos2d::Vector2 ret = cobj->getAnchorPoint();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -6051,7 +6051,7 @@ int lua_cocos2dx_studio_Bone_getNodeToArmatureTransform(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Matrix ret = cobj->getNodeToArmatureTransform();
cocos2d::Matrix ret = cobj->getNodeToArmatureTransform();
matrix_to_luaval(tolua_S, ret);
return 1;
}
@ -9615,7 +9615,7 @@ int lua_cocos2dx_studio_Skin_getNodeToWorldTransformAR(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Matrix ret = cobj->getNodeToWorldTransformAR();
cocos2d::Matrix ret = cobj->getNodeToWorldTransformAR();
matrix_to_luaval(tolua_S, ret);
return 1;
}

View File

@ -841,7 +841,7 @@ int lua_cocos2dx_ui_Widget_setSizePercent(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -1069,7 +1069,7 @@ int lua_cocos2dx_ui_Widget_getTouchEndPos(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getTouchEndPos();
const cocos2d::Vector2& ret = cobj->getTouchEndPos();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -1111,7 +1111,7 @@ int lua_cocos2dx_ui_Widget_setPositionPercent(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -1783,7 +1783,7 @@ int lua_cocos2dx_ui_Widget_getWorldPosition(lua_State* tolua_S)
{
if(!ok)
return 0;
cocos2d::math::Vector2 ret = cobj->getWorldPosition();
cocos2d::Vector2 ret = cobj->getWorldPosition();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -2006,7 +2006,7 @@ int lua_cocos2dx_ui_Widget_getTouchMovePos(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getTouchMovePos();
const cocos2d::Vector2& ret = cobj->getTouchMovePos();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -2278,7 +2278,7 @@ int lua_cocos2dx_ui_Widget_getSizePercent(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getSizePercent();
const cocos2d::Vector2& ret = cobj->getSizePercent();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -2322,7 +2322,7 @@ int lua_cocos2dx_ui_Widget_getTouchStartPos(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getTouchStartPos();
const cocos2d::Vector2& ret = cobj->getTouchStartPos();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -2454,7 +2454,7 @@ int lua_cocos2dx_ui_Widget_clippingParentAreaContainPoint(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -2774,7 +2774,7 @@ int lua_cocos2dx_ui_Widget_getPositionPercent(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getPositionPercent();
const cocos2d::Vector2& ret = cobj->getPositionPercent();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -2816,7 +2816,7 @@ int lua_cocos2dx_ui_Widget_hitTest(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -2999,7 +2999,7 @@ int lua_cocos2dx_ui_Widget_checkChildInfo(lua_State* tolua_S)
{
int arg0;
cocos2d::ui::Widget* arg1;
cocos2d::math::Vector2 arg2;
cocos2d::Vector2 arg2;
ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
@ -3278,7 +3278,7 @@ int lua_cocos2dx_ui_Layout_setBackGroundColorVector(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -3464,7 +3464,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColorVector(lua_State* tolua_S)
{
if(!ok)
return 0;
const cocos2d::math::Vector2& ret = cobj->getBackGroundColorVector();
const cocos2d::Vector2& ret = cobj->getBackGroundColorVector();
vector2_to_luaval(tolua_S, ret);
return 1;
}
@ -8960,7 +8960,7 @@ int lua_cocos2dx_ui_ScrollView_scrollToPercentBothDirection(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 3)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
double arg1;
bool arg2;
@ -9869,7 +9869,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToPercentBothDirection(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -13508,7 +13508,7 @@ int lua_cocos2dx_ui_TextField_hitTest(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)
@ -15474,7 +15474,7 @@ int lua_cocos2dx_ui_RichText_setAnchorPoint(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::math::Vector2 arg0;
cocos2d::Vector2 arg0;
ok &= luaval_to_vector2(tolua_S, 2, &arg0);
if(!ok)

View File

@ -817,7 +817,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue )
return ok;
}
bool luaval_to_matrix(lua_State* L, int lo, cocos2d::math::Matrix* outValue )
bool luaval_to_matrix(lua_State* L, int lo, cocos2d::Matrix* outValue )
{
if (nullptr == L || nullptr == outValue)
return false;
@ -2320,7 +2320,7 @@ void ccvaluevector_to_luaval(lua_State* L, const cocos2d::ValueVector& inValue)
}
}
void matrix_to_luaval(lua_State* L, const cocos2d::math::Matrix& mat)
void matrix_to_luaval(lua_State* L, const cocos2d::Matrix& mat)
{
if (nullptr == L)
return;

View File

@ -69,7 +69,7 @@ extern bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue);
extern bool luaval_to_physics_material(lua_State* L,int lo, cocos2d::PhysicsMaterial* outValue);
extern bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue);
extern bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue );
extern bool luaval_to_matrix(lua_State* L, int lo, cocos2d::math::Matrix* outValue );
extern bool luaval_to_matrix(lua_State* L, int lo, cocos2d::Matrix* outValue );
extern bool luaval_to_array(lua_State* L,int lo, __Array** outValue);
extern bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue);
extern bool luaval_to_array_of_vector2(lua_State* L,int lo,cocos2d::Vector2 **points, int *numPoints);
@ -83,7 +83,7 @@ CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_point(lua_State* L,int lo,c
return luaval_to_vector2(L, lo, outValue);
}
CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_kmMat4(lua_State* L, int lo, cocos2d::math::Matrix* outValue )
CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_kmMat4(lua_State* L, int lo, cocos2d::Matrix* outValue )
{
return luaval_to_matrix(L, lo, outValue);
}
@ -247,7 +247,7 @@ extern void affinetransform_to_luaval(lua_State* L,const AffineTransform& inValu
extern void fontdefinition_to_luaval(lua_State* L,const FontDefinition& inValue);
extern void array_to_luaval(lua_State* L, __Array* inValue);
extern void dictionary_to_luaval(lua_State* L, __Dictionary* dict);
extern void matrix_to_luaval(lua_State* L, const cocos2d::math::Matrix& mat);
extern void matrix_to_luaval(lua_State* L, const cocos2d::Matrix& mat);
CC_DEPRECATED_ATTRIBUTE static inline void point_to_luaval(lua_State* L,const cocos2d::Vector2& pt)
{

View File

@ -38,14 +38,14 @@ using namespace cocos2d::extension;
void GLNode::draw(Renderer *renderer, const cocos2d::math::Matrix& transform, bool transformUpdated)
void GLNode::draw(Renderer *renderer, const cocos2d::Matrix& transform, bool transformUpdated)
{
_renderCmd.init(_globalZOrder);
_renderCmd.func = CC_CALLBACK_0(GLNode::onDraw, this, transform, transformUpdated);
renderer->addCommand(&_renderCmd);
}
void GLNode::onDraw(const cocos2d::math::Matrix &transform, bool transformUpdated)
void GLNode::onDraw(const cocos2d::Matrix &transform, bool transformUpdated)
{
int handler = ScriptHandlerMgr::getInstance()->getObjectHandler((void*)this, ScriptHandlerMgr::HandlerType::GL_NODE_DRAW);
if (0 != handler)

View File

@ -39,10 +39,10 @@ class GLNode:public cocos2d::Node
{
public:
virtual ~GLNode(){}
virtual void draw(cocos2d::Renderer *renderer, const cocos2d::math::Matrix& transform, bool transformUpdated) override;
virtual void draw(cocos2d::Renderer *renderer, const cocos2d::Matrix& transform, bool transformUpdated) override;
protected:
cocos2d::CustomCommand _renderCmd;
void onDraw(const cocos2d::math::Matrix &transform, bool transformUpdated);
void onDraw(const cocos2d::Matrix &transform, bool transformUpdated);
};
TOLUA_API int tolua_opengl_open(lua_State* tolua_S);