diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_3d_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_3d_auto_api.js
index d4880670f8..92337a2a8f 100644
--- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_3d_auto_api.js
+++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_3d_auto_api.js
@@ -1008,14 +1008,6 @@ int
{
},
-/**
- * @method genGLProgramState
- */
-genGLProgramState : function (
-)
-{
-},
-
/**
* @method getMesh
* @return {cc.Mesh}
@@ -1212,6 +1204,14 @@ bool
{
},
+/**
+ * @method genMaterial
+ */
+genMaterial : function (
+)
+{
+},
+
/**
* @method removeAttachNode
* @param {String} arg0
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 ed8da95df4..a79ac47a79 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
@@ -20258,6 +20258,16 @@ getStateBlock : function (
return cc.RenderState::StateBlock;
},
+/**
+ * @method setParent
+ * @param {cc.RenderState} arg0
+ */
+setParent : function (
+renderstate
+)
+{
+},
+
/**
* @method initialize
*/
diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp
index 7ebf91c440..efad236f84 100644
--- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp
+++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp
@@ -2953,31 +2953,6 @@ bool js_cocos2dx_3d_Sprite3D_setMaterial(JSContext *cx, uint32_t argc, jsval *vp
JS_ReportError(cx, "js_cocos2dx_3d_Sprite3D_setMaterial : wrong number of arguments");
return false;
}
-bool js_cocos2dx_3d_Sprite3D_genGLProgramState(JSContext *cx, uint32_t argc, jsval *vp)
-{
- JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
- bool ok = true;
- JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
- js_proxy_t *proxy = jsb_get_js_proxy(obj);
- cocos2d::Sprite3D* cobj = (cocos2d::Sprite3D *)(proxy ? proxy->ptr : NULL);
- JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_3d_Sprite3D_genGLProgramState : Invalid Native Object");
- if (argc == 0) {
- cobj->genGLProgramState();
- args.rval().setUndefined();
- return true;
- }
- if (argc == 1) {
- bool arg0;
- arg0 = JS::ToBoolean(args.get(0));
- JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_3d_Sprite3D_genGLProgramState : Error processing arguments");
- cobj->genGLProgramState(arg0);
- args.rval().setUndefined();
- return true;
- }
-
- JS_ReportError(cx, "js_cocos2dx_3d_Sprite3D_genGLProgramState : wrong number of arguments: %d, was expecting %d", argc, 0);
- return false;
-}
bool js_cocos2dx_3d_Sprite3D_getMesh(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -3386,6 +3361,31 @@ bool js_cocos2dx_3d_Sprite3D_setForce2DQueue(JSContext *cx, uint32_t argc, jsval
JS_ReportError(cx, "js_cocos2dx_3d_Sprite3D_setForce2DQueue : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
+bool js_cocos2dx_3d_Sprite3D_genMaterial(JSContext *cx, uint32_t argc, jsval *vp)
+{
+ JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+ bool ok = true;
+ JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
+ js_proxy_t *proxy = jsb_get_js_proxy(obj);
+ cocos2d::Sprite3D* cobj = (cocos2d::Sprite3D *)(proxy ? proxy->ptr : NULL);
+ JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_3d_Sprite3D_genMaterial : Invalid Native Object");
+ if (argc == 0) {
+ cobj->genMaterial();
+ args.rval().setUndefined();
+ return true;
+ }
+ if (argc == 1) {
+ bool arg0;
+ arg0 = JS::ToBoolean(args.get(0));
+ JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_3d_Sprite3D_genMaterial : Error processing arguments");
+ cobj->genMaterial(arg0);
+ args.rval().setUndefined();
+ return true;
+ }
+
+ JS_ReportError(cx, "js_cocos2dx_3d_Sprite3D_genMaterial : wrong number of arguments: %d, was expecting %d", argc, 0);
+ return false;
+}
bool js_cocos2dx_3d_Sprite3D_removeAttachNode(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -3626,7 +3626,6 @@ void js_register_cocos2dx_3d_Sprite3D(JSContext *cx, JS::HandleObject global) {
JS_FN("addMesh", js_cocos2dx_3d_Sprite3D_addMesh, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("removeAllAttachNode", js_cocos2dx_3d_Sprite3D_removeAllAttachNode, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("setMaterial", js_cocos2dx_3d_Sprite3D_setMaterial, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
- JS_FN("genGLProgramState", js_cocos2dx_3d_Sprite3D_genGLProgramState, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getMesh", js_cocos2dx_3d_Sprite3D_getMesh, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("createSprite3DNode", js_cocos2dx_3d_Sprite3D_createSprite3DNode, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getMeshCount", js_cocos2dx_3d_Sprite3D_getMeshCount, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
@@ -3644,6 +3643,7 @@ void js_register_cocos2dx_3d_Sprite3D(JSContext *cx, JS::HandleObject global) {
JS_FN("initWithFile", js_cocos2dx_3d_Sprite3D_initWithFile, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("setBlendFunc", js_cocos2dx_3d_Sprite3D_setBlendFunc, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("setForce2DQueue", js_cocos2dx_3d_Sprite3D_setForce2DQueue, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
+ JS_FN("genMaterial", js_cocos2dx_3d_Sprite3D_genMaterial, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("removeAttachNode", js_cocos2dx_3d_Sprite3D_removeAttachNode, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getSkeleton", js_cocos2dx_3d_Sprite3D_getSkeleton, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("setForceDepthWrite", js_cocos2dx_3d_Sprite3D_setForceDepthWrite, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp
index 8163bc550c..e754f48e03 100644
--- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp
+++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp
@@ -161,7 +161,6 @@ bool js_cocos2dx_3d_Sprite3D_setCullFace(JSContext *cx, uint32_t argc, jsval *vp
bool js_cocos2dx_3d_Sprite3D_addMesh(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_3d_Sprite3D_removeAllAttachNode(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_3d_Sprite3D_setMaterial(JSContext *cx, uint32_t argc, jsval *vp);
-bool js_cocos2dx_3d_Sprite3D_genGLProgramState(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_3d_Sprite3D_getMesh(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_3d_Sprite3D_createSprite3DNode(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_3d_Sprite3D_getMeshCount(JSContext *cx, uint32_t argc, jsval *vp);
@@ -179,6 +178,7 @@ bool js_cocos2dx_3d_Sprite3D_getAttachNode(JSContext *cx, uint32_t argc, jsval *
bool js_cocos2dx_3d_Sprite3D_initWithFile(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_3d_Sprite3D_setBlendFunc(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_3d_Sprite3D_setForce2DQueue(JSContext *cx, uint32_t argc, jsval *vp);
+bool js_cocos2dx_3d_Sprite3D_genMaterial(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_3d_Sprite3D_removeAttachNode(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_3d_Sprite3D_getSkeleton(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_3d_Sprite3D_setForceDepthWrite(JSContext *cx, uint32_t argc, jsval *vp);
diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
index 79052ac80a..06374aae2d 100644
--- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
+++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
@@ -63768,6 +63768,34 @@ 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_setParent(JSContext *cx, uint32_t argc, jsval *vp)
+{
+ JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+ bool ok = true;
+ 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_setParent : Invalid Native Object");
+ if (argc == 1) {
+ cocos2d::RenderState* arg0 = nullptr;
+ do {
+ if (args.get(0).isNull()) { arg0 = nullptr; break; }
+ if (!args.get(0).isObject()) { ok = false; break; }
+ js_proxy_t *jsProxy;
+ JSObject *tmpObj = args.get(0).toObjectOrNull();
+ jsProxy = jsb_get_js_proxy(tmpObj);
+ arg0 = (cocos2d::RenderState*)(jsProxy ? jsProxy->ptr : NULL);
+ JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object");
+ } while (0);
+ JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_RenderState_setParent : Error processing arguments");
+ cobj->setParent(arg0);
+ args.rval().setUndefined();
+ return true;
+ }
+
+ JS_ReportError(cx, "js_cocos2dx_RenderState_setParent : wrong number of arguments: %d, was expecting %d", argc, 1);
+ return false;
+}
bool js_cocos2dx_RenderState_initialize(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -63821,6 +63849,7 @@ 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("setParent", js_cocos2dx_RenderState_setParent, 1, 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 1f53571c7b..bf3ae1aa90 100644
--- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
+++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
@@ -3638,6 +3638,7 @@ 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_setParent(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 c9f29ca8d0..f57e4644b2 100644
--- a/cocos/scripting/lua-bindings/auto/api/RenderState.lua
+++ b/cocos/scripting/lua-bindings/auto/api/RenderState.lua
@@ -46,6 +46,13 @@
-- @param self
-- @return RenderState::StateBlock#RenderState::StateBlock ret (return value: cc.RenderState::StateBlock)
+--------------------------------
+--
+-- @function [parent=#RenderState] setParent
+-- @param self
+-- @param #cc.RenderState parent
+-- @return RenderState#RenderState self (return value: cc.RenderState)
+
--------------------------------
-- Static initializer that is called during game startup.
-- @function [parent=#RenderState] initialize
diff --git a/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua b/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua
index 3e05d25a70..a964a47ffb 100644
--- a/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua
+++ b/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua
@@ -115,6 +115,12 @@
-- @param #bool force2D
-- @return Sprite3D#Sprite3D self (return value: cc.Sprite3D)
+--------------------------------
+-- generate default material
+-- @function [parent=#Sprite3D] genMaterial
+-- @param self
+-- @return Sprite3D#Sprite3D self (return value: cc.Sprite3D)
+
--------------------------------
-- remove attach node
-- @function [parent=#Sprite3D] removeAttachNode
diff --git a/cocos/scripting/lua-bindings/auto/api/Sprite3DMaterial.lua b/cocos/scripting/lua-bindings/auto/api/Sprite3DMaterial.lua
new file mode 100644
index 0000000000..3b55432e97
--- /dev/null
+++ b/cocos/scripting/lua-bindings/auto/api/Sprite3DMaterial.lua
@@ -0,0 +1,59 @@
+
+--------------------------------
+-- @module Sprite3DMaterial
+-- @extend Material
+-- @parent_module cc
+
+--------------------------------
+-- Get material type
+-- return Material type
+-- @function [parent=#Sprite3DMaterial] getMaterialType
+-- @param self
+-- @return int#int ret (return value: int)
+
+--------------------------------
+-- Create material with file name, it creates material from cache if it is previously loaded
+-- param path Path of material file
+-- return Created material
+-- @function [parent=#Sprite3DMaterial] createWithFilename
+-- @param self
+-- @param #string path
+-- @return Sprite3DMaterial#Sprite3DMaterial ret (return value: cc.Sprite3DMaterial)
+
+--------------------------------
+-- Release all cached materials
+-- @function [parent=#Sprite3DMaterial] releaseCachedMaterial
+-- @param self
+-- @return Sprite3DMaterial#Sprite3DMaterial self (return value: cc.Sprite3DMaterial)
+
+--------------------------------
+-- @overload self
+-- @overload self, int, bool
+-- @function [parent=#Sprite3DMaterial] createBuiltInMaterial
+-- @param self
+-- @param #int type
+-- @param #bool skinned
+-- @return Sprite3DMaterial#Sprite3DMaterial ret (return value: cc.Sprite3DMaterial)
+
+--------------------------------
+-- Create material with GLProgramState
+-- param programState GLProgramState instance
+-- return Created material
+-- @function [parent=#Sprite3DMaterial] createWithGLStateProgram
+-- @param self
+-- @param #cc.GLProgramState programState
+-- @return Sprite3DMaterial#Sprite3DMaterial ret (return value: cc.Sprite3DMaterial)
+
+--------------------------------
+-- Release all built in materials
+-- @function [parent=#Sprite3DMaterial] releaseBuiltInMaterial
+-- @param self
+-- @return Sprite3DMaterial#Sprite3DMaterial self (return value: cc.Sprite3DMaterial)
+
+--------------------------------
+-- Clone material
+-- @function [parent=#Sprite3DMaterial] clone
+-- @param self
+-- @return Material#Material ret (return value: cc.Material)
+
+return nil
diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
index 56f6bf1dad..d1cf0a1658 100644
--- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
+++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
@@ -1316,4 +1316,9 @@
-- @field [parent=#cc] MotionStreak3D#MotionStreak3D MotionStreak3D preloaded module
+--------------------------------------------------------
+-- the cc Sprite3DMaterial
+-- @field [parent=#cc] Sprite3DMaterial#Sprite3DMaterial Sprite3DMaterial preloaded module
+
+
return nil
diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp
index f85eea9c4f..7200ac1752 100644
--- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp
+++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp
@@ -4357,6 +4357,67 @@ int lua_cocos2dx_3d_Sprite3D_setForce2DQueue(lua_State* tolua_S)
return 0;
}
+int lua_cocos2dx_3d_Sprite3D_genMaterial(lua_State* tolua_S)
+{
+ int argc = 0;
+ cocos2d::Sprite3D* 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.Sprite3D",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ cobj = (cocos2d::Sprite3D*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+ if (!cobj)
+ {
+ tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Sprite3D_genMaterial'", 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_3d_Sprite3D_genMaterial'", nullptr);
+ return 0;
+ }
+ cobj->genMaterial();
+ lua_settop(tolua_S, 1);
+ return 1;
+ }
+ if (argc == 1)
+ {
+ bool arg0;
+
+ ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite3D:genMaterial");
+ if(!ok)
+ {
+ tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Sprite3D_genMaterial'", nullptr);
+ return 0;
+ }
+ cobj->genMaterial(arg0);
+ lua_settop(tolua_S, 1);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:genMaterial",argc, 0);
+ return 0;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_genMaterial'.",&tolua_err);
+#endif
+
+ return 0;
+}
int lua_cocos2dx_3d_Sprite3D_removeAttachNode(lua_State* tolua_S)
{
int argc = 0;
@@ -4643,6 +4704,7 @@ int lua_register_cocos2dx_3d_Sprite3D(lua_State* tolua_S)
tolua_function(tolua_S,"getAttachNode",lua_cocos2dx_3d_Sprite3D_getAttachNode);
tolua_function(tolua_S,"setBlendFunc",lua_cocos2dx_3d_Sprite3D_setBlendFunc);
tolua_function(tolua_S,"setForce2DQueue",lua_cocos2dx_3d_Sprite3D_setForce2DQueue);
+ tolua_function(tolua_S,"genMaterial",lua_cocos2dx_3d_Sprite3D_genMaterial);
tolua_function(tolua_S,"removeAttachNode",lua_cocos2dx_3d_Sprite3D_removeAttachNode);
tolua_function(tolua_S,"getSkeleton",lua_cocos2dx_3d_Sprite3D_getSkeleton);
tolua_function(tolua_S,"setForceDepthWrite",lua_cocos2dx_3d_Sprite3D_setForceDepthWrite);
diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp
index 1be0eff86c..4daae1c06b 100644
--- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp
+++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp
@@ -148,6 +148,7 @@ int register_all_cocos2dx_3d(lua_State* tolua_S);
+
#endif // __cocos2dx_3d_h__
diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
index 7b8d73dcb5..62ade2a31a 100644
--- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
+++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
@@ -84047,6 +84047,56 @@ int lua_cocos2dx_RenderState_getStateBlock(lua_State* tolua_S)
return 0;
}
+int lua_cocos2dx_RenderState_setParent(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_setParent'", nullptr);
+ return 0;
+ }
+#endif
+
+ argc = lua_gettop(tolua_S)-1;
+ if (argc == 1)
+ {
+ cocos2d::RenderState* arg0;
+
+ ok &= luaval_to_object(tolua_S, 2, "cc.RenderState",&arg0, "cc.RenderState:setParent");
+ if(!ok)
+ {
+ tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_RenderState_setParent'", nullptr);
+ return 0;
+ }
+ cobj->setParent(arg0);
+ lua_settop(tolua_S, 1);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderState:setParent",argc, 1);
+ return 0;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_RenderState_setParent'.",&tolua_err);
+#endif
+
+ return 0;
+}
int lua_cocos2dx_RenderState_initialize(lua_State* tolua_S)
{
int argc = 0;
@@ -84099,6 +84149,7 @@ 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,"setParent",lua_cocos2dx_RenderState_setParent);
tolua_function(tolua_S,"initialize", lua_cocos2dx_RenderState_initialize);
tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::RenderState).name();
@@ -95184,6 +95235,266 @@ int lua_register_cocos2dx_MotionStreak3D(lua_State* tolua_S)
g_typeCast["MotionStreak3D"] = "cc.MotionStreak3D";
return 1;
}
+
+int lua_cocos2dx_Sprite3DMaterial_getMaterialType(lua_State* tolua_S)
+{
+ int argc = 0;
+ cocos2d::Sprite3DMaterial* 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.Sprite3DMaterial",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ cobj = (cocos2d::Sprite3DMaterial*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+ if (!cobj)
+ {
+ tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Sprite3DMaterial_getMaterialType'", 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_Sprite3DMaterial_getMaterialType'", nullptr);
+ return 0;
+ }
+ int ret = (int)cobj->getMaterialType();
+ tolua_pushnumber(tolua_S,(lua_Number)ret);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3DMaterial:getMaterialType",argc, 0);
+ return 0;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3DMaterial_getMaterialType'.",&tolua_err);
+#endif
+
+ return 0;
+}
+int lua_cocos2dx_Sprite3DMaterial_createWithFilename(lua_State* tolua_S)
+{
+ int argc = 0;
+ bool ok = true;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_Error tolua_err;
+#endif
+
+#if COCOS2D_DEBUG >= 1
+ if (!tolua_isusertable(tolua_S,1,"cc.Sprite3DMaterial",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ argc = lua_gettop(tolua_S) - 1;
+
+ if (argc == 1)
+ {
+ std::string arg0;
+ ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3DMaterial:createWithFilename");
+ if(!ok)
+ {
+ tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Sprite3DMaterial_createWithFilename'", nullptr);
+ return 0;
+ }
+ cocos2d::Sprite3DMaterial* ret = cocos2d::Sprite3DMaterial::createWithFilename(arg0);
+ object_to_luaval(tolua_S, "cc.Sprite3DMaterial",(cocos2d::Sprite3DMaterial*)ret);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Sprite3DMaterial:createWithFilename",argc, 1);
+ return 0;
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3DMaterial_createWithFilename'.",&tolua_err);
+#endif
+ return 0;
+}
+int lua_cocos2dx_Sprite3DMaterial_releaseCachedMaterial(lua_State* tolua_S)
+{
+ int argc = 0;
+ bool ok = true;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_Error tolua_err;
+#endif
+
+#if COCOS2D_DEBUG >= 1
+ if (!tolua_isusertable(tolua_S,1,"cc.Sprite3DMaterial",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ argc = lua_gettop(tolua_S) - 1;
+
+ if (argc == 0)
+ {
+ if(!ok)
+ {
+ tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Sprite3DMaterial_releaseCachedMaterial'", nullptr);
+ return 0;
+ }
+ cocos2d::Sprite3DMaterial::releaseCachedMaterial();
+ lua_settop(tolua_S, 1);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Sprite3DMaterial:releaseCachedMaterial",argc, 0);
+ return 0;
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3DMaterial_releaseCachedMaterial'.",&tolua_err);
+#endif
+ return 0;
+}
+int lua_cocos2dx_Sprite3DMaterial_createBuiltInMaterial(lua_State* tolua_S)
+{
+ int argc = 0;
+ bool ok = true;
+#if COCOS2D_DEBUG >= 1
+ tolua_Error tolua_err;
+#endif
+
+#if COCOS2D_DEBUG >= 1
+ if (!tolua_isusertable(tolua_S,1,"cc.Sprite3DMaterial",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ argc = lua_gettop(tolua_S)-1;
+
+ do
+ {
+ if (argc == 0)
+ {
+ cocos2d::Sprite3DMaterial::createBuiltInMaterial();
+ lua_settop(tolua_S, 1);
+ return 1;
+ }
+ } while (0);
+ ok = true;
+ do
+ {
+ if (argc == 2)
+ {
+ cocos2d::Sprite3DMaterial::MaterialType arg0;
+ ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Sprite3DMaterial:createBuiltInMaterial");
+ if (!ok) { break; }
+ bool arg1;
+ ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Sprite3DMaterial:createBuiltInMaterial");
+ if (!ok) { break; }
+ cocos2d::Sprite3DMaterial* ret = cocos2d::Sprite3DMaterial::createBuiltInMaterial(arg0, arg1);
+ object_to_luaval(tolua_S, "cc.Sprite3DMaterial",(cocos2d::Sprite3DMaterial*)ret);
+ return 1;
+ }
+ } while (0);
+ ok = true;
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d", "cc.Sprite3DMaterial:createBuiltInMaterial",argc, 2);
+ return 0;
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3DMaterial_createBuiltInMaterial'.",&tolua_err);
+#endif
+ return 0;
+}
+int lua_cocos2dx_Sprite3DMaterial_createWithGLStateProgram(lua_State* tolua_S)
+{
+ int argc = 0;
+ bool ok = true;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_Error tolua_err;
+#endif
+
+#if COCOS2D_DEBUG >= 1
+ if (!tolua_isusertable(tolua_S,1,"cc.Sprite3DMaterial",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ argc = lua_gettop(tolua_S) - 1;
+
+ if (argc == 1)
+ {
+ cocos2d::GLProgramState* arg0;
+ ok &= luaval_to_object(tolua_S, 2, "cc.GLProgramState",&arg0, "cc.Sprite3DMaterial:createWithGLStateProgram");
+ if(!ok)
+ {
+ tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Sprite3DMaterial_createWithGLStateProgram'", nullptr);
+ return 0;
+ }
+ cocos2d::Sprite3DMaterial* ret = cocos2d::Sprite3DMaterial::createWithGLStateProgram(arg0);
+ object_to_luaval(tolua_S, "cc.Sprite3DMaterial",(cocos2d::Sprite3DMaterial*)ret);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Sprite3DMaterial:createWithGLStateProgram",argc, 1);
+ return 0;
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3DMaterial_createWithGLStateProgram'.",&tolua_err);
+#endif
+ return 0;
+}
+int lua_cocos2dx_Sprite3DMaterial_releaseBuiltInMaterial(lua_State* tolua_S)
+{
+ int argc = 0;
+ bool ok = true;
+
+#if COCOS2D_DEBUG >= 1
+ tolua_Error tolua_err;
+#endif
+
+#if COCOS2D_DEBUG >= 1
+ if (!tolua_isusertable(tolua_S,1,"cc.Sprite3DMaterial",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+ argc = lua_gettop(tolua_S) - 1;
+
+ if (argc == 0)
+ {
+ if(!ok)
+ {
+ tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Sprite3DMaterial_releaseBuiltInMaterial'", nullptr);
+ return 0;
+ }
+ cocos2d::Sprite3DMaterial::releaseBuiltInMaterial();
+ lua_settop(tolua_S, 1);
+ return 1;
+ }
+ luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Sprite3DMaterial:releaseBuiltInMaterial",argc, 0);
+ return 0;
+#if COCOS2D_DEBUG >= 1
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3DMaterial_releaseBuiltInMaterial'.",&tolua_err);
+#endif
+ return 0;
+}
+static int lua_cocos2dx_Sprite3DMaterial_finalize(lua_State* tolua_S)
+{
+ printf("luabindings: finalizing LUA object (Sprite3DMaterial)");
+ return 0;
+}
+
+int lua_register_cocos2dx_Sprite3DMaterial(lua_State* tolua_S)
+{
+ tolua_usertype(tolua_S,"cc.Sprite3DMaterial");
+ tolua_cclass(tolua_S,"Sprite3DMaterial","cc.Sprite3DMaterial","cc.Material",nullptr);
+
+ tolua_beginmodule(tolua_S,"Sprite3DMaterial");
+ tolua_function(tolua_S,"getMaterialType",lua_cocos2dx_Sprite3DMaterial_getMaterialType);
+ tolua_function(tolua_S,"createWithFilename", lua_cocos2dx_Sprite3DMaterial_createWithFilename);
+ tolua_function(tolua_S,"releaseCachedMaterial", lua_cocos2dx_Sprite3DMaterial_releaseCachedMaterial);
+ tolua_function(tolua_S,"createBuiltInMaterial", lua_cocos2dx_Sprite3DMaterial_createBuiltInMaterial);
+ tolua_function(tolua_S,"createWithGLStateProgram", lua_cocos2dx_Sprite3DMaterial_createWithGLStateProgram);
+ tolua_function(tolua_S,"releaseBuiltInMaterial", lua_cocos2dx_Sprite3DMaterial_releaseBuiltInMaterial);
+ tolua_endmodule(tolua_S);
+ std::string typeName = typeid(cocos2d::Sprite3DMaterial).name();
+ g_luaType[typeName] = "cc.Sprite3DMaterial";
+ g_typeCast["Sprite3DMaterial"] = "cc.Sprite3DMaterial";
+ return 1;
+}
TOLUA_API int register_all_cocos2dx(lua_State* tolua_S)
{
tolua_open(tolua_S);
@@ -95289,6 +95600,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S)
lua_register_cocos2dx_EaseExponentialOut(tolua_S);
lua_register_cocos2dx_Label(tolua_S);
lua_register_cocos2dx_Application(tolua_S);
+ lua_register_cocos2dx_Sprite3DMaterial(tolua_S);
lua_register_cocos2dx_DelayTime(tolua_S);
lua_register_cocos2dx_LabelAtlas(tolua_S);
lua_register_cocos2dx_SpriteBatchNode(tolua_S);
diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
index 320c7d6f91..791c882ddb 100644
--- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
+++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
@@ -2113,6 +2113,14 @@ int register_all_cocos2dx(lua_State* tolua_S);
+
+
+
+
+
+
+
+