diff --git a/README.md b/README.md index d0fcd5fcda..0203e87b18 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,9 @@ cocos2d-x is: Git user attention ----------------------- -1. clone the repo from GitHub. +1. Clone the repo from GitHub. - $ git clone git@github.com:cocos2d/cocos2d-x.git + $ git clone https://github.com/cocos2d/cocos2d-x.git 2. After cloning the repo, please execute `download-deps.py` to download and install dependencies. 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 21a8f84eaf..dd2b364215 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 @@ -19915,16 +19915,6 @@ getStateBlock : function ( return cc.RenderState::StateBlock; }, -/** - * @method getTextures - * @return {Array} - */ -getTextures : function ( -) -{ - return new Array(); -}, - /** * @method initialize */ diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index aa5b597b38..f277da83c9 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -61442,24 +61442,6 @@ bool js_cocos2dx_RenderState_getStateBlock(JSContext *cx, uint32_t argc, jsval * JS_ReportError(cx, "js_cocos2dx_RenderState_getStateBlock : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } -bool js_cocos2dx_RenderState_getTextures(JSContext *cx, uint32_t argc, jsval *vp) -{ - JS::CallArgs args = JS::CallArgsFromVp(argc, vp); - JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); - js_proxy_t *proxy = jsb_get_js_proxy(obj); - cocos2d::RenderState* cobj = (cocos2d::RenderState *)(proxy ? proxy->ptr : NULL); - JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_RenderState_getTextures : Invalid Native Object"); - if (argc == 0) { - const cocos2d::Vector& ret = cobj->getTextures(); - jsval jsret = JSVAL_NULL; - jsret = ccvector_to_jsval(cx, ret); - args.rval().set(jsret); - return true; - } - - JS_ReportError(cx, "js_cocos2dx_RenderState_getTextures : wrong number of arguments: %d, was expecting %d", argc, 0); - return false; -} bool js_cocos2dx_RenderState_initialize(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -61515,7 +61497,6 @@ void js_register_cocos2dx_RenderState(JSContext *cx, JS::HandleObject global) { JS_FN("bind", js_cocos2dx_RenderState_bind, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getName", js_cocos2dx_RenderState_getName, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getStateBlock", js_cocos2dx_RenderState_getStateBlock, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), - JS_FN("getTextures", js_cocos2dx_RenderState_getTextures, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FS_END }; diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp index 260cb822c0..78a1d9e6c8 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp @@ -3567,7 +3567,6 @@ bool js_cocos2dx_RenderState_getTexture(JSContext *cx, uint32_t argc, jsval *vp) bool js_cocos2dx_RenderState_bind(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_RenderState_getName(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_RenderState_getStateBlock(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_RenderState_getTextures(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_RenderState_initialize(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_RenderState_finalize(JSContext *cx, uint32_t argc, jsval *vp); diff --git a/cocos/scripting/lua-bindings/auto/api/RenderState.lua b/cocos/scripting/lua-bindings/auto/api/RenderState.lua index b10d6e2c7e..c9f29ca8d0 100644 --- a/cocos/scripting/lua-bindings/auto/api/RenderState.lua +++ b/cocos/scripting/lua-bindings/auto/api/RenderState.lua @@ -5,8 +5,8 @@ -- @parent_module cc -------------------------------- --- Replaces the texture that is at the front of _textures array.
--- Added to be backwards compatible. +-- Texture that will use in the CC_Texture0 uniform.
+-- Added to be backwards compatible. Use Samplers from .material instead. -- @function [parent=#RenderState] setTexture -- @param self -- @param #cc.Texture2D texture @@ -20,7 +20,7 @@ -- @return RenderState#RenderState ret (return value: cc.RenderState) -------------------------------- --- Returns the texture that is at the front of the _textures array.
+-- Returns the texture that is going to be used for CC_Texture0.
-- Added to be backwards compatible. -- @function [parent=#RenderState] getTexture -- @param self @@ -46,12 +46,6 @@ -- @param self -- @return RenderState::StateBlock#RenderState::StateBlock ret (return value: cc.RenderState::StateBlock) --------------------------------- --- --- @function [parent=#RenderState] getTextures --- @param self --- @return array_table#array_table ret (return value: array_table) - -------------------------------- -- Static initializer that is called during game startup. -- @function [parent=#RenderState] initialize diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 8064da4c86..5470e176e7 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -81971,53 +81971,6 @@ int lua_cocos2dx_RenderState_getStateBlock(lua_State* tolua_S) return 0; } -int lua_cocos2dx_RenderState_getTextures(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::RenderState* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.RenderState",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::RenderState*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_RenderState_getTextures'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - { - tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_RenderState_getTextures'", nullptr); - return 0; - } - const cocos2d::Vector& ret = cobj->getTextures(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderState:getTextures",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_RenderState_getTextures'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_RenderState_initialize(lua_State* tolua_S) { int argc = 0; @@ -82070,7 +82023,6 @@ int lua_register_cocos2dx_RenderState(lua_State* tolua_S) tolua_function(tolua_S,"bind",lua_cocos2dx_RenderState_bind); tolua_function(tolua_S,"getName",lua_cocos2dx_RenderState_getName); tolua_function(tolua_S,"getStateBlock",lua_cocos2dx_RenderState_getStateBlock); - tolua_function(tolua_S,"getTextures",lua_cocos2dx_RenderState_getTextures); tolua_function(tolua_S,"initialize", lua_cocos2dx_RenderState_initialize); tolua_endmodule(tolua_S); std::string typeName = typeid(cocos2d::RenderState).name(); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index 59981d3917..ec6c32737b 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -2051,7 +2051,6 @@ int register_all_cocos2dx(lua_State* tolua_S); - #endif // __cocos2dx_h__