From 6bf984f3d3fdd869e515eca6adab05642857b636 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Wed, 13 May 2015 08:11:34 +0000 Subject: [PATCH] [AUTO]: updating luabinding & jsbinding automatically --- .../auto/api/jsb_cocos2dx_auto_api.js | 18 +-- .../js-bindings/auto/jsb_cocos2dx_auto.cpp | 104 +++++++++--------- .../lua-bindings/auto/api/GLProgramState.lua | 24 ++-- .../lua-bindings/auto/lua_cocos2dx_auto.cpp | 68 ++++++------ 4 files changed, 107 insertions(+), 107 deletions(-) diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js index d7766885aa..568d185974 100644 --- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js +++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js @@ -10215,13 +10215,13 @@ int /** * @method setUniformVec2v * @param {int|String} int -* @param {vec2_object|vec2_object} vec2 * @param {long|long} long +* @param {vec2_object|vec2_object} vec2 */ setUniformVec2v : function( str, -vec2, -long +long, +vec2 ) { }, @@ -10267,13 +10267,13 @@ glprogram /** * @method setUniformFloatv * @param {int|String} int -* @param {float|float} float * @param {long|long} long +* @param {float|float} float */ setUniformFloatv : function( str, -float, -long +long, +float ) { }, @@ -10335,13 +10335,13 @@ mat4 /** * @method setUniformVec3v * @param {int|String} int -* @param {vec3_object|vec3_object} vec3 * @param {long|long} long +* @param {vec3_object|vec3_object} vec3 */ setUniformVec3v : function( str, -vec3, -long +long, +vec3 ) { }, diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 6826e09209..13e85106cc 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -32069,18 +32069,18 @@ bool js_cocos2dx_GLProgramState_setUniformVec2v(JSContext *cx, uint32_t argc, js int arg0; ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0); if (!ok) { ok = true; break; } - const cocos2d::Vec2* arg1; - do { - if (!args.get(1).isObject()) { ok = false; break; } - js_proxy_t *jsProxy; - JSObject *tmpObj = args.get(1).toObjectOrNull(); - jsProxy = jsb_get_js_proxy(tmpObj); - arg1 = (const cocos2d::Vec2*)(jsProxy ? jsProxy->ptr : NULL); - JSB_PRECONDITION2( arg1, cx, false, "Invalid Native Object"); - } while (0); + ssize_t arg1; + ok &= jsval_to_ssize(cx, args.get(1), &arg1); if (!ok) { ok = true; break; } - ssize_t arg2; - ok &= jsval_to_ssize(cx, args.get(2), &arg2); + const cocos2d::Vec2* arg2; + do { + if (!args.get(2).isObject()) { ok = false; break; } + js_proxy_t *jsProxy; + JSObject *tmpObj = args.get(2).toObjectOrNull(); + jsProxy = jsb_get_js_proxy(tmpObj); + arg2 = (const cocos2d::Vec2*)(jsProxy ? jsProxy->ptr : NULL); + JSB_PRECONDITION2( arg2, cx, false, "Invalid Native Object"); + } while (0); if (!ok) { ok = true; break; } cobj->setUniformVec2v(arg0, arg1, arg2); args.rval().setUndefined(); @@ -32093,18 +32093,18 @@ bool js_cocos2dx_GLProgramState_setUniformVec2v(JSContext *cx, uint32_t argc, js std::string arg0; ok &= jsval_to_std_string(cx, args.get(0), &arg0); if (!ok) { ok = true; break; } - const cocos2d::Vec2* arg1; - do { - if (!args.get(1).isObject()) { ok = false; break; } - js_proxy_t *jsProxy; - JSObject *tmpObj = args.get(1).toObjectOrNull(); - jsProxy = jsb_get_js_proxy(tmpObj); - arg1 = (const cocos2d::Vec2*)(jsProxy ? jsProxy->ptr : NULL); - JSB_PRECONDITION2( arg1, cx, false, "Invalid Native Object"); - } while (0); + ssize_t arg1; + ok &= jsval_to_ssize(cx, args.get(1), &arg1); if (!ok) { ok = true; break; } - ssize_t arg2; - ok &= jsval_to_ssize(cx, args.get(2), &arg2); + const cocos2d::Vec2* arg2; + do { + if (!args.get(2).isObject()) { ok = false; break; } + js_proxy_t *jsProxy; + JSObject *tmpObj = args.get(2).toObjectOrNull(); + jsProxy = jsb_get_js_proxy(tmpObj); + arg2 = (const cocos2d::Vec2*)(jsProxy ? jsProxy->ptr : NULL); + JSB_PRECONDITION2( arg2, cx, false, "Invalid Native Object"); + } while (0); if (!ok) { ok = true; break; } cobj->setUniformVec2v(arg0, arg1, arg2); args.rval().setUndefined(); @@ -32226,13 +32226,13 @@ bool js_cocos2dx_GLProgramState_setUniformFloatv(JSContext *cx, uint32_t argc, j int arg0; ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0); if (!ok) { ok = true; break; } - const float* arg1; + ssize_t arg1; + ok &= jsval_to_ssize(cx, args.get(1), &arg1); + if (!ok) { ok = true; break; } + const float* arg2; #pragma warning NO CONVERSION TO NATIVE FOR float* ok = false; if (!ok) { ok = true; break; } - ssize_t arg2; - ok &= jsval_to_ssize(cx, args.get(2), &arg2); - if (!ok) { ok = true; break; } cobj->setUniformFloatv(arg0, arg1, arg2); args.rval().setUndefined(); return true; @@ -32244,13 +32244,13 @@ bool js_cocos2dx_GLProgramState_setUniformFloatv(JSContext *cx, uint32_t argc, j std::string arg0; ok &= jsval_to_std_string(cx, args.get(0), &arg0); if (!ok) { ok = true; break; } - const float* arg1; + ssize_t arg1; + ok &= jsval_to_ssize(cx, args.get(1), &arg1); + if (!ok) { ok = true; break; } + const float* arg2; #pragma warning NO CONVERSION TO NATIVE FOR float* ok = false; if (!ok) { ok = true; break; } - ssize_t arg2; - ok &= jsval_to_ssize(cx, args.get(2), &arg2); - if (!ok) { ok = true; break; } cobj->setUniformFloatv(arg0, arg1, arg2); args.rval().setUndefined(); return true; @@ -32485,18 +32485,18 @@ bool js_cocos2dx_GLProgramState_setUniformVec3v(JSContext *cx, uint32_t argc, js int arg0; ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0); if (!ok) { ok = true; break; } - const cocos2d::Vec3* arg1; - do { - if (!args.get(1).isObject()) { ok = false; break; } - js_proxy_t *jsProxy; - JSObject *tmpObj = args.get(1).toObjectOrNull(); - jsProxy = jsb_get_js_proxy(tmpObj); - arg1 = (const cocos2d::Vec3*)(jsProxy ? jsProxy->ptr : NULL); - JSB_PRECONDITION2( arg1, cx, false, "Invalid Native Object"); - } while (0); + ssize_t arg1; + ok &= jsval_to_ssize(cx, args.get(1), &arg1); if (!ok) { ok = true; break; } - ssize_t arg2; - ok &= jsval_to_ssize(cx, args.get(2), &arg2); + const cocos2d::Vec3* arg2; + do { + if (!args.get(2).isObject()) { ok = false; break; } + js_proxy_t *jsProxy; + JSObject *tmpObj = args.get(2).toObjectOrNull(); + jsProxy = jsb_get_js_proxy(tmpObj); + arg2 = (const cocos2d::Vec3*)(jsProxy ? jsProxy->ptr : NULL); + JSB_PRECONDITION2( arg2, cx, false, "Invalid Native Object"); + } while (0); if (!ok) { ok = true; break; } cobj->setUniformVec3v(arg0, arg1, arg2); args.rval().setUndefined(); @@ -32509,18 +32509,18 @@ bool js_cocos2dx_GLProgramState_setUniformVec3v(JSContext *cx, uint32_t argc, js std::string arg0; ok &= jsval_to_std_string(cx, args.get(0), &arg0); if (!ok) { ok = true; break; } - const cocos2d::Vec3* arg1; - do { - if (!args.get(1).isObject()) { ok = false; break; } - js_proxy_t *jsProxy; - JSObject *tmpObj = args.get(1).toObjectOrNull(); - jsProxy = jsb_get_js_proxy(tmpObj); - arg1 = (const cocos2d::Vec3*)(jsProxy ? jsProxy->ptr : NULL); - JSB_PRECONDITION2( arg1, cx, false, "Invalid Native Object"); - } while (0); + ssize_t arg1; + ok &= jsval_to_ssize(cx, args.get(1), &arg1); if (!ok) { ok = true; break; } - ssize_t arg2; - ok &= jsval_to_ssize(cx, args.get(2), &arg2); + const cocos2d::Vec3* arg2; + do { + if (!args.get(2).isObject()) { ok = false; break; } + js_proxy_t *jsProxy; + JSObject *tmpObj = args.get(2).toObjectOrNull(); + jsProxy = jsb_get_js_proxy(tmpObj); + arg2 = (const cocos2d::Vec3*)(jsProxy ? jsProxy->ptr : NULL); + JSB_PRECONDITION2( arg2, cx, false, "Invalid Native Object"); + } while (0); if (!ok) { ok = true; break; } cobj->setUniformVec3v(arg0, arg1, arg2); args.rval().setUndefined(); diff --git a/cocos/scripting/lua-bindings/auto/api/GLProgramState.lua b/cocos/scripting/lua-bindings/auto/api/GLProgramState.lua index 30c62788d0..3019ac3e3f 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLProgramState.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLProgramState.lua @@ -46,13 +46,13 @@ -- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState) -------------------------------- --- @overload self, int, vec4_table, long --- @overload self, string, vec4_table, long +-- @overload self, int, long, vec4_table +-- @overload self, string, long, vec4_table -- @function [parent=#GLProgramState] setUniformVec4v -- @param self -- @param #string uniformName --- @param #vec4_table pointer -- @param #long size +-- @param #vec4_table pointer -- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState) -------------------------------- @@ -73,13 +73,13 @@ -- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState) -------------------------------- --- @overload self, int, vec2_table, long --- @overload self, string, vec2_table, long +-- @overload self, int, long, vec2_table +-- @overload self, string, long, vec2_table -- @function [parent=#GLProgramState] setUniformVec2v -- @param self -- @param #string uniformName --- @param #vec2_table pointer -- @param #long size +-- @param #vec2_table pointer -- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState) -------------------------------- @@ -110,13 +110,13 @@ -- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState) -------------------------------- --- @overload self, int, float, long --- @overload self, string, float, long +-- @overload self, int, long, float +-- @overload self, string, long, float -- @function [parent=#GLProgramState] setUniformFloatv -- @param self -- @param #string uniformName --- @param #float pointer -- @param #long size +-- @param #float pointer -- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState) -------------------------------- @@ -161,13 +161,13 @@ -- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState) -------------------------------- --- @overload self, int, vec3_table, long --- @overload self, string, vec3_table, long +-- @overload self, int, long, vec3_table +-- @overload self, string, long, vec3_table -- @function [parent=#GLProgramState] setUniformVec3v -- @param self -- @param #string uniformName --- @param #vec3_table pointer -- @param #long size +-- @param #vec3_table pointer -- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 3b889cdbff..6dbd0519fe 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -42597,12 +42597,12 @@ int lua_cocos2dx_GLProgramState_setUniformVec4v(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformVec4v"); if (!ok) { break; } - const cocos2d::Vec4* arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec4",&arg1); + ssize_t arg1; + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec4v"); if (!ok) { break; } - ssize_t arg2; - ok &= luaval_to_ssize(tolua_S, 4, &arg2, "cc.GLProgramState:setUniformVec4v"); + const cocos2d::Vec4* arg2; + ok &= luaval_to_object(tolua_S, 4, "cc.Vec4",&arg2); if (!ok) { break; } cobj->setUniformVec4v(arg0, arg1, arg2); @@ -42617,12 +42617,12 @@ int lua_cocos2dx_GLProgramState_setUniformVec4v(lua_State* tolua_S) ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformVec4v"); if (!ok) { break; } - const cocos2d::Vec4* arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec4",&arg1); + ssize_t arg1; + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec4v"); if (!ok) { break; } - ssize_t arg2; - ok &= luaval_to_ssize(tolua_S, 4, &arg2, "cc.GLProgramState:setUniformVec4v"); + const cocos2d::Vec4* arg2; + ok &= luaval_to_object(tolua_S, 4, "cc.Vec4",&arg2); if (!ok) { break; } cobj->setUniformVec4v(arg0, arg1, arg2); @@ -42781,12 +42781,12 @@ int lua_cocos2dx_GLProgramState_setUniformVec2v(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformVec2v"); if (!ok) { break; } - const cocos2d::Vec2* arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ssize_t arg1; + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec2v"); if (!ok) { break; } - ssize_t arg2; - ok &= luaval_to_ssize(tolua_S, 4, &arg2, "cc.GLProgramState:setUniformVec2v"); + const cocos2d::Vec2* arg2; + ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); if (!ok) { break; } cobj->setUniformVec2v(arg0, arg1, arg2); @@ -42801,12 +42801,12 @@ int lua_cocos2dx_GLProgramState_setUniformVec2v(lua_State* tolua_S) ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformVec2v"); if (!ok) { break; } - const cocos2d::Vec2* arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec2",&arg1); + ssize_t arg1; + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec2v"); if (!ok) { break; } - ssize_t arg2; - ok &= luaval_to_ssize(tolua_S, 4, &arg2, "cc.GLProgramState:setUniformVec2v"); + const cocos2d::Vec2* arg2; + ok &= luaval_to_object(tolua_S, 4, "cc.Vec2",&arg2); if (!ok) { break; } cobj->setUniformVec2v(arg0, arg1, arg2); @@ -43057,13 +43057,13 @@ int lua_cocos2dx_GLProgramState_setUniformFloatv(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformFloatv"); if (!ok) { break; } - const float* arg1; - #pragma warning NO CONVERSION TO NATIVE FOR float* - ok = false; + ssize_t arg1; + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformFloatv"); if (!ok) { break; } - ssize_t arg2; - ok &= luaval_to_ssize(tolua_S, 4, &arg2, "cc.GLProgramState:setUniformFloatv"); + const float* arg2; + #pragma warning NO CONVERSION TO NATIVE FOR float* + ok = false; if (!ok) { break; } cobj->setUniformFloatv(arg0, arg1, arg2); @@ -43078,13 +43078,13 @@ int lua_cocos2dx_GLProgramState_setUniformFloatv(lua_State* tolua_S) ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformFloatv"); if (!ok) { break; } - const float* arg1; - #pragma warning NO CONVERSION TO NATIVE FOR float* - ok = false; + ssize_t arg1; + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformFloatv"); if (!ok) { break; } - ssize_t arg2; - ok &= luaval_to_ssize(tolua_S, 4, &arg2, "cc.GLProgramState:setUniformFloatv"); + const float* arg2; + #pragma warning NO CONVERSION TO NATIVE FOR float* + ok = false; if (!ok) { break; } cobj->setUniformFloatv(arg0, arg1, arg2); @@ -43445,12 +43445,12 @@ int lua_cocos2dx_GLProgramState_setUniformVec3v(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformVec3v"); if (!ok) { break; } - const cocos2d::Vec3* arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec3",&arg1); + ssize_t arg1; + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec3v"); if (!ok) { break; } - ssize_t arg2; - ok &= luaval_to_ssize(tolua_S, 4, &arg2, "cc.GLProgramState:setUniformVec3v"); + const cocos2d::Vec3* arg2; + ok &= luaval_to_object(tolua_S, 4, "cc.Vec3",&arg2); if (!ok) { break; } cobj->setUniformVec3v(arg0, arg1, arg2); @@ -43465,12 +43465,12 @@ int lua_cocos2dx_GLProgramState_setUniformVec3v(lua_State* tolua_S) ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformVec3v"); if (!ok) { break; } - const cocos2d::Vec3* arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.Vec3",&arg1); + ssize_t arg1; + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec3v"); if (!ok) { break; } - ssize_t arg2; - ok &= luaval_to_ssize(tolua_S, 4, &arg2, "cc.GLProgramState:setUniformVec3v"); + const cocos2d::Vec3* arg2; + ok &= luaval_to_object(tolua_S, 4, "cc.Vec3",&arg2); if (!ok) { break; } cobj->setUniformVec3v(arg0, arg1, arg2);