diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp index 8acf342552..da15b71819 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp @@ -31,7 +31,7 @@ std::unordered_map g_luaType; std::unordered_map g_typeCast; #if COCOS2D_DEBUG >=1 -void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err) +void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err, const char* funcName) { if (NULL == L || NULL == err || NULL == msg || 0 == strlen(msg)) return; @@ -44,16 +44,16 @@ void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err) { int narg = err->index; if (err->array) - CCLOG("%s\n argument #%d is array of '%s'; array of '%s' expected.\n",msg+2,narg,provided,expected); + CCLOG("%s\n %s argument #%d is array of '%s'; array of '%s' expected.\n",msg+2,funcName,narg,provided,expected); else - CCLOG("%s\n argument #%d is '%s'; '%s' expected.\n",msg+2,narg,provided,expected); + CCLOG("%s\n %s argument #%d is '%s'; '%s' expected.\n",msg+2,funcName,narg,provided,expected); } else if (msg[1]=='v') { if (err->array) - CCLOG("%s\n value is array of '%s'; array of '%s' expected.\n",msg+2,provided,expected); + CCLOG("%s\n %s value is array of '%s'; array of '%s' expected.\n",funcName,msg+2,provided,expected); else - CCLOG("%s\n value is '%s'; '%s' expected.\n",msg+2,provided,expected); + CCLOG("%s\n %s value is '%s'; '%s' expected.\n",msg+2,funcName,provided,expected); } } } @@ -78,7 +78,7 @@ bool luaval_is_usertype(lua_State* L,int lo,const char* type, int def) return false; } -bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue) +bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -89,7 +89,7 @@ bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -103,7 +103,7 @@ bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue) } -bool luaval_to_int32(lua_State* L,int lo,int* outValue) +bool luaval_to_int32(lua_State* L,int lo,int* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -114,7 +114,7 @@ bool luaval_to_int32(lua_State* L,int lo,int* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -127,7 +127,7 @@ bool luaval_to_int32(lua_State* L,int lo,int* outValue) return ok; } -bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue) +bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -138,7 +138,7 @@ bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -151,7 +151,7 @@ bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue) return ok; } -bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue) +bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -162,7 +162,7 @@ bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -175,7 +175,7 @@ bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue) return ok; } -bool luaval_to_boolean(lua_State* L,int lo,bool* outValue) +bool luaval_to_boolean(lua_State* L,int lo,bool* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -186,7 +186,7 @@ bool luaval_to_boolean(lua_State* L,int lo,bool* outValue) if (!tolua_isboolean(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -199,7 +199,7 @@ bool luaval_to_boolean(lua_State* L,int lo,bool* outValue) return ok; } -bool luaval_to_number(lua_State* L,int lo,double* outValue) +bool luaval_to_number(lua_State* L,int lo,double* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -210,7 +210,7 @@ bool luaval_to_number(lua_State* L,int lo,double* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -223,7 +223,7 @@ bool luaval_to_number(lua_State* L,int lo,double* outValue) return ok; } -bool luaval_to_long_long(lua_State* L,int lo,long long* outValue) +bool luaval_to_long_long(lua_State* L,int lo,long long* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -234,7 +234,7 @@ bool luaval_to_long_long(lua_State* L,int lo,long long* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -247,7 +247,7 @@ bool luaval_to_long_long(lua_State* L,int lo,long long* outValue) return ok; } -bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue) +bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -258,7 +258,7 @@ bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue) if (!tolua_iscppstring(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -271,7 +271,7 @@ bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue) return ok; } -bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue) +bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -282,7 +282,7 @@ bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -303,7 +303,7 @@ bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue) return ok; } -bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue) +bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -314,7 +314,7 @@ bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -340,7 +340,7 @@ bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue) return ok; } -bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue) +bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -351,7 +351,7 @@ bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -382,7 +382,7 @@ bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue) return ok; } -bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue) +bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -393,7 +393,7 @@ bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -414,7 +414,7 @@ bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue) return ok; } -bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue) +bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -425,7 +425,7 @@ bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -451,12 +451,12 @@ bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue) return ok; } -bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue) +bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue, const char* funcName) { return luaval_to_long(L, lo, reinterpret_cast(outValue)); } -bool luaval_to_long(lua_State* L,int lo, long* outValue) +bool luaval_to_long(lua_State* L,int lo, long* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -467,7 +467,7 @@ bool luaval_to_long(lua_State* L,int lo, long* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -480,7 +480,7 @@ bool luaval_to_long(lua_State* L,int lo, long* outValue) return ok; } -bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue) +bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -491,7 +491,7 @@ bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -504,7 +504,7 @@ bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue) return ok; } -bool luaval_to_size(lua_State* L,int lo,Size* outValue) +bool luaval_to_size(lua_State* L,int lo,Size* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -515,7 +515,7 @@ bool luaval_to_size(lua_State* L,int lo,Size* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -536,7 +536,7 @@ bool luaval_to_size(lua_State* L,int lo,Size* outValue) return ok; } -bool luaval_to_rect(lua_State* L,int lo,Rect* outValue) +bool luaval_to_rect(lua_State* L,int lo,Rect* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -547,7 +547,7 @@ bool luaval_to_rect(lua_State* L,int lo,Rect* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -578,7 +578,7 @@ bool luaval_to_rect(lua_State* L,int lo,Rect* outValue) return ok; } -bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue) +bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -589,7 +589,7 @@ bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -620,7 +620,7 @@ bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue) return ok; } -bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue) +bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -631,7 +631,7 @@ bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -662,7 +662,7 @@ bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue) return ok; } -bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue) +bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -673,7 +673,7 @@ bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -699,7 +699,7 @@ bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue) return ok; } -bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue) +bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -710,7 +710,7 @@ bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -750,7 +750,7 @@ bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue) return ok; } -bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) +bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -761,7 +761,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); ok = false; #endif } @@ -891,7 +891,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) return ok; } -bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue) +bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -902,7 +902,7 @@ bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -946,7 +946,7 @@ bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue) } -bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue) +bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -957,7 +957,7 @@ bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -990,7 +990,7 @@ bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue) return false; } -bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue) +bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -1001,7 +1001,7 @@ bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValu if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1034,7 +1034,7 @@ bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValu return false; } -bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) +bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -1045,7 +1045,7 @@ bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); ok = false; #endif } @@ -1072,7 +1072,7 @@ bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) return ok; } -bool luaval_to_array(lua_State* L,int lo, __Array** outValue) +bool luaval_to_array(lua_State* L,int lo, __Array** outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -1083,7 +1083,7 @@ bool luaval_to_array(lua_State* L,int lo, __Array** outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1172,7 +1172,7 @@ bool luaval_to_array(lua_State* L,int lo, __Array** outValue) return ok; } -bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue) +bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -1183,7 +1183,7 @@ bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1276,7 +1276,7 @@ bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue) return ok; } -bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints) +bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints, const char* funcName) { if (NULL == L) return false; @@ -1288,7 +1288,7 @@ bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *nu if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1308,7 +1308,7 @@ bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *nu if (!tolua_istable(L,-1, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif lua_pop(L, 1); CC_SAFE_DELETE_ARRAY(array); @@ -1436,7 +1436,7 @@ bool luavals_variadic_to_ccvaluevector(lua_State* L, int argc, cocos2d::ValueVec return true; } -bool luaval_to_ccvalue(lua_State* L, int lo, cocos2d::Value* ret) +bool luaval_to_ccvalue(lua_State* L, int lo, cocos2d::Value* ret, const char* funcName) { if ( nullptr == L || nullptr == ret) return false; @@ -1492,7 +1492,7 @@ bool luaval_to_ccvalue(lua_State* L, int lo, cocos2d::Value* ret) return ok; } -bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret) +bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret, const char* funcName) { if ( nullptr == L || nullptr == ret) return false; @@ -1502,7 +1502,7 @@ bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1579,7 +1579,7 @@ bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret) return ok; } -bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* ret) +bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* ret, const char* funcName) { if (nullptr == L || nullptr == ret) return false; @@ -1589,7 +1589,7 @@ bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* r if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1667,7 +1667,7 @@ bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* r return ok; } -bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret) +bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret, const char* funcName) { if (nullptr == L || nullptr == ret) return false; @@ -1677,7 +1677,7 @@ bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1749,7 +1749,7 @@ bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret) return ok; } -bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1759,7 +1759,7 @@ bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1790,7 +1790,7 @@ bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* return ok; } -bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1800,7 +1800,7 @@ bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1828,7 +1828,7 @@ bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret) return ok; } -bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret) +bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1839,7 +1839,7 @@ bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttri if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1872,7 +1872,7 @@ bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttri } -bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1883,7 +1883,7 @@ bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1912,7 +1912,7 @@ bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret) } -bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1923,7 +1923,7 @@ bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h index f332afb076..8331d6b539 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h @@ -37,7 +37,7 @@ extern std::unordered_map g_luaType; extern std::unordered_map g_typeCast; #if COCOS2D_DEBUG >=1 -void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err); +void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err, const char* funcName = ""); #endif #define LUA_PRECONDITION( condition, ...) if( ! (condition) ) { \ @@ -47,48 +47,48 @@ cocos2d::log(__VA_ARGS__); \ extern bool luaval_is_usertype(lua_State* L,int lo,const char* type, int def); // to native -extern bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue); -extern bool luaval_to_int32(lua_State* L,int lo,int* outValue); -extern bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue); -extern bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue); -extern bool luaval_to_boolean(lua_State* L,int lo,bool* outValue); -extern bool luaval_to_number(lua_State* L,int lo,double* outValue); -extern bool luaval_to_long_long(lua_State* L,int lo,long long* outValue); -extern bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue); -extern bool luaval_to_long(lua_State* L,int lo, long* outValue); -extern bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue); -extern bool luaval_to_size(lua_State* L,int lo,Size* outValue); -extern bool luaval_to_rect(lua_State* L,int lo,Rect* outValue); -extern bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue); -extern bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue); -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_mat4(lua_State* L, int lo, cocos2d::Mat4* 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_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints); +extern bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue, const char* funcName = ""); +extern bool luaval_to_int32(lua_State* L,int lo,int* outValue, const char* funcName = ""); +extern bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue, const char* funcName = ""); +extern bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue, const char* funcName = ""); +extern bool luaval_to_boolean(lua_State* L,int lo,bool* outValue, const char* funcName = ""); +extern bool luaval_to_number(lua_State* L,int lo,double* outValue, const char* funcName = ""); +extern bool luaval_to_long_long(lua_State* L,int lo,long long* outValue, const char* funcName = ""); +extern bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue, const char* funcName = ""); +extern bool luaval_to_long(lua_State* L,int lo, long* outValue, const char* funcName = ""); +extern bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue, const char* funcName = ""); +extern bool luaval_to_size(lua_State* L,int lo,Size* outValue, const char* funcName = ""); +extern bool luaval_to_rect(lua_State* L,int lo,Rect* outValue, const char* funcName = ""); +extern bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue, const char* funcName = ""); +extern bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue, const char* funcName = ""); +extern bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue, const char* funcName = ""); +extern bool luaval_to_physics_material(lua_State* L,int lo, cocos2d::PhysicsMaterial* outValue, const char* funcName = ""); +extern bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue, const char* funcName = ""); +extern bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , const char* funcName = ""); +extern bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char* funcName = ""); +extern bool luaval_to_array(lua_State* L,int lo, __Array** outValue, const char* funcName = ""); +extern bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue, const char* funcName = ""); +extern bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints, const char* funcName = ""); extern bool luavals_variadic_to_array(lua_State* L,int argc, __Array** ret); extern bool luavals_variadic_to_ccvaluevector(lua_State* L, int argc, cocos2d::ValueVector* ret); -extern bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue); -extern bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue); -extern bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue); -extern bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue); -extern bool luaval_to_ttfconfig(lua_State* L, int lo, cocos2d::TTFConfig* outValue); -extern bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue); -extern bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue); +extern bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue, const char* funcName = ""); +extern bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue, const char* funcName = ""); +extern bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue, const char* funcName = ""); +extern bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue, const char* funcName = ""); +extern bool luaval_to_ttfconfig(lua_State* L, int lo, cocos2d::TTFConfig* outValue, const char* funcName = ""); +extern bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue, const char* funcName = ""); +extern bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue, const char* funcName = ""); -static inline bool luaval_to_point(lua_State* L,int lo,cocos2d::Vec2* outValue) +static inline bool luaval_to_point(lua_State* L,int lo,cocos2d::Vec2* outValue, const char* funcName = "") { return luaval_to_vec2(L, lo, outValue); } -CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_kmMat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) +CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_kmMat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char* funcName = "") { return luaval_to_mat4(L, lo, outValue); } -CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_array_of_Point(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints) +CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_array_of_Point(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints, const char* funcName = "") { return luaval_to_array_of_vec2(L, lo, points, numPoints); } @@ -122,7 +122,7 @@ bool luavals_variadic_to_ccvector( lua_State* L, int argc, cocos2d::Vector* r } template -bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector* ret) +bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector* ret, const char* funcName = "") { if (nullptr == L || nullptr == ret) return false; @@ -159,11 +159,11 @@ bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector* ret) return ok; } -bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret); -bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret); +bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); +bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); template -bool luaval_to_ccmap_string_key(lua_State* L, int lo, cocos2d::Map* ret) +bool luaval_to_ccmap_string_key(lua_State* L, int lo, cocos2d::Map* ret, const char* funcName = "") { if(nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -209,10 +209,10 @@ bool luaval_to_ccmap_string_key(lua_State* L, int lo, cocos2d::Map bool luaval_to_object(lua_State* L, int lo, const char* type, T** ret) @@ -231,9 +231,9 @@ bool luaval_to_object(lua_State* L, int lo, const char* type, T** ret) return true; } -extern bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret); -extern bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret); -extern bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret); +extern bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret, const char* funcName = ""); +extern bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); +extern bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); // from native extern void vec2_to_luaval(lua_State* L,const cocos2d::Vec2& vec2); diff --git a/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp b/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp index 8d7e5c100b..a1bf353acc 100644 --- a/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp +++ b/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp @@ -4429,7 +4429,7 @@ static int tolua_cocos2d_DrawPrimitives_drawPoint00(lua_State* tolua_S) #endif { cocos2d::Vec2 vec2; - if(luaval_to_vec2(tolua_S, 1, &vec2)) + if(luaval_to_vec2(tolua_S, 1, &vec2, "cc.DrawPrimitives.drawPoint")) { DrawPrimitives::drawPoint(vec2); } @@ -4476,7 +4476,7 @@ static int tolua_cocos2d_DrawPrimitives_drawPoints00(lua_State* tolua_S) goto tolua_lerror; } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawPrimitives.drawPoints")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -4512,11 +4512,11 @@ static int tolua_cocos2d_DrawPrimitives_drawLine00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawLine")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 2, &destination)) + if (!luaval_to_vec2(tolua_S, 2, &destination, "cc.DrawPrimitives.drawLine")) return 0; DrawPrimitives::drawLine(origin,destination); @@ -4545,11 +4545,11 @@ static int tolua_cocos2d_DrawPrimitives_drawRect00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawRect")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 2, &destination)) + if (!luaval_to_vec2(tolua_S, 2, &destination, "cc.DrawPrimitives.drawRect")) return 0; DrawPrimitives::drawRect(origin,destination); @@ -4580,15 +4580,15 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidRect00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawSolidRect")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 2, &destination)) + if (!luaval_to_vec2(tolua_S, 2, &destination, "cc.DrawPrimitives.drawSolidRect")) return 0; Color4F color; - if (!luaval_to_color4f(tolua_S, 3, &color)) + if (!luaval_to_color4f(tolua_S, 3, &color, "cc.DrawPrimitives.drawSolidRect")) return 0; @@ -4638,7 +4638,7 @@ static int tolua_cocos2d_DrawPrimitives_drawPoly00(lua_State* tolua_S) goto tolua_lerror; } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawPrimitives.drawPoly")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -4692,7 +4692,7 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidPoly00(lua_State* tolua_S) goto tolua_lerror; } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawPrimitives.drawSolidPoly")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -4702,7 +4702,7 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidPoly00(lua_State* tolua_S) } Color4F color; - if (!luaval_to_color4f(tolua_S, 3, &color)) + if (!luaval_to_color4f(tolua_S, 3, &color, "cc.DrawPrimitives.drawSolidPoly")) { CC_SAFE_DELETE_ARRAY(points); return 0; @@ -4742,7 +4742,7 @@ static int tolua_cocos2d_DrawPrimitives_drawCircle00(lua_State* tolua_S) #endif { cocos2d::Vec2 center; - if (!luaval_to_vec2(tolua_S, 1, ¢er)) + if (!luaval_to_vec2(tolua_S, 1, ¢er, "cc.DrawPrimitives.drawCircle")) return 0; float radius = ((float) tolua_tonumber(tolua_S,2,0)); @@ -4783,7 +4783,7 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidCircle00(lua_State* tolua_S) #endif { cocos2d::Vec2 center; - if (!luaval_to_vec2(tolua_S, 1, ¢er)) + if (!luaval_to_vec2(tolua_S, 1, ¢er, "cc.DrawPrimitives.drawSolidCircle")) return 0; float radius = ((float) tolua_tonumber(tolua_S,2,0)); float angle = ((float) tolua_tonumber(tolua_S,3,0)); @@ -4820,15 +4820,15 @@ static int tolua_cocos2d_DrawPrimitives_drawQuadBezier00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawQuadBezier")) return 0; cocos2d::Vec2 control; - if (!luaval_to_vec2(tolua_S, 2, &control)) + if (!luaval_to_vec2(tolua_S, 2, &control, "cc.DrawPrimitives.drawQuadBezier")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 3, &destination)) + if (!luaval_to_vec2(tolua_S, 3, &destination, "cc.DrawPrimitives.drawQuadBezier")) return 0; unsigned int segments = ((unsigned int) tolua_tonumber(tolua_S,4,0)); @@ -4863,19 +4863,19 @@ static int tolua_cocos2d_DrawPrimitives_drawCubicBezier00(lua_State* tolua_S) { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawCubicBezier")) return 0; cocos2d::Vec2 control1; - if (!luaval_to_vec2(tolua_S, 2, &control1)) + if (!luaval_to_vec2(tolua_S, 2, &control1, "cc.DrawPrimitives.drawCubicBezier")) return 0; cocos2d::Vec2 control2; - if (!luaval_to_vec2(tolua_S, 3, &control2)) + if (!luaval_to_vec2(tolua_S, 3, &control2, "cc.DrawPrimitives.drawCubicBezier")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 4, &destination)) + if (!luaval_to_vec2(tolua_S, 4, &destination, "cc.DrawPrimitives.drawCubicBezier")) return 0; unsigned int segments = ((unsigned int) tolua_tonumber(tolua_S,5,0)); @@ -4907,7 +4907,7 @@ int tolua_cocos2d_DrawPrimitives_drawCatmullRom00(lua_State* tolua_S) { int num = 0; cocos2d::Vec2 *arr = NULL; - if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num)) + if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num, "cc.DrawPrimitives.drawCatmullRom")) return 0; @@ -4954,7 +4954,7 @@ int tolua_cocos2d_DrawPrimitives_drawCardinalSpline00(lua_State* tolua_S) { int num = 0; cocos2d::Vec2 *arr = NULL; - if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num)) + if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num, "cc.DrawPrimitives.drawCatmullRom")) return 0; diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp index a33e1adb2f..d7874f2782 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp @@ -428,7 +428,7 @@ int lua_cocos2dx_studio_NodeReader_getInstance(lua_State* L) tolua_pushusertype(L,(void*)ret, "ccs.NodeReader"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.NodeReader:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -471,7 +471,7 @@ int lua_cocos2dx_studio_ActionTimelineCache_getInstance(lua_State* L) tolua_pushusertype(L,(void*)ret, "ccs.ActionTimelineCache"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionTimelineCache:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp index 8b6345ae4d..eb64b99bb1 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp @@ -1996,13 +1996,13 @@ static int lua_cocos2dx_LabelBMFont_setLineBreakWithoutSpace(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelBMFont:setLineBreakWithoutSpace"); if(!ok) return 0; cobj->setLineBreakWithoutSpace(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLineBreakWithoutSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setLineBreakWithoutSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2046,7 +2046,7 @@ static int lua_cocos2dx_LabelBMFont_getBlendFunc(lua_State* tolua_S) blendfunc_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBlendFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getBlendFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2090,7 +2090,7 @@ static int lua_cocos2dx_LabelBMFont_isOpacityModifyRGB(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOpacityModifyRGB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:isOpacityModifyRGB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2130,14 +2130,14 @@ static int lua_cocos2dx_LabelBMFont_getLetter(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelBMFont:getLetter"); if(!ok) return 0; cocos2d::Sprite* ret = cobj->getLetter(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLetter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getLetter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2181,7 +2181,7 @@ static int lua_cocos2dx_LabelBMFont_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2227,7 +2227,7 @@ static int lua_cocos2dx_LabelBMFont_setBlendFunc(lua_State* tolua_S) cobj->setBlendFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setBlendFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2267,13 +2267,13 @@ static int lua_cocos2dx_LabelBMFont_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2314,9 +2314,9 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1); @@ -2329,11 +2329,11 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) std::string arg1; double arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1,"cc.LabelBMFont:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2); @@ -2347,13 +2347,13 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) double arg2; cocos2d::TextHAlignment arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3); @@ -2368,22 +2368,22 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) cocos2d::TextHAlignment arg3; cocos2d::Vec2 arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_vec2(tolua_S, 6, &arg4); + ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithString",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:initWithString",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2423,13 +2423,13 @@ static int lua_cocos2dx_LabelBMFont_setOpacityModifyRGB(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelBMFont:setOpacityModifyRGB"); if(!ok) return 0; cobj->setOpacityModifyRGB(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacityModifyRGB",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setOpacityModifyRGB",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2473,7 +2473,7 @@ static int lua_cocos2dx_LabelBMFont_getFntFile(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFntFile",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getFntFile",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2513,7 +2513,7 @@ static int lua_cocos2dx_LabelBMFont_setFntFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:setFntFile"); if(!ok) return 0; cobj->setFntFile(arg0); @@ -2524,15 +2524,15 @@ static int lua_cocos2dx_LabelBMFont_setFntFile(lua_State* tolua_S) std::string arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:setFntFile"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.LabelBMFont:setFntFile"); if(!ok) return 0; cobj->setFntFile(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFntFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setFntFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2572,13 +2572,13 @@ static int lua_cocos2dx_LabelBMFont_setAlignment(lua_State* tolua_S) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelBMFont:setAlignment"); if(!ok) return 0; cobj->setAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2618,13 +2618,13 @@ static int lua_cocos2dx_LabelBMFont_setWidth(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LabelBMFont:setWidth"); if(!ok) return 0; cobj->setWidth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setWidth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setWidth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2663,10 +2663,10 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2679,13 +2679,13 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2698,16 +2698,16 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::TextHAlignment arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2720,19 +2720,19 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::TextHAlignment arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::Vec2 arg4; - ok &= luaval_to_vec2(tolua_S, 6, &arg4); + ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2740,7 +2740,7 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LabelBMFont:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2772,7 +2772,7 @@ static int lua_cocos2dx_LabelBMFont_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.LabelBMFont"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LabelBMFont",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:new",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2851,11 +2851,11 @@ static int lua_cocos2dx_LabelTTF_enableShadow(lua_State* tolua_S) double arg1; double arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0, arg1, arg2); @@ -2868,19 +2868,19 @@ static int lua_cocos2dx_LabelTTF_enableShadow(lua_State* tolua_S) double arg2; bool arg3; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.LabelTTF:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableShadow",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:enableShadow",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -2920,13 +2920,13 @@ static int lua_cocos2dx_LabelTTF_setDimensions(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.LabelTTF:setDimensions"); if(!ok) return 0; cobj->setDimensions(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDimensions",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setDimensions",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2970,7 +2970,7 @@ static int lua_cocos2dx_LabelTTF_getFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3014,7 +3014,7 @@ static int lua_cocos2dx_LabelTTF_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3054,13 +3054,13 @@ static int lua_cocos2dx_LabelTTF_setFlippedY(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:setFlippedY"); if(!ok) return 0; cobj->setFlippedY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFlippedY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3100,13 +3100,13 @@ static int lua_cocos2dx_LabelTTF_setFlippedX(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:setFlippedX"); if(!ok) return 0; cobj->setFlippedX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFlippedX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3146,13 +3146,13 @@ static int lua_cocos2dx_LabelTTF_setTextDefinition(lua_State* tolua_S) { cocos2d::FontDefinition arg0; - ok &= luaval_to_fontdefinition(tolua_S, 2, &arg0); + ok &= luaval_to_fontdefinition(tolua_S, 2, &arg0, "cc.LabelTTF:setTextDefinition"); if(!ok) return 0; cobj->setTextDefinition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextDefinition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setTextDefinition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3192,13 +3192,13 @@ static int lua_cocos2dx_LabelTTF_setFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:setFontName"); if(!ok) return 0; cobj->setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3242,7 +3242,7 @@ static int lua_cocos2dx_LabelTTF_getHorizontalAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHorizontalAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getHorizontalAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3283,16 +3283,16 @@ static int lua_cocos2dx_LabelTTF_initWithStringAndTextDefinition(lua_State* tolu std::string arg0; cocos2d::FontDefinition arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithStringAndTextDefinition"); - ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1); + ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1, "cc.LabelTTF:initWithStringAndTextDefinition"); if(!ok) return 0; bool ret = cobj->initWithStringAndTextDefinition(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithStringAndTextDefinition",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:initWithStringAndTextDefinition",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3332,13 +3332,13 @@ static int lua_cocos2dx_LabelTTF_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3380,11 +3380,11 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) std::string arg1; double arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2); @@ -3398,13 +3398,13 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) double arg2; cocos2d::Size arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3); @@ -3419,15 +3419,15 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) cocos2d::Size arg3; cocos2d::TextHAlignment arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:initWithString"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); @@ -3443,24 +3443,24 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) cocos2d::TextHAlignment arg4; cocos2d::TextVAlignment arg5; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:initWithString"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:initWithString"); - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4, arg5); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithString",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:initWithString",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3500,7 +3500,7 @@ static int lua_cocos2dx_LabelTTF_setFontFillColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:setFontFillColor"); if(!ok) return 0; cobj->setFontFillColor(arg0); @@ -3511,15 +3511,15 @@ static int lua_cocos2dx_LabelTTF_setFontFillColor(lua_State* tolua_S) cocos2d::Color3B arg0; bool arg1; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:setFontFillColor"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.LabelTTF:setFontFillColor"); if(!ok) return 0; cobj->setFontFillColor(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontFillColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFontFillColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3563,7 +3563,7 @@ static int lua_cocos2dx_LabelTTF_getBlendFunc(lua_State* tolua_S) blendfunc_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBlendFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getBlendFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3604,9 +3604,9 @@ static int lua_cocos2dx_LabelTTF_enableStroke(lua_State* tolua_S) cocos2d::Color3B arg0; double arg1; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:enableStroke"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableStroke"); if(!ok) return 0; cobj->enableStroke(arg0, arg1); @@ -3618,17 +3618,17 @@ static int lua_cocos2dx_LabelTTF_enableStroke(lua_State* tolua_S) double arg1; bool arg2; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:enableStroke"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableStroke"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.LabelTTF:enableStroke"); if(!ok) return 0; cobj->enableStroke(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableStroke",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:enableStroke",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3672,7 +3672,7 @@ static int lua_cocos2dx_LabelTTF_getDimensions(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDimensions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getDimensions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3712,13 +3712,13 @@ static int lua_cocos2dx_LabelTTF_setVerticalAlignment(lua_State* tolua_S) { cocos2d::TextVAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelTTF:setVerticalAlignment"); if(!ok) return 0; cobj->setVerticalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVerticalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setVerticalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3758,13 +3758,13 @@ static int lua_cocos2dx_LabelTTF_setFontSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LabelTTF:setFontSize"); if(!ok) return 0; cobj->setFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3808,7 +3808,7 @@ static int lua_cocos2dx_LabelTTF_getVerticalAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVerticalAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getVerticalAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3852,7 +3852,7 @@ static int lua_cocos2dx_LabelTTF_getTextDefinition(lua_State* tolua_S) fontdefinition_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextDefinition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getTextDefinition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3898,7 +3898,7 @@ static int lua_cocos2dx_LabelTTF_setBlendFunc(lua_State* tolua_S) cobj->setBlendFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setBlendFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3942,7 +3942,7 @@ static int lua_cocos2dx_LabelTTF_getFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3982,13 +3982,13 @@ static int lua_cocos2dx_LabelTTF_setHorizontalAlignment(lua_State* tolua_S) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelTTF:setHorizontalAlignment"); if(!ok) return 0; cobj->setHorizontalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHorizontalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setHorizontalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4035,13 +4035,13 @@ static int lua_cocos2dx_LabelTTF_disableShadow(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:disableShadow"); if(!ok) return 0; cobj->disableShadow(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableShadow",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:disableShadow",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4088,13 +4088,13 @@ static int lua_cocos2dx_LabelTTF_disableStroke(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:disableStroke"); if(!ok) return 0; cobj->disableStroke(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableStroke",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:disableStroke",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4133,13 +4133,13 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4152,16 +4152,16 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4174,19 +4174,19 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::TextHAlignment arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4199,22 +4199,22 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 6) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::TextHAlignment arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::TextVAlignment arg5; - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4222,7 +4222,7 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LabelTTF:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4249,15 +4249,15 @@ static int lua_cocos2dx_LabelTTF_createWithFontDefinition(lua_State* tolua_S) { std::string arg0; cocos2d::FontDefinition arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:createWithFontDefinition"); + ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1, "cc.LabelTTF:createWithFontDefinition"); if(!ok) return 0; cocos2d::LabelTTF* ret = cocos2d::LabelTTF::createWithFontDefinition(arg0, arg1); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithFontDefinition",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.LabelTTF:createWithFontDefinition",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4289,7 +4289,7 @@ static int lua_cocos2dx_LabelTTF_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.LabelTTF"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LabelTTF",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:new",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4803,7 +4803,7 @@ static int lua_cocos2dx_Label_create_deprecated(lua_State* tolua_S) cocos2d::Size dimensions = cocos2d::Size::ZERO; if (lua_istable(tolua_S, 5)) { - luaval_to_size(tolua_S, 5, &dimensions); + luaval_to_size(tolua_S, 5, &dimensions, "cc.Label:create"); } TextHAlignment hAlignment = static_cast((int)tolua_tonumber(tolua_S, 6, 0)); TextVAlignment vAlignment = static_cast((int)tolua_tonumber(tolua_S, 7, 0)); diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp index 33cc751dd1..a759f0a274 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp @@ -35,7 +35,7 @@ static int lua_cocos2dx_experimental_TMXLayer_getTileGIDAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:getTileGIDAt"); if(!ok) return 0; int ret = cobj->getTileGIDAt(arg0); @@ -48,8 +48,8 @@ static int lua_cocos2dx_experimental_TMXLayer_getTileGIDAt(lua_State* tolua_S) cocos2d::Vec2 arg0; int arg1 = 0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_int32(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:getTileGIDAt"); + ok &= luaval_to_int32(tolua_S, 3, &arg1, "ccexp.TMXLayer:getTileGIDAt"); if(!ok) return 0; @@ -59,7 +59,7 @@ static int lua_cocos2dx_experimental_TMXLayer_getTileGIDAt(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)arg1); return 2; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileGIDAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getTileGIDAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp index 9b144fa828..a937cada2c 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp @@ -54,7 +54,7 @@ static int lua_cocos2dx_experimental_video_VideoPlayer_addEventListener(lua_Stat return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "addEventListener",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.VideoPlayer:addEventListener",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp index f2ffb17b4d..f8842796bf 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp @@ -156,12 +156,12 @@ static int tolua_cocos2d_ScrollView_registerScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptHandler' function of ScrollView has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s function of ScrollView has wrong number of arguments: %d, was expecting %d\n", "cc.ScrollView:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_ScrollView_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -201,12 +201,12 @@ static int tolua_cocos2d_ScrollView_unregisterScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptHandler' function of ScrollView has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of ScrollView has wrong number of arguments: %d, was expecting %d\n", "cc.ScrollView:unregisterScriptHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_ScrollView_unregisterScriptHandler'.",&tolua_err); return 0; #endif } @@ -277,12 +277,12 @@ static int tolua_cocos2d_Control_registerControlEventHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerControlEventHandler' function of Control has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s function of Control has wrong number of arguments: %d, was expecting %d\n", "cc.Control:registerControlEventHandler", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerControlEventHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Control_registerControlEventHandler'.",&tolua_err); return 0; #endif } @@ -330,12 +330,12 @@ static int tolua_cocos2d_control_unregisterControlEventHandler(lua_State* tolua_ return 0; } - CCLOG("'unregisterControlEventHandler' function of Control has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of Control has wrong number of arguments: %d, was expecting %d\n", "cc.Control:unregisterControlEventHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterControlEventHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_control_unregisterControlEventHandler'.",&tolua_err); return 0; #endif } @@ -393,12 +393,12 @@ static int tolua_cocos2d_EditBox_registerScriptEditBoxHandler(lua_State* tolua_S return 0; } - CCLOG("'registerScriptEditBoxHandler' function of EditBox has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of EditBox has wrong number of arguments: %d, was expecting %d\n", "cc.EditBox:registerScriptEditBoxHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptEditBoxHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_EditBox_registerScriptEditBoxHandler'.",&tolua_err); return 0; #endif @@ -435,12 +435,12 @@ static int tolua_cocos2d_EditBox_unregisterScriptEditBoxHandler(lua_State* tolua return 0; } - CCLOG("'unregisterScriptEditBoxHandler' function of EditBox has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s function of EditBox has wrong number of arguments: %d, was expecting %d\n", "cc.EditBox:unregisterScriptEditBoxHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptEditBoxHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_EditBox_unregisterScriptEditBoxHandler'.",&tolua_err); return 0; #endif } @@ -484,12 +484,12 @@ static int tolua_cocos2d_CCBProxy_create(lua_State* tolua_S) return 1; } - CCLOG("'create' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:create", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_create'.",&tolua_err); return 0; #endif } @@ -528,12 +528,12 @@ static int tolua_cocos2d_CCBProxy_createCCBReader(lua_State* tolua_S) return 1; } - CCLOG("'createCCBReader' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:createCCBReader", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'createCCBReader'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_createCCBReader'.",&tolua_err); return 0; #endif } @@ -588,12 +588,12 @@ static int tolua_cocos2d_CCBProxy_readCCBFromFile(lua_State* tolua_S) return 1; } - CCLOG("'readCCBFromFile' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBReader:readCCBFromFile", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'readCCBFromFile'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_readCCBFromFile'.",&tolua_err); return 0; #endif } @@ -635,12 +635,12 @@ static int tolua_cocos2d_CCBProxy_getNodeTypeName(lua_State* tolua_S) return 1; } - CCLOG("'getNodeTypeName' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:getNodeTypeName", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getNodeTypeName'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_getNodeTypeName'.",&tolua_err); return 0; #endif } @@ -685,12 +685,12 @@ static int tolua_cocos2d_CCBProxy_setCallback(lua_State* tolua_S) return 0; } - CCLOG("'setCallback' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:setCallback", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setCallback'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_setCallback'.",&tolua_err); return 0; #endif } @@ -743,7 +743,7 @@ static int tolua_cocos2d_CCBReader_load(lua_State* tolua_S) { const char* fileName = nullptr; std::string fileName_tmp = ""; - ok &= luaval_to_std_string(tolua_S, 2, &fileName_tmp); + ok &= luaval_to_std_string(tolua_S, 2, &fileName_tmp, "cc.CCBReader:load"); fileName = fileName_tmp.c_str(); if (!ok) return 0; @@ -773,7 +773,7 @@ static int tolua_cocos2d_CCBReader_load(lua_State* tolua_S) } Size size; - ok &= luaval_to_size(tolua_S, 4, &size); + ok &= luaval_to_size(tolua_S, 4, &size, "cc.CCBReader:load"); if (!ok) return 0; @@ -785,12 +785,12 @@ static int tolua_cocos2d_CCBReader_load(lua_State* tolua_S) } - CCLOG("'load' function of CCBReader has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBReader:load",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'load'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBReader_load'.",&tolua_err); return 0; #endif } @@ -852,12 +852,12 @@ static int tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed(lua_ return 0; } - CCLOG("'setCallFuncForLuaCallbackNamed' function of CCBAnimationManager has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBAnimationManager:setCallFuncForLuaCallbackNamed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setCallFuncForLuaCallbackNamed'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed'.",&tolua_err); return 0; #endif } @@ -968,12 +968,12 @@ static int lua_cocos2dx_AssetsManager_setDelegate(lua_State* L) return 0; } - CCLOG("'setDelegate' function of AssetsManager has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.AssetsManager:setDelegate", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setDelegate'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_AssetsManager_setDelegate'.",&tolua_err); return 0; #endif } @@ -1302,7 +1302,7 @@ static int lua_cocos2dx_TableView_create(lua_State* L) { LUA_TableViewDataSource* dataSource = new LUA_TableViewDataSource(); Size size; - ok &= luaval_to_size(L, 2, &size); + ok &= luaval_to_size(L, 2, &size, "cc.TableView:create"); TableView* ret = nullptr; @@ -1358,7 +1358,7 @@ static int lua_cocos2d_TableView_registerScriptHandler(lua_State* L) #if COCOS2D_DEBUG >= 1 tolua_Error tolua_err; - if (!tolua_isusertype(L,1,"cc.TableView",0,&tolua_err)) goto tolua_lerror; + if (!tolua_isusertype(L,1,"",0,&tolua_err)) goto tolua_lerror; #endif self = static_cast(tolua_tousertype(L,1,0)); @@ -1386,12 +1386,12 @@ static int lua_cocos2d_TableView_registerScriptHandler(lua_State* L) return 0; } - CCLOG("'registerScriptHandler' function of TableView has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.TableView:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(L,"#ferror in function 'tolua_cocos2d_TableView_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -1431,12 +1431,12 @@ static int lua_cocos2d_TableView_unregisterScriptHandler(lua_State* L) return 0; } - CCLOG("'unregisterScriptHandler' function of TableView has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.TableView:unregisterScriptHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'unregisterScriptHandler'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2d_TableView_unregisterScriptHandler'.",&tolua_err); return 0; #endif } diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp index d8daf44b63..9b1c757bf4 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp @@ -106,7 +106,7 @@ static int tolua_cocos2d_MenuItemImage_create(lua_State* tolua_S) } } while (0); - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemImage:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -147,12 +147,12 @@ static int tolua_cocos2d_MenuItemLabel_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemLabel:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemImage_create'.",&tolua_err); return 0; #endif } @@ -187,12 +187,12 @@ static int tolua_cocos2d_MenuItemFont_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemFont:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemImage_create'.",&tolua_err); return 0; #endif } @@ -241,12 +241,12 @@ static int tolua_cocos2d_MenuItemSprite_create(lua_State* tolua_S) return 1; } - CCLOG("create has wrong number of arguments: %d, was expecting %d\n", argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemSprite:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemImage_create'.",&tolua_err); return 0; #endif } @@ -391,7 +391,7 @@ static int tolua_cocos2dx_Menu_alignItemsInColumns(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'alignItemsInColumns'.\n",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_Menu_alignItemsInColumns'.\n",&tolua_err); #endif return 0; } @@ -436,12 +436,12 @@ static int tolua_cocos2d_MenuItemToggle_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemToggle:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemToggle_create'.",&tolua_err); return 0; #endif } @@ -477,12 +477,12 @@ static int tolua_cocos2d_MenuItem_registerScriptTapHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptTapHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItem:registerScriptTapHandler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptTapHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItem_registerScriptTapHandler'.",&tolua_err); return 0; #endif } @@ -517,12 +517,12 @@ static int tolua_cocos2d_MenuItem_unregisterScriptTapHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptTapHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItem:unregisterScriptTapHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptTapHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItem_unregisterScriptTapHandler'.",&tolua_err); return 0; #endif } @@ -677,11 +677,11 @@ static int lua_cocos2dx_Layer_setTouchEnabled(lua_State* L) return 0; } - CCLOG("'setTouchEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setTouchEnabled", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setTouchEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setTouchEnabled'.",&tolua_err); return 0; #endif @@ -724,11 +724,11 @@ static int lua_cocos2dx_Layer_isTouchEnabled(lua_State* L) return 0; } - CCLOG("'isTouchEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isTouchEnabled", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isTouchEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isTouchEnabled'.",&tolua_err); return 0; #endif @@ -791,12 +791,12 @@ static int lua_cocos2dx_Layer_setTouchMode(lua_State* L) return 0; } - CCLOG("'setTouchMode' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setTouchMode", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setTouchMode'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setTouchMode'.",&tolua_err); return 0; #endif } @@ -839,12 +839,12 @@ static int lua_cocos2dx_Layer_getTouchMode(lua_State* L) return 0; } - CCLOG("'getTouchMode' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:getTouchMode", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'getTouchMode'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_getTouchMode'.",&tolua_err); return 0; #endif } @@ -906,12 +906,12 @@ static int lua_cocos2dx_Layer_setSwallowsTouches(lua_State* L) return 0; } - CCLOG("'setSwallowsTouches' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setSwallowsTouches", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setSwallowsTouches'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setSwallowsTouches'.",&tolua_err); return 0; #endif } @@ -952,12 +952,12 @@ static int lua_cocos2dx_Layer_isSwallowsTouches(lua_State* L) return 0; } - CCLOG("'isSwallowsTouches' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isSwallowsTouches", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isSwallowsTouches'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isSwallowsTouches'.",&tolua_err); return 0; #endif } @@ -1024,12 +1024,12 @@ static int lua_cocos2dx_Layer_setKeyboardEnabled(lua_State* L) return 0; } - CCLOG("'setKeyboardEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setKeyboardEnabled", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setKeyboardEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setKeyboardEnabled'.",&tolua_err); return 0; #endif } @@ -1071,12 +1071,12 @@ static int lua_cocos2dx_Layer_isKeyboardEnabled(lua_State* L) return 0; } - CCLOG("'isKeyboardEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isKeyboardEnabled", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isKeyboardEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isKeyboardEnabled'.",&tolua_err); return 0; #endif } @@ -1144,12 +1144,12 @@ static int lua_cocos2dx_Layer_setAccelerometerEnabled(lua_State* L) return 0; } - CCLOG("'setAccelerometerEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setAccelerometerEnabled", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setAccelerometerEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setAccelerometerEnabled'.",&tolua_err); return 0; #endif } @@ -1193,12 +1193,12 @@ static int lua_cocos2dx_Layer_isAccelerometerEnabled(lua_State* L) } - CCLOG("'isAccelerometerEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isAccelerometerEnabled", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isAccelerometerEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isAccelerometerEnabled'.",&tolua_err); return 0; #endif } @@ -1238,12 +1238,12 @@ static int lua_cocos2dx_Layer_setAccelerometerInterval(lua_State* L) return 0; } - CCLOG("'setAccelerometerInterval' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setAccelerometerInterval",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setAccelerometerInterval'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setAccelerometerInterval'.",&tolua_err); return 0; #endif } @@ -1368,12 +1368,12 @@ static int tolua_cocos2d_Layer_registerScriptTouchHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptTouchHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:registerScriptTouchHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptTouchHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_registerScriptTouchHandler'.",&tolua_err); return 0; #endif } @@ -1421,12 +1421,12 @@ static int tolua_cocos2d_Layer_unregisterScriptTouchHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptTouchHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:unregisterScriptTouchHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptTapHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_unregisterScriptTouchHandler'.",&tolua_err); return 0; #endif } @@ -1468,12 +1468,12 @@ static int tolua_cocos2d_Layer_registerScriptKeypadHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptKeypadHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:registerScriptKeypadHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptKeypadHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_registerScriptKeypadHandler'.",&tolua_err); return 0; #endif } @@ -1521,12 +1521,12 @@ static int tolua_cocos2d_Layer_unregisterScriptKeypadHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptKeypadHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:unregisterScriptKeypadHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptKeypadHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_unregisterScriptKeypadHandler'.",&tolua_err); return 0; #endif } @@ -1567,11 +1567,11 @@ static int tolua_cocos2d_Layer_registerScriptAccelerateHandler(lua_State* tolua_ return 0; } - CCLOG("'registerScriptAccelerateHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:registerScriptAccelerateHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptAccelerateHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_registerScriptAccelerateHandler'.",&tolua_err); return 0; #endif } @@ -1618,12 +1618,12 @@ static int tolua_cocos2d_Layer_unregisterScriptAccelerateHandler(lua_State* tolu return 0; } - CCLOG("'unregisterScriptAccelerateHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:unregisterScriptAccelerateHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptAccelerateHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_unregisterScriptAccelerateHandler'.",&tolua_err); return 0; #endif } @@ -1668,12 +1668,12 @@ static int tolua_cocos2d_Scheduler_scheduleScriptFunc(lua_State* tolua_S) return 1; } - CCLOG("'scheduleScriptFunc' has wrong number of arguments: %d, was expecting %d\n", argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Scheduler:scheduleScriptFunc", argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'scheduleScriptFunc'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Scheduler_scheduleScriptFunc'.",&tolua_err); return 0; #endif } @@ -1715,12 +1715,12 @@ static int tolua_cocos2d_Scheduler_unscheduleScriptEntry(lua_State* tolua_S) return 0; } - CCLOG("'unscheduleScriptEntry' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Scheduler:unscheduleScriptEntry",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unscheduleScriptEntry'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Scheduler_unscheduleScriptEntry'.",&tolua_err); return 0; #endif } @@ -1745,7 +1745,7 @@ int tolua_cocos2d_Sequence_create(lua_State* tolua_S) if (1 == argc && tolua_istable(tolua_S, 2, 0, &tolua_err)) { - luaval_to_ccvector(tolua_S, 2, &array); + luaval_to_ccvector(tolua_S, 2, &array, "cc.Sequence:create"); } else { @@ -1773,12 +1773,12 @@ int tolua_cocos2d_Sequence_create(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.Sequence"); return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Sequence:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Sequence_create'.",&tolua_err); return 0; #endif } @@ -1864,12 +1864,12 @@ static int tolua_cocos2d_CallFunc_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CallFunc:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CallFunc_create'.",&tolua_err); return 0; #endif @@ -1911,12 +1911,12 @@ static int tolua_cocos2d_Node_registerScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Node:registerScriptHandler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -1950,12 +1950,12 @@ static int tolua_cocos2d_Node_unregisterScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Node:unregisterScriptHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_unregisterScriptHandler'.",&tolua_err); return 0; #endif } @@ -1993,19 +1993,19 @@ static int tolua_Cocos2d_Node_scheduleUpdateWithPriorityLua(lua_State* tolua_S) LUA_FUNCTION handler = toluafix_ref_function(tolua_S,2,0); int priority = 0; - if (luaval_to_int32(tolua_S, 3, &priority)) + if (luaval_to_int32(tolua_S, 3, &priority, "cc.Node:scheduleUpdateWithPriorityLua")) { self->scheduleUpdateWithPriorityLua(handler,priority); } return 0; } - CCLOG("'scheduleUpdateWithPriorityLua' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n","cc.Node:scheduleUpdateWithPriorityLua", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'scheduleUpdateWithPriorityLua'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_Cocos2d_Node_scheduleUpdateWithPriorityLua'.",&tolua_err); return 0; #endif } @@ -2039,12 +2039,12 @@ static int tolua_cocos2d_Node_unscheduleUpdate(lua_State* tolua_S) return 0; } - CCLOG("'unscheduleUpdate' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Node:unscheduleUpdate", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unscheduleUpdate'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_unscheduleUpdate'.",&tolua_err); return 0; #endif } @@ -2073,7 +2073,7 @@ int tolua_cocos2d_Node_setContentSize(lua_State* tolua_S) if (1 == argc) { cocos2d::Size size; - ok &= luaval_to_size(tolua_S, 2, &size); + ok &= luaval_to_size(tolua_S, 2, &size, "cc.Node:setContentSize"); if (!ok) return 0; @@ -2083,13 +2083,13 @@ int tolua_cocos2d_Node_setContentSize(lua_State* tolua_S) else if(2 == argc) { double width; - ok &= luaval_to_number(tolua_S, 2,&width); + ok &= luaval_to_number(tolua_S, 2,&width, "cc.Node:setContentSize"); if (!ok) return 0; double height; - ok &= luaval_to_number(tolua_S, 3,&height); + ok &= luaval_to_number(tolua_S, 3,&height, "cc.Node:setContentSize"); if (!ok) return 0; @@ -2098,7 +2098,7 @@ int tolua_cocos2d_Node_setContentSize(lua_State* tolua_S) return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContentSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setContentSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2131,7 +2131,7 @@ int tolua_cocos2d_Node_setAnchorPoint(lua_State* tolua_S) if (1 == argc) { cocos2d::Vec2 pt; - ok &= luaval_to_vec2(tolua_S, 2, &pt); + ok &= luaval_to_vec2(tolua_S, 2, &pt, "cc.Node:setAnchorPoint"); if (!ok) return 0; @@ -2141,13 +2141,13 @@ int tolua_cocos2d_Node_setAnchorPoint(lua_State* tolua_S) else if(2 == argc) { double x; - ok &= luaval_to_number(tolua_S, 2,&x); + ok &= luaval_to_number(tolua_S, 2,&x, "cc.Node:setAnchorPoint"); if (!ok) return 0; double y; - ok &= luaval_to_number(tolua_S, 3,&y); + ok &= luaval_to_number(tolua_S, 3,&y, "cc.Node:setAnchorPoint"); if (!ok) return 0; @@ -2156,7 +2156,7 @@ int tolua_cocos2d_Node_setAnchorPoint(lua_State* tolua_S) return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchorPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setAnchorPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2205,12 +2205,12 @@ static int tolua_cocos2d_Node_getPosition(lua_State* tolua_S) return 2; } - CCLOG("'getPosition' function in Node has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s function in Node has wrong number of arguments: %d, was expecting %d\n", "cc.Node:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getPosition'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_getPosition'.",&tolua_err); return 0; #endif } @@ -2296,7 +2296,7 @@ static int tolua_cocos2d_Spawn_create(lua_State* tolua_S) if (1 == argc && tolua_istable(tolua_S, 2, 0, &tolua_err)) { - luaval_to_ccvector(tolua_S, 2, &array); + luaval_to_ccvector(tolua_S, 2, &array, "cc.Spawn:create"); } else { @@ -2323,12 +2323,12 @@ static int tolua_cocos2d_Spawn_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Spawn:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Spawn_create'.",&tolua_err); return 0; #endif } @@ -2351,18 +2351,18 @@ int lua_cocos2d_CardinalSplineBy_create(lua_State* tolua_S) if (argc == 3) { double dur = 0.0; - ok &= luaval_to_number(tolua_S, 2, &dur); + ok &= luaval_to_number(tolua_S, 2, &dur, "cc.CardinalSplineBy:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.CardinalSplineBy:create"); if (!ok) return 0; double ten = 0.0; - ok &= luaval_to_number(tolua_S, 4, &ten); + ok &= luaval_to_number(tolua_S, 4, &ten, "cc.CardinalSplineBy:create"); if (!ok) { CC_SAFE_DELETE_ARRAY(arr); @@ -2395,12 +2395,12 @@ int lua_cocos2d_CardinalSplineBy_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CardinalSplineBy:create", argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2d_CardinalSplineBy_create'.",&tolua_err); return 0; #endif } @@ -2423,13 +2423,13 @@ int tolua_cocos2d_CatmullRomBy_create(lua_State* tolua_S) if (argc == 2) { double dur = 0.0; - ok &= luaval_to_number(tolua_S, 2, &dur); + ok &= luaval_to_number(tolua_S, 2, &dur, "cc.CatmullRomBy:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.CatmullRomBy:create"); if (!ok) return 0; @@ -2459,12 +2459,12 @@ int tolua_cocos2d_CatmullRomBy_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CatmullRomBy:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CatmullRomBy_create'.",&tolua_err); return 0; #endif } @@ -2487,13 +2487,13 @@ int tolua_cocos2d_CatmullRomTo_create(lua_State* tolua_S) if (argc == 2) { double dur = 0.0; - ok &= luaval_to_number(tolua_S, 2, &dur); + ok &= luaval_to_number(tolua_S, 2, &dur, "cc.CatmullRomTo:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.CatmullRomTo:create"); if (!ok) return 0; @@ -2523,12 +2523,12 @@ int tolua_cocos2d_CatmullRomTo_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CatmullRomTo:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CatmullRomTo_create'.",&tolua_err); return 0; #endif } @@ -2551,13 +2551,13 @@ int tolua_cocos2d_BezierBy_create(lua_State* tolua_S) if (argc == 2) { double t = 0.0; - ok &= luaval_to_number(tolua_S, 2, &t); + ok &= luaval_to_number(tolua_S, 2, &t, "cc.BezierBy:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.BezierBy:create"); if (!ok) return 0; @@ -2583,12 +2583,12 @@ int tolua_cocos2d_BezierBy_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.BezierBy:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_BezierBy_create'.",&tolua_err); return 0; #endif } @@ -2611,13 +2611,13 @@ int tolua_cocos2d_BezierTo_create(lua_State* tolua_S) if (argc == 2) { double t = 0.0; - ok &= luaval_to_number(tolua_S, 2, &t); + ok &= luaval_to_number(tolua_S, 2, &t, "cc.BezierTo:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.BezierTo:create"); if (!ok) return 0; @@ -2643,12 +2643,12 @@ int tolua_cocos2d_BezierTo_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.BezierTo:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_BezierTo_create'.",&tolua_err); return 0; #endif } @@ -2707,7 +2707,7 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) #endif } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawNode:drawPolygon")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -2717,7 +2717,7 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) } Color4F fillColor; - if (!luaval_to_color4f(tolua_S, 4, &fillColor)) + if (!luaval_to_color4f(tolua_S, 4, &fillColor, "cc.DrawNode:drawPolygon")) { CC_SAFE_DELETE_ARRAY(points); return 0; @@ -2726,7 +2726,7 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) float borderWidth = (float)tolua_tonumber(tolua_S, 5, 0); Color4F borderColor; - if (!luaval_to_color4f(tolua_S, 6, &borderColor)) + if (!luaval_to_color4f(tolua_S, 6, &borderColor, "cc.DrawNode:drawPolygon")) { CC_SAFE_DELETE_ARRAY(points); return 0; @@ -2738,12 +2738,12 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) } } - CCLOG("'drawPolygon' has wrong number of arguments: %d, was expecting %d\n", argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.DrawNode:drawPolygon", argc, 5); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'drawPolygon'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_DrawNode_drawPolygon'.",&tolua_err); return 0; #endif } @@ -2769,10 +2769,10 @@ static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S,const char* className) if (2 == argc) { GLenum src, dst; - if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src)) + if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src, StringUtils::format("%s%s",className, ":setBlendFunc").c_str())) return 0; - if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst)) + if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst, StringUtils::format("%s%s",className, ":setBlendFunc").c_str())) return 0; BlendFunc blendFunc = {src, dst}; @@ -2786,7 +2786,7 @@ static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S,const char* className) #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setBlendFunc'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_setBlendFunc'.",&tolua_err); return 0; #endif } @@ -2863,12 +2863,12 @@ static int tolua_cocos2dx_LayerMultiplex_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.LayerMultiplex:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_LayerMultiplex_create'.",&tolua_err); return 0; #endif } @@ -2902,7 +2902,7 @@ static int tolua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S) if (1 == argc) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.FileUtils:getStringFromFile"); arg0 = arg0_tmp.c_str(); if (ok) { std::string fullPathName = FileUtils::getInstance()->fullPathForFilename(arg0); @@ -2916,12 +2916,12 @@ static int tolua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S) } } - CCLOG("'getStringFromFile' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.FileUtils:getStringFromFile", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getStringFromFile'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_FileUtils_getStringFromFile'.",&tolua_err); return 0; #endif } @@ -2947,12 +2947,12 @@ static int tolua_cocos2dx_UserDefault_getInstance(lua_State* tolua_S) return 1; } - CCLOG("'getInstance' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.UserDefault:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getInstance'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_UserDefault_getInstance'.",&tolua_err); return 0; #endif } @@ -2975,8 +2975,8 @@ static int tolua_cocos2dx_GLProgram_create(lua_State* tolua_S) if(2 == argc) { const char *arg0, *arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.GLProgram:create"); arg0 = arg0_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.GLProgram:create"); arg1 = arg1_tmp.c_str(); GLProgram* tolua_ret = new GLProgram(); if (nullptr == tolua_ret) @@ -2991,12 +2991,12 @@ static int tolua_cocos2dx_GLProgram_create(lua_State* tolua_S) } - CCLOG("'create' function of GLProgram wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s wrong number of arguments: %d, was expecting %d\n", "cc.GLProgram:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_GLProgram_create'.",&tolua_err); return 0; #endif } @@ -3032,12 +3032,12 @@ static int tolua_cocos2d_GLProgram_getProgram(lua_State* tolua_S) return 1; } - CCLOG("'getProgram' function of GLProgram wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.GLProgram:getProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getProgram'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_GLProgram_getProgram'.",&tolua_err); return 0; #endif } @@ -3137,12 +3137,12 @@ static int tolua_cocos2dx_GLProgram_setUniformLocationF32(lua_State* tolua_S) } } - CCLOG("'setUniformLocationF32' function of GLProgram wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.GLProgram:setUniformLocationF32",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setUniformLocationF32'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_GLProgram_getProgram'.",&tolua_err); return 0; #endif } @@ -3178,7 +3178,7 @@ static int lua_cocos2dx_GLProgram_getUniform(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:getUniform"); if(!ok) return 0; cocos2d::Uniform* ret = cobj->getUniform(arg0); @@ -3192,7 +3192,7 @@ static int lua_cocos2dx_GLProgram_getUniform(lua_State* tolua_S) } return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUniform",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getUniform:getUniform",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3235,9 +3235,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix2fv(lua_State* tolua_S) GLfloat* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWithMatrix2fv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWithMatrix2fv"); if(!ok) { @@ -3265,7 +3265,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix2fv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWithMatrix2fv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWithMatrix2fv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3308,9 +3308,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix3fv(lua_State* tolua_S) GLfloat* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWithMatrix3fv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWithMatrix3fv"); if(!ok) { @@ -3339,7 +3339,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix3fv(lua_State* tolua_S) return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWithMatrix3fv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWithMatrix3fv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3382,9 +3382,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix4fv(lua_State* tolua_S) GLfloat* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWithMatrix4fv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWithMatrix4fv"); if(!ok) { @@ -3413,7 +3413,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix4fv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWithMatrix4fv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWithMatrix4fv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3455,9 +3455,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith3iv(lua_State* tolua_S) GLint* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWith3iv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWith3iv"); if(!ok) { CCLOG("Parse params error in the lua_cocos2dx_GLProgram_setUniformLocationWith3iv"); @@ -3485,7 +3485,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith3iv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith3iv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith3iv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3528,9 +3528,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith4iv(lua_State* tolua_S) GLint* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWith4iv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWith4iv"); if(!ok) { @@ -3557,7 +3557,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith4iv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith4iv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith4iv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3600,9 +3600,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith2iv(lua_State* tolua_S) GLint* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(GLint *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(GLint *)&arg0, "cc.GLProgram:setUniformLocationWith2iv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWith2iv"); if(!ok) { @@ -3626,7 +3626,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith2iv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith2iv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith2iv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3667,7 +3667,7 @@ int lua_cocos2dx_GLProgram_getVertexAttrib(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:getVertexAttrib"); if(!ok) return 0; cocos2d::VertexAttrib* ret = cobj->getVertexAttrib(arg0); @@ -3681,7 +3681,7 @@ int lua_cocos2dx_GLProgram_getVertexAttrib(lua_State* tolua_S) } return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexAttrib",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getVertexAttrib",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3831,7 +3831,7 @@ static int tolua_cocos2dx_SpriteBatchNode_getDescendants(lua_State* tolua_S) return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescendants",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:getDescendants",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4371,12 +4371,12 @@ static int tolua_cocos2dx_LuaEventListenerAcceleration_create(lua_State* tolua_S return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerAcceleration:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_LuaEventListenerAcceleration_create'.",&tolua_err); return 0; #endif } @@ -4415,12 +4415,12 @@ static int tolua_cocos2d_LuaEventListenerCustom_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerCustom:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_LuaEventListenerCustom_create'.",&tolua_err); return 0; #endif } @@ -4473,12 +4473,12 @@ static int tolua_cocos2dx_EventListenerKeyboard_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerKeyboard:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerKeyboard_create'.",&tolua_err); return 0; #endif } @@ -4558,12 +4558,12 @@ static int tolua_cocos2dx_EventListenerKeyboard_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerKeyboard:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerKeyboard_clone'.",&tolua_err); return 0; #endif } @@ -4630,12 +4630,12 @@ static int tolua_cocos2dx_EventListenerKeyboard_registerScriptHandler(lua_State* return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerKeyboard:registerScriptHandler", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerKeyboard_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -4679,12 +4679,12 @@ static int tolua_cocos2dx_EventListenerTouchOneByOne_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchOneByOne:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchOneByOne_create'.",&tolua_err); return 0; #endif } @@ -4785,12 +4785,12 @@ static int tolua_cocos2dx_EventListenerTouchOneByOne_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchOneByOne:create", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchOneByOne_clone'.",&tolua_err); return 0; #endif } @@ -4879,12 +4879,12 @@ static int tolua_cocos2dx_EventListenerTouchOneByOne_registerScriptHandler(lua_S return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchOneByOne:registerScriptHandler", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchOneByOne_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -4928,12 +4928,12 @@ static int tolua_cocos2dx_EventListenerTouchAllAtOnce_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchAllAtOnce:registerScriptHandler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchAllAtOnce_create'.",&tolua_err); return 0; #endif } @@ -5033,12 +5033,12 @@ static int tolua_cocos2dx_EventListenerTouchAllAtOnce_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchAllAtOnce:clone", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchAllAtOnce_clone'.",&tolua_err); return 0; #endif } @@ -5127,12 +5127,12 @@ static int tolua_cocos2dx_EventListenerTouchAllAtOnce_registerScriptHandler(lua_ return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchAllAtOnce:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchAllAtOnce_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -5176,12 +5176,12 @@ static int tolua_cocos2dx_EventListenerMouse_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerMouse:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerMouse_create'.",&tolua_err); return 0; #endif } @@ -5281,12 +5281,12 @@ static int tolua_cocos2dx_EventListenerMouse_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerMouse:clone", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerMouse_clone'.",&tolua_err); return 0; #endif } @@ -5377,12 +5377,12 @@ static int tolua_cocos2dx_EventListenerMouse_registerScriptHandler(lua_State* to return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerMouse:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerMouse_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -5433,7 +5433,7 @@ static int tolua_cocos2dx_ActionCamera_reverse(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, reverse->_ID, &(reverse->_luaID), (void*)(reverse),"cc.ActionCamera"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reverse",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:reverse",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5486,7 +5486,7 @@ static int tolua_cocos2dx_GridAction_reverse(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, reverse->_ID, &(reverse->_luaID), (void*)(reverse),"cc.GridAction"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reverse",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridAction:reverse",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5536,11 +5536,11 @@ static int lua_cocos2dx_Label_createWithTTF00(lua_State* L) TTFConfig ttfConfig(""); std::string text = ""; - ok &= luaval_to_ttfconfig(L, 2, &ttfConfig); + ok &= luaval_to_ttfconfig(L, 2, &ttfConfig, "cc.Label:createWithTTF"); if (!ok) return 0; - ok &= luaval_to_std_string(L, 3, &text); + ok &= luaval_to_std_string(L, 3, &text, "cc.Label:createWithTTF"); if (!ok) return 0; @@ -5553,7 +5553,7 @@ static int lua_cocos2dx_Label_createWithTTF00(lua_State* L) toluafix_pushusertype_ccobject(L,ID, luaID, (void*)ret,"cc.Label"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Label:createWithTTF",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5593,7 +5593,7 @@ static int lua_cocos2dx_Label_createWithTTF01(lua_State* L) cocos2d::Size dimensions = cocos2d::Size::ZERO; if (lua_istable(L, 5)) { - luaval_to_size(L, 5, &dimensions); + luaval_to_size(L, 5, &dimensions, "cc.Label:createWithTTF"); } TextHAlignment hAlignment = static_cast((int)tolua_tonumber(L, 6, 0)); TextVAlignment vAlignment = static_cast((int)tolua_tonumber(L, 7, 0)); @@ -5648,7 +5648,7 @@ static int lua_cocos2dx_TMXTiledMap_getPropertiesForGID(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXTiledMap:getPropertiesForGID"); if (!ok) return 0; @@ -5656,7 +5656,7 @@ static int lua_cocos2dx_TMXTiledMap_getPropertiesForGID(lua_State* tolua_S) ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPropertiesForGID",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getPropertiesForGID",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5704,9 +5704,9 @@ static int lua_cocos2dx_Console_send(lua_State* tolua_S) if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,&arg0); + ok &= luaval_to_int32(tolua_S, 2,&arg0, "cc.Console:send"); std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Console:send"); if(!ok) return 0; @@ -5714,7 +5714,7 @@ static int lua_cocos2dx_Console_send(lua_State* tolua_S) return 0; } ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "send",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Console:send",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5750,7 +5750,7 @@ static int lua_cocos2dx_Console_wait(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,&arg0); + ok &= luaval_to_int32(tolua_S, 2,&arg0, "cc.Console:wait"); if(!ok) return 0; @@ -5759,7 +5759,7 @@ static int lua_cocos2dx_Console_wait(lua_State* tolua_S) return 0; } ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "wait",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Console:wait",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5796,7 +5796,7 @@ static int lua_cocos2dx_Console_addCommand(lua_State* tolua_S) if (ok && argc == 2) { ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.Console:addCommand"); // std::string name = std::string(arg0["name"].asString()); std::string help = std::string(arg0["help"].asString()); @@ -5828,7 +5828,7 @@ static int lua_cocos2dx_Console_addCommand(lua_State* tolua_S) } return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "addCommand",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Console:addCommand",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5886,17 +5886,17 @@ static int lua_cocos2dx_GLProgramState_setVertexAttribPointer(lua_State* tolua_S int arg4; int arg5; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_boolean(tolua_S, 5, &arg3); + ok &= luaval_to_boolean(tolua_S, 5, &arg3, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 7, (int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7, (int *)&arg5, "cc.GLProgramState:setVertexAttribPointer"); if(!ok) return 0; @@ -5914,17 +5914,17 @@ static int lua_cocos2dx_GLProgramState_setVertexAttribPointer(lua_State* tolua_S int arg6; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_boolean(tolua_S, 5, &arg3); + ok &= luaval_to_boolean(tolua_S, 5, &arg3, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 8, (int *)&arg6); + ok &= luaval_to_int32(tolua_S, 8, (int *)&arg6, "cc.GLProgramState:setVertexAttribPointer"); size_t len = lua_objlen(tolua_S, 7); @@ -5963,7 +5963,7 @@ static int lua_cocos2dx_GLProgramState_setVertexAttribPointer(lua_State* tolua_S return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVertexAttribPointer",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setVertexAttribPointer",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 @@ -6033,7 +6033,7 @@ static int lua_cocos2dx_OrbitCamera_sphericalRadius(lua_State* tolua_S) return 3; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sphericalRadius",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.OrbitCamera:sphericalRadius",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -6085,7 +6085,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:getTileGIDAt"); if(!ok) return 0; unsigned int ret = cobj->getTileGIDAt(arg0); @@ -6098,8 +6098,8 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) cocos2d::Vec2 arg0; int arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_int32(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:getTileGIDAt"); + ok &= luaval_to_int32(tolua_S, 3, &arg1, "cc.TMXLayer:getTileGIDAt"); if(!ok) return 0; @@ -6109,7 +6109,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)arg1); return 2; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileGIDAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getTileGIDAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6177,7 +6177,7 @@ int lua_cocos2dx_TMXLayer_setTiles(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTiles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setTiles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6226,12 +6226,12 @@ static int tolua_cocos2dx_EventListenerFocus_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerFocus:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerFocus_create'.",&tolua_err); return 0; #endif } @@ -6297,12 +6297,12 @@ static int tolua_cocos2dx_EventListenerFocus_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerFocus:clone", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerFocus_clone'.",&tolua_err); return 0; #endif } @@ -6353,12 +6353,12 @@ static int tolua_cocos2dx_EventListenerFocus_registerScriptHandler(lua_State* to return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerFocus:registerScriptHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerFocus_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -6416,7 +6416,7 @@ int lua_cocos2dx_Application_isIOS64bit(lua_State* tolua_S) tolua_pushboolean(tolua_S, isIOS64bit); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isIOS64bit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:isIOS64bit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6485,11 +6485,11 @@ static int lua_cocos2dx_TextureCache_addImageAsync(lua_State* tolua_S) return 0; } - CCLOG("'addImageAsync' function of TextureCache has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of TextureCache has wrong number of arguments: %d, was expecting %d\n", "cc.TextureCache:addImageAsync", argc, 1); #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'addImageAsync'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_addImageAsync'.",&tolua_err); #endif return 0; } @@ -6589,7 +6589,7 @@ static int tolua_cocos2d_utils_captureScreen(lua_State* tolua_S) } #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'captureScreen'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_utils_captureScreen'.",&tolua_err); return 0; #endif } @@ -6627,7 +6627,7 @@ static int tolua_cocos2d_utils_findChildren(lua_State* tolua_S) } #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'findChildren'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_utils_findChildren'.",&tolua_err); return 0; #endif } diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp index f63ae9ef0d..c7914a12e9 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp @@ -174,8 +174,8 @@ int lua_cocos2dx_physics_PhysicsWorld_rayCast(lua_State* tolua_S) }; } while(0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsWorld:rayCast"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsWorld:rayCast"); if(!ok) return 0; cobj->rayCast(arg0, arg1, arg2, nullptr); @@ -231,7 +231,7 @@ int lua_cocos2dx_physics_PhysicsWorld_queryRect(lua_State* tolua_S) }; } while(0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.PhysicsWorld:queryRect"); if(!ok) return 0; cobj->queryRect(arg0, arg1, nullptr); @@ -290,7 +290,7 @@ int lua_cocos2dx_physics_PhysicsWorld_queryPoint(lua_State* tolua_S) assert(false); } while(0) ; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsWorld:queryPoint"); if(!ok) return 0; cobj->queryPoint(arg0, arg1, nullptr); @@ -328,7 +328,7 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) cocos2d::Vec2* arg0 = nullptr; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createPolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -359,11 +359,11 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createPolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createPolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -393,12 +393,12 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; cocos2d::Vec2 arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createPolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_vec2(tolua_S, 4, &arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createPolygon"); + ok &= luaval_to_vec2(tolua_S, 4, &arg3, "cc.PhysicsBody:createPolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -449,7 +449,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgePolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -480,11 +480,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) int arg1; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgePolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgePolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -513,12 +513,12 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgePolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgePolygon"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsBody:createEdgePolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -569,7 +569,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgeChain"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -600,11 +600,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) int arg1; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgeChain"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgeChain"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -633,12 +633,12 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgeChain"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgeChain"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsBody:createEdgeChain"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -689,7 +689,7 @@ int lua_cocos2dx_physics_PhysicsShape_recenterPoints(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShape:recenterPoints"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -710,11 +710,11 @@ int lua_cocos2dx_physics_PhysicsShape_recenterPoints(lua_State* tolua_S) int arg1 = 0; cocos2d::Vec2 arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShape:recenterPoints"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_vec2(tolua_S, 3, &arg2); + ok &= luaval_to_vec2(tolua_S, 3, &arg2, "cc.PhysicsShape:recenterPoints"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -754,7 +754,7 @@ int lua_cocos2dx_physics_PhysicsShape_getPolyonCenter(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShape:getPolyonCenter"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -883,7 +883,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -904,11 +904,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -926,12 +926,12 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; cocos2d::Vec2 arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_vec2(tolua_S, 4, &arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapePolygon:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg3, "cc.PhysicsShapePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -970,7 +970,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateArea(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:calculateArea"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -1012,9 +1012,9 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateMoment(lua_State* tolua_S) double arg0; cocos2d::Vec2* arg1; int arg2 = 0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapePolygon:calculateMoment"); do { - ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2); + ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2, "cc.PhysicsShapePolygon:calculateMoment"); if (nullptr == arg1){ LUA_PRECONDITION( arg1, "Invalid Native Object"); }} while (0); @@ -1034,13 +1034,13 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateMoment(lua_State* tolua_S) cocos2d::Vec2* arg1; int arg2 = 0; cocos2d::Vec2 arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapePolygon:calculateMoment"); do { - ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2); + ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2, "cc.PhysicsShapePolygon:calculateMoment"); if (nullptr == arg1){ LUA_PRECONDITION( arg1, "Invalid Native Object"); }} while (0); - ok &= luaval_to_vec2(tolua_S, 4, &arg3); + ok &= luaval_to_vec2(tolua_S, 4, &arg3, "cc.PhysicsShapePolygon:calculateMoment"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg1); @@ -1316,7 +1316,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -1336,11 +1336,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -1358,12 +1358,12 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgePolygon:create"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsShapeEdgePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -1403,7 +1403,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgeChain:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -1423,11 +1423,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgeChain:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgeChain:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -1445,12 +1445,12 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgeChain:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgeChain:create"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsShapeEdgeChain:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp index 003e5527a2..9052750bf3 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp @@ -54,10 +54,10 @@ static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S,const char* className) if (2 == argc) { GLenum src, dst; - if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src)) + if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src, StringUtils::format("%s%s",className,":setBlendFunc").c_str())) return 0; - if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst)) + if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst,StringUtils::format("%s%s",className,":setBlendFunc").c_str())) return 0; BlendFunc blendFunc = {src, dst}; @@ -338,11 +338,11 @@ static int lua_cocos2dx_spine_SkeletonAnimation_addAnimation(lua_State* tolua_S) const char* arg1; bool arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:addAnimation"); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:addAnimation"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "sp.SkeletonAnimation:addAnimation"); if(!ok) return 0; cobj->addAnimation(arg0, arg1, arg2); @@ -356,13 +356,13 @@ static int lua_cocos2dx_spine_SkeletonAnimation_addAnimation(lua_State* tolua_S) bool arg2; double arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:addAnimation"); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:addAnimation"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "sp.SkeletonAnimation:addAnimation"); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "sp.SkeletonAnimation:addAnimation"); if(!ok) return 0; @@ -413,11 +413,11 @@ static int lua_cocos2dx_spine_SkeletonAnimation_setAnimation(lua_State* tolua_S) const char* arg1; bool arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:setAnimation"); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:setAnimation"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "sp.SkeletonAnimation:setAnimation"); if(!ok) return 0; diff --git a/tools/bindings-generator b/tools/bindings-generator index 6fcfc80c68..ee16f69272 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 6fcfc80c68b22de00342cc3fa8e0f3168bcf5e06 +Subproject commit ee16f692722f6bbb7d485032751f9b826ec9e926