diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 272d2f038c..5b7a65ffb1 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -1558,7 +1558,7 @@ int lua_cocos2dx_Touch_getPreviousLocationInView(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPreviousLocationInView(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreviousLocationInView",argc, 0); @@ -1602,7 +1602,7 @@ int lua_cocos2dx_Touch_getLocation(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getLocation(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLocation",argc, 0); @@ -1646,7 +1646,7 @@ int lua_cocos2dx_Touch_getDelta(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getDelta(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDelta",argc, 0); @@ -1690,7 +1690,7 @@ int lua_cocos2dx_Touch_getStartLocationInView(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getStartLocationInView(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartLocationInView",argc, 0); @@ -1734,7 +1734,7 @@ int lua_cocos2dx_Touch_getStartLocation(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getStartLocation(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartLocation",argc, 0); @@ -1874,7 +1874,7 @@ int lua_cocos2dx_Touch_getLocationInView(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getLocationInView(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLocationInView",argc, 0); @@ -1918,7 +1918,7 @@ int lua_cocos2dx_Touch_getPreviousLocation(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPreviousLocation(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreviousLocation",argc, 0); @@ -3359,7 +3359,7 @@ int lua_cocos2dx_Texture2D_drawAtPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->drawAtPoint(arg0); @@ -4158,11 +4158,11 @@ int lua_cocos2dx_Node_convertToWorldSpaceAR(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToWorldSpaceAR(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToWorldSpaceAR",argc, 1); @@ -4703,7 +4703,7 @@ int lua_cocos2dx_Node_getNodeToWorldTransform(lua_State* tolua_S) if(!ok) return 0; cocos2d::Mat4 ret = cobj->getNodeToWorldTransform(); - object_to_luaval(tolua_S, "cc.Mat4",(cocos2d::Mat4)ret); + mat4_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToWorldTransform",argc, 0); @@ -4747,7 +4747,7 @@ int lua_cocos2dx_Node_getPosition3D(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec3 ret = cobj->getPosition3D(); - object_to_luaval(tolua_S, "cc.Vec3",(cocos2d::Vec3)ret); + vec3_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition3D",argc, 0); @@ -4849,11 +4849,11 @@ int lua_cocos2dx_Node_convertToWorldSpace(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToWorldSpace(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToWorldSpace",argc, 1); @@ -5124,7 +5124,7 @@ int lua_cocos2dx_Node_convertTouchToNodeSpace(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertTouchToNodeSpace(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertTouchToNodeSpace",argc, 1); @@ -5351,7 +5351,7 @@ int lua_cocos2dx_Node_getRotation3D(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec3 ret = cobj->getRotation3D(); - object_to_luaval(tolua_S, "cc.Vec3",(cocos2d::Vec3)ret); + vec3_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation3D",argc, 0); @@ -5395,7 +5395,7 @@ int lua_cocos2dx_Node_getNodeToParentTransform(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Mat4& ret = cobj->getNodeToParentTransform(); - object_to_luaval(tolua_S, "cc.Mat4",(cocos2d::Mat4&)ret); + mat4_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToParentTransform",argc, 0); @@ -5442,7 +5442,7 @@ int lua_cocos2dx_Node_convertTouchToNodeSpaceAR(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertTouchToNodeSpaceAR(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertTouchToNodeSpaceAR",argc, 1); @@ -5485,11 +5485,11 @@ int lua_cocos2dx_Node_convertToNodeSpace(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToNodeSpace(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToNodeSpace",argc, 1); @@ -5628,7 +5628,7 @@ int lua_cocos2dx_Node_setPosition(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if (!ok) { break; } cobj->setPosition(arg0); @@ -5909,7 +5909,7 @@ int lua_cocos2dx_Node_setRotation3D(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec3",&arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setRotation3D(arg0); @@ -6001,7 +6001,7 @@ int lua_cocos2dx_Node_setNodeToParentTransform(lua_State* tolua_S) { cocos2d::Mat4 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Mat4",&arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setNodeToParentTransform(arg0); @@ -6048,7 +6048,7 @@ int lua_cocos2dx_Node_getAnchorPoint(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getAnchorPoint(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPoint",argc, 0); @@ -6266,11 +6266,11 @@ int lua_cocos2dx_Node_convertToNodeSpaceAR(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToNodeSpaceAR(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToNodeSpaceAR",argc, 1); @@ -6449,7 +6449,7 @@ int lua_cocos2dx_Node_getAnchorPointInPoints(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getAnchorPointInPoints(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPointInPoints",argc, 0); @@ -7684,7 +7684,7 @@ int lua_cocos2dx_Node_getParentToNodeTransform(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Mat4& ret = cobj->getParentToNodeTransform(); - object_to_luaval(tolua_S, "cc.Mat4",(cocos2d::Mat4&)ret); + mat4_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentToNodeTransform",argc, 0); @@ -8554,7 +8554,7 @@ int lua_cocos2dx_Node_draw(lua_State* tolua_S) if (!ok) { break; } cocos2d::Mat4 arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Mat4",&arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1); if (!ok) { break; } bool arg2; @@ -8701,7 +8701,7 @@ int lua_cocos2dx_Node_setPosition3D(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec3",&arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setPosition3D(arg0); @@ -8837,7 +8837,7 @@ int lua_cocos2dx_Node_getWorldToNodeTransform(lua_State* tolua_S) if(!ok) return 0; cocos2d::Mat4 ret = cobj->getWorldToNodeTransform(); - object_to_luaval(tolua_S, "cc.Mat4",(cocos2d::Mat4)ret); + mat4_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorldToNodeTransform",argc, 0); @@ -10616,7 +10616,7 @@ int lua_cocos2dx_Director_loadMatrix(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Mat4",&arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1); if(!ok) return 0; cobj->loadMatrix(arg0, arg1); @@ -10839,7 +10839,7 @@ int lua_cocos2dx_Director_getVisibleOrigin(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getVisibleOrigin(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleOrigin",argc, 0); @@ -11059,11 +11059,11 @@ int lua_cocos2dx_Director_convertToUI(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToUI(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToUI",argc, 1); @@ -11724,11 +11724,11 @@ int lua_cocos2dx_Director_convertToGL(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToGL(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToGL",argc, 1); @@ -12041,7 +12041,7 @@ int lua_cocos2dx_Director_getMatrix(lua_State* tolua_S) if(!ok) return 0; cocos2d::Mat4 ret = cobj->getMatrix(arg0); - object_to_luaval(tolua_S, "cc.Mat4",(cocos2d::Mat4)ret); + mat4_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMatrix",argc, 1); @@ -12715,7 +12715,7 @@ int lua_cocos2dx_Director_multiplyMatrix(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Mat4",&arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1); if(!ok) return 0; cobj->multiplyMatrix(arg0, arg1); @@ -16300,7 +16300,7 @@ int lua_cocos2dx_SpriteFrame_initWithTexture(lua_State* tolua_S) if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if (!ok) { break; } cocos2d::Size arg4; @@ -16503,7 +16503,7 @@ int lua_cocos2dx_SpriteFrame_setOffsetInPixels(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setOffsetInPixels(arg0); @@ -16729,7 +16729,7 @@ int lua_cocos2dx_SpriteFrame_setOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setOffset(arg0); @@ -16776,7 +16776,7 @@ int lua_cocos2dx_SpriteFrame_getOffset(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getOffset(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffset",argc, 0); @@ -16869,7 +16869,7 @@ int lua_cocos2dx_SpriteFrame_initWithTextureFilename(lua_State* tolua_S) if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if (!ok) { break; } cocos2d::Size arg4; @@ -16985,7 +16985,7 @@ int lua_cocos2dx_SpriteFrame_getOffsetInPixels(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getOffsetInPixels(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffsetInPixels",argc, 0); @@ -17070,7 +17070,7 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S) ok &= luaval_to_boolean(tolua_S, 4,&arg2); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if (!ok) { break; } cocos2d::Size arg4; ok &= luaval_to_size(tolua_S, 6, &arg4); @@ -17133,7 +17133,7 @@ int lua_cocos2dx_SpriteFrame_createWithTexture(lua_State* tolua_S) ok &= luaval_to_boolean(tolua_S, 4,&arg2); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if (!ok) { break; } cocos2d::Size arg4; ok &= luaval_to_size(tolua_S, 6, &arg4); @@ -19003,7 +19003,7 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S) ok &= luaval_to_number(tolua_S, 2,&arg0); if (!ok) { break; } cocos2d::Vec3 arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec3",&arg1); + ok &= luaval_to_vec3(tolua_S, 3, &arg1); if (!ok) { break; } cocos2d::RotateBy* ret = cocos2d::RotateBy::create(arg0, arg1); object_to_luaval(tolua_S, "cc.RotateBy",(cocos2d::RotateBy*)ret); @@ -19059,7 +19059,7 @@ int lua_cocos2dx_MoveBy_create(lua_State* tolua_S) double arg0; cocos2d::Vec2 arg1; ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; cocos2d::MoveBy* ret = cocos2d::MoveBy::create(arg0, arg1); @@ -19114,7 +19114,7 @@ int lua_cocos2dx_MoveTo_create(lua_State* tolua_S) double arg0; cocos2d::Vec2 arg1; ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; cocos2d::MoveTo* ret = cocos2d::MoveTo::create(arg0, arg1); @@ -19285,7 +19285,7 @@ int lua_cocos2dx_JumpBy_create(lua_State* tolua_S) double arg2; int arg3; ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); ok &= luaval_to_number(tolua_S, 4,&arg2); ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); if(!ok) @@ -19344,7 +19344,7 @@ int lua_cocos2dx_JumpTo_create(lua_State* tolua_S) double arg2; int arg3; ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); ok &= luaval_to_number(tolua_S, 4,&arg2); ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); if(!ok) @@ -20439,7 +20439,7 @@ int lua_cocos2dx_ActionCamera_setEye(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec3 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec3",&arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0); if (!ok) { break; } cobj->setEye(arg0); @@ -20488,7 +20488,7 @@ int lua_cocos2dx_ActionCamera_getEye(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec3& ret = cobj->getEye(); - object_to_luaval(tolua_S, "cc.Vec3",(cocos2d::Vec3&)ret); + vec3_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEye",argc, 0); @@ -20531,7 +20531,7 @@ int lua_cocos2dx_ActionCamera_setUp(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec3",&arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setUp(arg0); @@ -20578,7 +20578,7 @@ int lua_cocos2dx_ActionCamera_getCenter(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec3& ret = cobj->getCenter(); - object_to_luaval(tolua_S, "cc.Vec3",(cocos2d::Vec3&)ret); + vec3_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCenter",argc, 0); @@ -20621,7 +20621,7 @@ int lua_cocos2dx_ActionCamera_setCenter(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec3",&arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setCenter(arg0); @@ -20668,7 +20668,7 @@ int lua_cocos2dx_ActionCamera_getUp(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec3& ret = cobj->getUp(); - object_to_luaval(tolua_S, "cc.Vec3",(cocos2d::Vec3&)ret); + vec3_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUp",argc, 0); @@ -24066,7 +24066,7 @@ int lua_cocos2dx_Place_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Place* ret = cocos2d::Place::create(arg0); @@ -24931,7 +24931,7 @@ int lua_cocos2dx_Lens3D_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setPosition(arg0); @@ -25070,7 +25070,7 @@ int lua_cocos2dx_Lens3D_getPosition(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getPosition(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); @@ -25150,7 +25150,7 @@ int lua_cocos2dx_Lens3D_create(lua_State* tolua_S) double arg3; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); ok &= luaval_to_number(tolua_S, 5,&arg3); if(!ok) return 0; @@ -25401,7 +25401,7 @@ int lua_cocos2dx_Ripple3D_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setPosition(arg0); @@ -25448,7 +25448,7 @@ int lua_cocos2dx_Ripple3D_getPosition(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getPosition(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); @@ -25486,7 +25486,7 @@ int lua_cocos2dx_Ripple3D_create(lua_State* tolua_S) double arg5; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); ok &= luaval_to_number(tolua_S, 5,&arg3); ok &= luaval_to_uint32(tolua_S, 6,&arg4); ok &= luaval_to_number(tolua_S, 7,&arg5); @@ -26289,7 +26289,7 @@ int lua_cocos2dx_Twirl_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setPosition(arg0); @@ -26336,7 +26336,7 @@ int lua_cocos2dx_Twirl_getPosition(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getPosition(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); @@ -26373,7 +26373,7 @@ int lua_cocos2dx_Twirl_create(lua_State* tolua_S) double arg4; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); ok &= luaval_to_uint32(tolua_S, 5,&arg3); ok &= luaval_to_number(tolua_S, 6,&arg4); if(!ok) @@ -26732,7 +26732,7 @@ int lua_cocos2dx_ShuffleTiles_placeTile(lua_State* tolua_S) cocos2d::Vec2 arg0; cocos2d::Tile* arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); #pragma warning NO CONVERSION TO NATIVE FOR Tile*; if(!ok) @@ -26936,7 +26936,7 @@ int lua_cocos2dx_FadeOutTRTiles_turnOnTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->turnOnTile(arg0); @@ -26982,7 +26982,7 @@ int lua_cocos2dx_FadeOutTRTiles_turnOffTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->turnOffTile(arg0); @@ -27029,7 +27029,7 @@ int lua_cocos2dx_FadeOutTRTiles_transformTile(lua_State* tolua_S) cocos2d::Vec2 arg0; double arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); ok &= luaval_to_number(tolua_S, 3,&arg1); if(!ok) @@ -27242,7 +27242,7 @@ int lua_cocos2dx_FadeOutUpTiles_transformTile(lua_State* tolua_S) cocos2d::Vec2 arg0; double arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); ok &= luaval_to_number(tolua_S, 3,&arg1); if(!ok) @@ -27401,7 +27401,7 @@ int lua_cocos2dx_TurnOffTiles_turnOnTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->turnOnTile(arg0); @@ -27447,7 +27447,7 @@ int lua_cocos2dx_TurnOffTiles_turnOffTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->turnOffTile(arg0); @@ -28321,7 +28321,7 @@ int lua_cocos2dx_CardinalSplineTo_updatePosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->updatePosition(arg0); @@ -28674,11 +28674,11 @@ int lua_cocos2dx_DrawNode_drawQuadraticBezier(lua_State* tolua_S) unsigned int arg3; cocos2d::Color4F arg4; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); ok &= luaval_to_uint32(tolua_S, 5,&arg3); @@ -28729,7 +28729,7 @@ int lua_cocos2dx_DrawNode_onDraw(lua_State* tolua_S) cocos2d::Mat4 arg0; bool arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Mat4",&arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0); ok &= luaval_to_boolean(tolua_S, 3,&arg1); if(!ok) @@ -28823,11 +28823,11 @@ int lua_cocos2dx_DrawNode_drawTriangle(lua_State* tolua_S) cocos2d::Vec2 arg2; cocos2d::Color4F arg3; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); ok &=luaval_to_color4f(tolua_S, 5, &arg3); if(!ok) @@ -28877,7 +28877,7 @@ int lua_cocos2dx_DrawNode_drawDot(lua_State* tolua_S) double arg1; cocos2d::Color4F arg2; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); ok &= luaval_to_number(tolua_S, 3,&arg1); @@ -28932,13 +28932,13 @@ int lua_cocos2dx_DrawNode_drawCubicBezier(lua_State* tolua_S) unsigned int arg4; cocos2d::Color4F arg5; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); ok &= luaval_to_uint32(tolua_S, 6,&arg4); @@ -28991,9 +28991,9 @@ int lua_cocos2dx_DrawNode_drawSegment(lua_State* tolua_S) double arg2; cocos2d::Color4F arg3; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); ok &= luaval_to_number(tolua_S, 4,&arg2); @@ -30999,7 +30999,7 @@ int lua_cocos2dx_GLProgram_setUniformsForBuiltins(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Mat4 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Mat4",&arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0); if (!ok) { break; } cobj->setUniformsForBuiltins(arg0); @@ -33605,7 +33605,7 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S) ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; bool ret = cobj->setBMFontFilePath(arg0, arg1); @@ -34839,7 +34839,7 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S) ok &= luaval_to_std_string(tolua_S, 3,&arg1); ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); - ok &= luaval_to_object(tolua_S, 6, "cc.Vec2",&arg4); + ok &= luaval_to_vec2(tolua_S, 6, &arg4); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1, arg2, arg3, arg4); @@ -35528,7 +35528,7 @@ int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); - ok &= luaval_to_object(tolua_S, 6, "cc.Vec2",&arg4); + ok &= luaval_to_vec2(tolua_S, 6, &arg4); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); @@ -35678,7 +35678,7 @@ int lua_cocos2dx_LabelBMFont_setFntFile(lua_State* tolua_S) ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; cobj->setFntFile(arg0, arg1); @@ -35884,7 +35884,7 @@ int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); if (!ok) { break; } cocos2d::Vec2 arg4; - ok &= luaval_to_object(tolua_S, 6, "cc.Vec2",&arg4); + ok &= luaval_to_vec2(tolua_S, 6, &arg4); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -36409,7 +36409,7 @@ int lua_cocos2dx_LayerGradient_setVector(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setVector(arg0); @@ -36594,7 +36594,7 @@ int lua_cocos2dx_LayerGradient_getVector(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getVector(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVector",argc, 0); @@ -36838,7 +36838,7 @@ int lua_cocos2dx_LayerGradient_create(lua_State* tolua_S) ok &=luaval_to_color4b(tolua_S, 3, &arg1); if (!ok) { break; } cocos2d::Vec2 arg2; - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if (!ok) { break; } cocos2d::LayerGradient* ret = cocos2d::LayerGradient::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LayerGradient",(cocos2d::LayerGradient*)ret); @@ -43429,7 +43429,7 @@ int lua_cocos2dx_Sprite_getOffsetPosition(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getOffsetPosition(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffsetPosition",argc, 0); @@ -44589,7 +44589,7 @@ int lua_cocos2dx_ProgressTimer_setBarChangeRate(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setBarChangeRate(arg0); @@ -44813,7 +44813,7 @@ int lua_cocos2dx_ProgressTimer_setMidpoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setMidpoint(arg0); @@ -44860,7 +44860,7 @@ int lua_cocos2dx_ProgressTimer_getBarChangeRate(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getBarChangeRate(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBarChangeRate",argc, 0); @@ -44957,7 +44957,7 @@ int lua_cocos2dx_ProgressTimer_getMidpoint(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getMidpoint(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMidpoint",argc, 0); @@ -45773,7 +45773,7 @@ int lua_cocos2dx_RenderTexture_setVirtualViewport(lua_State* tolua_S) cocos2d::Rect arg1; cocos2d::Rect arg2; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); ok &= luaval_to_rect(tolua_S, 3, &arg1); @@ -48090,7 +48090,7 @@ int lua_cocos2dx_ParticleSystem_setPosVar(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setPosVar(arg0); @@ -48725,7 +48725,7 @@ int lua_cocos2dx_ParticleSystem_getGravity(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getGravity(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGravity",argc, 0); @@ -49131,7 +49131,7 @@ int lua_cocos2dx_ParticleSystem_getPosVar(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getPosVar(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosVar",argc, 0); @@ -49395,7 +49395,7 @@ int lua_cocos2dx_ParticleSystem_getSourcePosition(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getSourcePosition(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSourcePosition",argc, 0); @@ -49579,7 +49579,7 @@ int lua_cocos2dx_ParticleSystem_updateQuadWithParticle(lua_State* tolua_S) #pragma warning NO CONVERSION TO NATIVE FOR sParticle*; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; cobj->updateQuadWithParticle(arg0, arg1); @@ -50434,7 +50434,7 @@ int lua_cocos2dx_ParticleSystem_setSourcePosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setSourcePosition(arg0); @@ -51294,7 +51294,7 @@ int lua_cocos2dx_ParticleSystem_setGravity(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setGravity(arg0); @@ -53921,7 +53921,7 @@ int lua_cocos2dx_GridBase_getStep(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getStep(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStep",argc, 0); @@ -54007,7 +54007,7 @@ int lua_cocos2dx_GridBase_setStep(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setStep(arg0); @@ -55382,7 +55382,7 @@ int lua_cocos2dx_GLViewProtocol_getVisibleOrigin(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getVisibleOrigin(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleOrigin",argc, 0); @@ -58322,9 +58322,9 @@ int lua_cocos2dx_ParallaxNode_addChild(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if(!ok) return 0; cobj->addChild(arg0, arg1, arg2, arg3); @@ -58516,7 +58516,7 @@ int lua_cocos2dx_TMXObjectGroup_setPositionOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setPositionOffset(arg0); @@ -58610,7 +58610,7 @@ int lua_cocos2dx_TMXObjectGroup_getPositionOffset(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getPositionOffset(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionOffset",argc, 0); @@ -60907,7 +60907,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; unsigned int ret = cobj->getTileGIDAt(arg0); @@ -60919,7 +60919,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) cocos2d::Vec2 arg0; cocos2d::TMXTileFlags_* arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); #pragma warning NO CONVERSION TO NATIVE FOR TMXTileFlags_*; if(!ok) @@ -60968,11 +60968,11 @@ int lua_cocos2dx_TMXLayer_getPositionAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPositionAt(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionAt",argc, 1); @@ -61376,7 +61376,7 @@ int lua_cocos2dx_TMXLayer_removeTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->removeTileAt(arg0); @@ -61516,7 +61516,7 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S) if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if (!ok) { break; } cocos2d::TMXTileFlags_ arg2; @@ -61535,7 +61535,7 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S) if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if (!ok) { break; } cobj->setTileGID(arg0, arg1); @@ -61901,7 +61901,7 @@ int lua_cocos2dx_TMXLayer_getTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Sprite* ret = cobj->getTileAt(arg0); @@ -62857,7 +62857,7 @@ int lua_cocos2dx_TileMapAtlas_getTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Color3B ret = cobj->getTileAt(arg0); @@ -62907,7 +62907,7 @@ int lua_cocos2dx_TileMapAtlas_setTile(lua_State* tolua_S) ok &= luaval_to_color3b(tolua_S, 2, &arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; cobj->setTile(arg0, arg1); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp index 97d71ef5c0..673e875412 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp @@ -2028,7 +2028,7 @@ int lua_cocos2dx_extension_Control_getTouchLocation(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getTouchLocation(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchLocation",argc, 1); @@ -2508,7 +2508,7 @@ int lua_cocos2dx_extension_ControlButton_setLabelAnchorPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setLabelAnchorPoint(arg0); @@ -2555,7 +2555,7 @@ int lua_cocos2dx_extension_ControlButton_getLabelAnchorPoint(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getLabelAnchorPoint(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLabelAnchorPoint",argc, 0); @@ -4174,7 +4174,7 @@ int lua_cocos2dx_extension_ControlHuePicker_initWithTargetAndPos(lua_State* tolu ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; bool ret = cobj->initWithTargetAndPos(arg0, arg1); @@ -4268,7 +4268,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getStartPos(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getStartPos(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartPos",argc, 0); @@ -4615,7 +4615,7 @@ int lua_cocos2dx_extension_ControlHuePicker_create(lua_State* tolua_S) cocos2d::Node* arg0; cocos2d::Vec2 arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; cocos2d::extension::ControlHuePicker* ret = cocos2d::extension::ControlHuePicker::create(arg0, arg1); @@ -4773,7 +4773,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_initWithTargetAndPo ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; bool ret = cobj->initWithTargetAndPos(arg0, arg1); @@ -4821,7 +4821,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getStartPos(lua_Sta if(!ok) return 0; cocos2d::Vec2 ret = cobj->getStartPos(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartPos",argc, 0); @@ -5120,7 +5120,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_create(lua_State* t cocos2d::Node* arg0; cocos2d::Vec2 arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; cocos2d::extension::ControlSaturationBrightnessPicker* ret = cocos2d::extension::ControlSaturationBrightnessPicker::create(arg0, arg1); @@ -5830,7 +5830,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_setPreviousLocation(lua_State* t { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setPreviousLocation(arg0); @@ -6013,13 +6013,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_angleInDegreesBetweenLineFromPoi cocos2d::Vec2 arg2; cocos2d::Vec2 arg3; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if(!ok) return 0; double ret = cobj->angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint(arg0, arg1, arg2, arg3); @@ -6066,7 +6066,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerBegan(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->potentiometerBegan(arg0); @@ -6293,7 +6293,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getPreviousLocation(lua_State* t if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPreviousLocation(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreviousLocation",argc, 0); @@ -6337,9 +6337,9 @@ int lua_cocos2dx_extension_ControlPotentiometer_distanceBetweenPointAndPoint(lua cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; double ret = cobj->distanceBetweenPointAndPoint(arg0, arg1); @@ -6386,7 +6386,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerEnded(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->potentiometerEnded(arg0); @@ -6621,7 +6621,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerMoved(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->potentiometerMoved(arg0); @@ -6825,7 +6825,7 @@ int lua_cocos2dx_extension_ControlSlider_locationFromTouch(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->locationFromTouch(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "locationFromTouch",argc, 1); @@ -8251,7 +8251,7 @@ int lua_cocos2dx_extension_ControlStepper_updateLayoutUsingTouchLocation(lua_Sta { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->updateLayoutUsingTouchLocation(arg0); @@ -9375,7 +9375,7 @@ int lua_cocos2dx_extension_ControlSwitch_locationFromTouch(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->locationFromTouch(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "locationFromTouch",argc, 1); @@ -9691,7 +9691,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffsetInDuration(lua_State* tolu cocos2d::Vec2 arg0; double arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); ok &= luaval_to_number(tolua_S, 3,&arg1); if(!ok) @@ -10255,7 +10255,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setContentOffset(arg0); @@ -10266,7 +10266,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffset(lua_State* tolua_S) cocos2d::Vec2 arg0; bool arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); ok &= luaval_to_boolean(tolua_S, 3,&arg1); if(!ok) @@ -10542,7 +10542,7 @@ int lua_cocos2dx_extension_ScrollView_getContentOffset(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getContentOffset(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentOffset",argc, 0); @@ -10817,7 +10817,7 @@ int lua_cocos2dx_extension_ScrollView_maxContainerOffset(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->maxContainerOffset(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "maxContainerOffset",argc, 0); @@ -11002,7 +11002,7 @@ int lua_cocos2dx_extension_ScrollView_minContainerOffset(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->minContainerOffset(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "minContainerOffset",argc, 0); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp index f0d527be73..cf3d79938c 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp @@ -36,7 +36,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getGravity(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getGravity(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGravity",argc, 0); @@ -123,7 +123,7 @@ int lua_cocos2dx_physics_PhysicsWorld_setGravity(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setGravity(arg0); @@ -415,7 +415,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getShapes(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vector ret = cobj->getShapes(arg0); @@ -515,7 +515,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getShape(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::PhysicsShape* ret = cobj->getShape(arg0); @@ -1337,7 +1337,7 @@ int lua_cocos2dx_physics_PhysicsShape_containsPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; bool ret = cobj->containsPoint(arg0); @@ -1517,7 +1517,7 @@ int lua_cocos2dx_physics_PhysicsShape_getCenter(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getCenter(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCenter",argc, 0); @@ -1829,7 +1829,7 @@ int lua_cocos2dx_physics_PhysicsShape_getOffset(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getOffset(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffset",argc, 0); @@ -2296,7 +2296,7 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_create(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if(!ok) return 0; cocos2d::PhysicsShapeCircle* ret = cocos2d::PhysicsShapeCircle::create(arg0, arg1, arg2); @@ -2378,7 +2378,7 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_calculateMoment(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if(!ok) return 0; double ret = cocos2d::PhysicsShapeCircle::calculateMoment(arg0, arg1, arg2); @@ -2548,7 +2548,7 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_size(tolua_S, 2, &arg0); ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if(!ok) return 0; cocos2d::PhysicsShapeBox* ret = cocos2d::PhysicsShapeBox::create(arg0, arg1, arg2); @@ -2630,7 +2630,7 @@ int lua_cocos2dx_physics_PhysicsShapeBox_calculateMoment(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if(!ok) return 0; double ret = cocos2d::PhysicsShapeBox::calculateMoment(arg0, arg1, arg2); @@ -2747,7 +2747,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_getPoint(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPoint(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPoint",argc, 1); @@ -2812,7 +2812,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_getPointB(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPointB(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointB",argc, 0); @@ -2856,7 +2856,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_getPointA(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPointA(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointA",argc, 0); @@ -2888,8 +2888,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) { cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; cocos2d::PhysicsShapeEdgeSegment* ret = cocos2d::PhysicsShapeEdgeSegment::create(arg0, arg1); @@ -2901,8 +2901,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); ok &= luaval_to_physics_material(tolua_S, 4, &arg2); if(!ok) return 0; @@ -2916,8 +2916,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; double arg3; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); ok &= luaval_to_physics_material(tolua_S, 4, &arg2); ok &= luaval_to_number(tolua_S, 5,&arg3); if(!ok) @@ -3060,7 +3060,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S) 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); - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if(!ok) return 0; cocos2d::PhysicsShapeEdgeBox* ret = cocos2d::PhysicsShapeEdgeBox::create(arg0, arg1, arg2, arg3); @@ -3645,11 +3645,11 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if (!ok) { break; } cobj->applyImpulse(arg0, arg1); @@ -3660,7 +3660,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if (!ok) { break; } cobj->applyImpulse(arg0); @@ -3748,11 +3748,11 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if (!ok) { break; } cobj->applyForce(arg0, arg1); @@ -3763,7 +3763,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if (!ok) { break; } cobj->applyForce(arg0); @@ -4009,7 +4009,7 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocity(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getVelocity(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocity",argc, 0); @@ -4288,7 +4288,7 @@ int lua_cocos2dx_physics_PhysicsBody_getPositionOffset(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPositionOffset(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionOffset",argc, 0); @@ -4466,7 +4466,7 @@ int lua_cocos2dx_physics_PhysicsBody_getPosition(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPosition(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); @@ -4735,11 +4735,11 @@ int lua_cocos2dx_physics_PhysicsBody_local2World(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->local2World(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "local2World",argc, 1); @@ -5050,11 +5050,11 @@ int lua_cocos2dx_physics_PhysicsBody_world2Local(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->world2Local(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "world2Local",argc, 1); @@ -5316,7 +5316,7 @@ int lua_cocos2dx_physics_PhysicsBody_setVelocity(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setVelocity(arg0); @@ -5454,7 +5454,7 @@ int lua_cocos2dx_physics_PhysicsBody_setPositionOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setPositionOffset(arg0); @@ -5634,11 +5634,11 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityAtLocalPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getVelocityAtLocalPoint(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocityAtLocalPoint",argc, 1); @@ -5864,11 +5864,11 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityAtWorldPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getVelocityAtWorldPoint(arg0); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocityAtWorldPoint",argc, 1); @@ -6102,7 +6102,7 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_size(tolua_S, 2, &arg0); ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createBox(arg0, arg1, arg2); @@ -6136,8 +6136,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) { cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeSegment(arg0, arg1); @@ -6149,8 +6149,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); ok &= luaval_to_physics_material(tolua_S, 4, &arg2); if(!ok) return 0; @@ -6164,8 +6164,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; double arg3; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 3, &arg1); ok &= luaval_to_physics_material(tolua_S, 4, &arg2); ok &= luaval_to_number(tolua_S, 5,&arg3); if(!ok) @@ -6303,7 +6303,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S) 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); - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeBox(arg0, arg1, arg2, arg3); @@ -6362,7 +6362,7 @@ int lua_cocos2dx_physics_PhysicsBody_createCircle(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createCircle(arg0, arg1, arg2); @@ -6914,7 +6914,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_getSurfaceVelocity(lua_State* to if(!ok) return 0; cocos2d::Vec2 ret = cobj->getSurfaceVelocity(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSurfaceVelocity",argc, 0); @@ -6957,7 +6957,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_setSurfaceVelocity(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setSurfaceVelocity(arg0); @@ -7120,7 +7120,7 @@ int lua_cocos2dx_physics_PhysicsContactPostSolve_getSurfaceVelocity(lua_State* t if(!ok) return 0; cocos2d::Vec2 ret = cobj->getSurfaceVelocity(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSurfaceVelocity",argc, 0); @@ -8187,7 +8187,7 @@ int lua_cocos2dx_physics_PhysicsJointFixed_construct(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if(!ok) return 0; cocos2d::PhysicsJointFixed* ret = cocos2d::PhysicsJointFixed::construct(arg0, arg1, arg2); @@ -8252,7 +8252,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setAnchr2(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setAnchr2(arg0); @@ -8298,7 +8298,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setAnchr1(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setAnchr1(arg0); @@ -8391,7 +8391,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getAnchr2(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getAnchr2(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr2",argc, 0); @@ -8435,7 +8435,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getAnchr1(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getAnchr1(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr1",argc, 0); @@ -8607,10 +8607,10 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); if (!ok) { break; } cocos2d::Vec2 arg2; - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if (!ok) { break; } double arg4; ok &= luaval_to_number(tolua_S, 6,&arg4); @@ -8635,10 +8635,10 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); if (!ok) { break; } cocos2d::Vec2 arg2; - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if (!ok) { break; } cocos2d::PhysicsJointLimit* ret = cocos2d::PhysicsJointLimit::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointLimit",(cocos2d::PhysicsJointLimit*)ret); @@ -8704,7 +8704,7 @@ int lua_cocos2dx_physics_PhysicsJointPin_construct(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if(!ok) return 0; cocos2d::PhysicsJointPin* ret = cocos2d::PhysicsJointPin::construct(arg0, arg1, arg2); @@ -8852,8 +8852,8 @@ int lua_cocos2dx_physics_PhysicsJointDistance_construct(lua_State* tolua_S) cocos2d::Vec2 arg3; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); if(!ok) return 0; cocos2d::PhysicsJointDistance* ret = cocos2d::PhysicsJointDistance::construct(arg0, arg1, arg2, arg3); @@ -8920,7 +8920,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setAnchr2(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setAnchr2(arg0); @@ -8966,7 +8966,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setAnchr1(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setAnchr1(arg0); @@ -9147,7 +9147,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getAnchr2(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getAnchr2(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr2",argc, 0); @@ -9191,7 +9191,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getAnchr1(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getAnchr1(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr1",argc, 0); @@ -9365,8 +9365,8 @@ int lua_cocos2dx_physics_PhysicsJointSpring_construct(lua_State* tolua_S) double arg5; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); ok &= luaval_to_number(tolua_S, 6,&arg4); ok &= luaval_to_number(tolua_S, 7,&arg5); if(!ok) @@ -9443,7 +9443,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setAnchr2(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setAnchr2(arg0); @@ -9489,7 +9489,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setGrooveA(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setGrooveA(arg0); @@ -9535,7 +9535,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setGrooveB(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setGrooveB(arg0); @@ -9582,7 +9582,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getGrooveA(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getGrooveA(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrooveA",argc, 0); @@ -9626,7 +9626,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getGrooveB(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getGrooveB(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrooveB",argc, 0); @@ -9670,7 +9670,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getAnchr2(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getAnchr2(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr2",argc, 0); @@ -9707,9 +9707,9 @@ int lua_cocos2dx_physics_PhysicsJointGroove_construct(lua_State* tolua_S) cocos2d::Vec2 arg4; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); - ok &= luaval_to_object(tolua_S, 5, "cc.Vec2",&arg3); - ok &= luaval_to_object(tolua_S, 6, "cc.Vec2",&arg4); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 6, &arg4); if(!ok) return 0; cocos2d::PhysicsJointGroove* ret = cocos2d::PhysicsJointGroove::construct(arg0, arg1, arg2, arg3, arg4); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp index d130ae9500..e41bcee980 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp @@ -125,7 +125,7 @@ int lua_cocos2dx_spine_Skeleton_onDraw(lua_State* tolua_S) cocos2d::Mat4 arg0; bool arg1; - ok &= luaval_to_object(tolua_S, 2, "cc.Mat4",&arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0); ok &= luaval_to_boolean(tolua_S, 3,&arg1); if(!ok) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp index e7b3ad85e2..be3c27cf08 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp @@ -3028,7 +3028,7 @@ int lua_cocos2dx_studio_ContourData_addVertex(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->addVertex(arg0); @@ -3814,7 +3814,7 @@ int lua_cocos2dx_studio_DisplayManager_getAnchorPointInPoints(lua_State* tolua_S if(!ok) return 0; cocos2d::Vec2 ret = cobj->getAnchorPointInPoints(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPointInPoints",argc, 0); @@ -4199,7 +4199,7 @@ int lua_cocos2dx_studio_DisplayManager_containPoint(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if (!ok) { break; } bool ret = cobj->containPoint(arg0); @@ -4435,7 +4435,7 @@ int lua_cocos2dx_studio_DisplayManager_getAnchorPoint(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getAnchorPoint(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPoint",argc, 0); @@ -6052,7 +6052,7 @@ int lua_cocos2dx_studio_Bone_getNodeToArmatureTransform(lua_State* tolua_S) if(!ok) return 0; cocos2d::Mat4 ret = cobj->getNodeToArmatureTransform(); - object_to_luaval(tolua_S, "cc.Mat4",(cocos2d::Mat4)ret); + mat4_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToArmatureTransform",argc, 0); @@ -9616,7 +9616,7 @@ int lua_cocos2dx_studio_Skin_getNodeToWorldTransformAR(lua_State* tolua_S) if(!ok) return 0; cocos2d::Mat4 ret = cobj->getNodeToWorldTransformAR(); - object_to_luaval(tolua_S, "cc.Mat4",(cocos2d::Mat4)ret); + mat4_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToWorldTransformAR",argc, 0); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp index 399b2caba4..f9773df6f5 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp @@ -843,7 +843,7 @@ int lua_cocos2dx_ui_Widget_setSizePercent(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setSizePercent(arg0); @@ -1070,7 +1070,7 @@ int lua_cocos2dx_ui_Widget_getTouchEndPos(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getTouchEndPos(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchEndPos",argc, 0); @@ -1113,7 +1113,7 @@ int lua_cocos2dx_ui_Widget_setPositionPercent(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setPositionPercent(arg0); @@ -1880,7 +1880,7 @@ int lua_cocos2dx_ui_Widget_getWorldPosition(lua_State* tolua_S) if(!ok) return 0; cocos2d::Vec2 ret = cobj->getWorldPosition(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorldPosition",argc, 0); @@ -2060,7 +2060,7 @@ int lua_cocos2dx_ui_Widget_getTouchMovePos(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getTouchMovePos(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchMovePos",argc, 0); @@ -2332,7 +2332,7 @@ int lua_cocos2dx_ui_Widget_getSizePercent(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getSizePercent(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSizePercent",argc, 0); @@ -2376,7 +2376,7 @@ int lua_cocos2dx_ui_Widget_getTouchStartPos(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getTouchStartPos(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchStartPos",argc, 0); @@ -2555,7 +2555,7 @@ int lua_cocos2dx_ui_Widget_clippingParentAreaContainPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; bool ret = cobj->clippingParentAreaContainPoint(arg0); @@ -3014,7 +3014,7 @@ int lua_cocos2dx_ui_Widget_getPositionPercent(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getPositionPercent(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionPercent",argc, 0); @@ -3057,7 +3057,7 @@ int lua_cocos2dx_ui_Widget_hitTest(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; bool ret = cobj->hitTest(arg0); @@ -3244,7 +3244,7 @@ int lua_cocos2dx_ui_Widget_checkChildInfo(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "ccui.Widget",&arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2); if(!ok) return 0; cobj->checkChildInfo(arg0, arg1, arg2); @@ -3569,7 +3569,7 @@ int lua_cocos2dx_ui_Layout_setBackGroundColorVector(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setBackGroundColorVector(arg0); @@ -3800,7 +3800,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColorVector(lua_State* tolua_S) if(!ok) return 0; const cocos2d::Vec2& ret = cobj->getBackGroundColorVector(); - object_to_luaval(tolua_S, "cc.Vec2",(cocos2d::Vec2&)ret); + vec2_to_luaval(tolua_S, ret); return 1; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundColorVector",argc, 0); @@ -9578,7 +9578,7 @@ int lua_cocos2dx_ui_ScrollView_scrollToPercentBothDirection(lua_State* tolua_S) double arg1; bool arg2; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); ok &= luaval_to_number(tolua_S, 3,&arg1); @@ -10535,7 +10535,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToPercentBothDirection(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->jumpToPercentBothDirection(arg0); @@ -14327,7 +14327,7 @@ int lua_cocos2dx_ui_TextField_hitTest(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; bool ret = cobj->hitTest(arg0); @@ -16390,7 +16390,7 @@ int lua_cocos2dx_ui_RichText_setAnchorPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Vec2",&arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0); if(!ok) return 0; cobj->setAnchorPoint(arg0);