Merge pull request #10269 from CocosRobot/update_lua_bindings_1422498336

[AUTO]: updating luabinding automatically

cocos/scripting/lua-bindings/auto/api/AsyncTaskPool.lua

@@ -0,0 +1,26 @@
+
+--------------------------------
+-- @module AsyncTaskPool
+-- @parent_module cc
+
+--------------------------------
+-- stop tasks<br>
+-- param type task type you want to stop
+-- @function [parent=#AsyncTaskPool] stopTasks 
+-- @param self
+-- @param #int type
+-- @return AsyncTaskPool#AsyncTaskPool self (return value: cc.AsyncTaskPool)
+        
+--------------------------------
+-- destroy instance
+-- @function [parent=#AsyncTaskPool] destoryInstance 
+-- @param self
+-- @return AsyncTaskPool#AsyncTaskPool self (return value: cc.AsyncTaskPool)
+        
+--------------------------------
+-- get instance
+-- @function [parent=#AsyncTaskPool] getInstance 
+-- @param self
+-- @return AsyncTaskPool#AsyncTaskPool ret (return value: cc.AsyncTaskPool)
+        
+return nil

cocos/scripting/lua-bindings/auto/api/Sprite3D.lua

@@ -127,17 +127,6 @@
 -- @param #string texturePath
 -- @return Sprite3D#Sprite3D ret (return value: cc.Sprite3D)
 
---------------------------------
--- @overload self, string, string, function, void         
--- @overload self, string, function, void         
--- @function [parent=#Sprite3D] createAsync
--- @param self
--- @param #string modelPath
--- @param #string texturePath
--- @param #function callback
--- @param #void callbackparam
--- @return Sprite3D#Sprite3D self (return value: cc.Sprite3D)
-
 --------------------------------
 -- Returns 2d bounding-box<br>
 -- Note: the bouding-box is just get from the AABB which as Z=0, so that is not very accurate.

cocos/scripting/lua-bindings/auto/api/Sprite3DCache.lua

@@ -0,0 +1,31 @@
+
+--------------------------------
+-- @module Sprite3DCache
+-- @parent_module cc
+
+--------------------------------
+-- 
+-- @function [parent=#Sprite3DCache] removeSprite3DData 
+-- @param self
+-- @param #string key
+-- @return Sprite3DCache#Sprite3DCache self (return value: cc.Sprite3DCache)
+        
+--------------------------------
+-- 
+-- @function [parent=#Sprite3DCache] removeAllSprite3DData 
+-- @param self
+-- @return Sprite3DCache#Sprite3DCache self (return value: cc.Sprite3DCache)
+        
+--------------------------------
+-- 
+-- @function [parent=#Sprite3DCache] destroyInstance 
+-- @param self
+-- @return Sprite3DCache#Sprite3DCache self (return value: cc.Sprite3DCache)
+        
+--------------------------------
+-- get & destroy
+-- @function [parent=#Sprite3DCache] getInstance 
+-- @param self
+-- @return Sprite3DCache#Sprite3DCache ret (return value: cc.Sprite3DCache)
+        
+return nil

cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_3d_auto_api.lua

@@ -11,6 +11,11 @@
 -- @field [parent=#cc] Sprite3D#Sprite3D Sprite3D preloaded module
 
 
+--------------------------------------------------------
+-- the cc Sprite3DCache
+-- @field [parent=#cc] Sprite3DCache#Sprite3DCache Sprite3DCache preloaded module
+
+
 --------------------------------------------------------
 -- the cc Mesh
 -- @field [parent=#cc] Mesh#Mesh Mesh preloaded module

cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua

@@ -1246,4 +1246,9 @@
 -- @field [parent=#cc] Component#Component Component preloaded module
 
 
+--------------------------------------------------------
+-- the cc AsyncTaskPool
+-- @field [parent=#cc] AsyncTaskPool#AsyncTaskPool AsyncTaskPool preloaded module
+
+
 return nil

cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp

@@ -1267,79 +1267,6 @@ int lua_cocos2dx_3d_Sprite3D_create(lua_State* tolua_S)
 #endif
     return 0;
 }
-int lua_cocos2dx_3d_Sprite3D_createAsync(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.Sprite3D",0,&tolua_err)) goto tolua_lerror;
-#endif
-
-    argc = lua_gettop(tolua_S)-1;
-
-    do 
-    {
-        if (argc == 4)
-        {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:createAsync");
-            if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Sprite3D:createAsync");
-            if (!ok) { break; }
-            std::function<void (cocos2d::Sprite3D *, void *)> arg2;
-            do {
-			// Lambda binding for lua is not supported.
-			assert(false);
-		} while(0)
-		;
-            if (!ok) { break; }
-            void* arg3;
-            #pragma warning NO CONVERSION TO NATIVE FOR void*
-		ok = false;
-            if (!ok) { break; }
-            cocos2d::Sprite3D::createAsync(arg0, arg1, arg2, arg3);
-            lua_settop(tolua_S, 1);
-            return 1;
-        }
-    } while (0);
-    ok  = true;
-    do 
-    {
-        if (argc == 3)
-        {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:createAsync");
-            if (!ok) { break; }
-            std::function<void (cocos2d::Sprite3D *, void *)> arg1;
-            do {
-			// Lambda binding for lua is not supported.
-			assert(false);
-		} while(0)
-		;
-            if (!ok) { break; }
-            void* arg2;
-            #pragma warning NO CONVERSION TO NATIVE FOR void*
-		ok = false;
-            if (!ok) { break; }
-            cocos2d::Sprite3D::createAsync(arg0, arg1, arg2);
-            lua_settop(tolua_S, 1);
-            return 1;
-        }
-    } while (0);
-    ok  = true;
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d", "cc.Sprite3D:createAsync",argc, 3);
-    return 0;
-#if COCOS2D_DEBUG >= 1
-    tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_createAsync'.",&tolua_err);
-#endif
-    return 0;
-}
 static int lua_cocos2dx_3d_Sprite3D_finalize(lua_State* tolua_S)
 {
     printf("luabindings: finalizing LUA object (Sprite3D)");
@@ -1370,7 +1297,6 @@ int lua_register_cocos2dx_3d_Sprite3D(lua_State* tolua_S)
         tolua_function(tolua_S,"getMeshByName",lua_cocos2dx_3d_Sprite3D_getMeshByName);
         tolua_function(tolua_S,"getAttachNode",lua_cocos2dx_3d_Sprite3D_getAttachNode);
         tolua_function(tolua_S,"create", lua_cocos2dx_3d_Sprite3D_create);
-        tolua_function(tolua_S,"createAsync", lua_cocos2dx_3d_Sprite3D_createAsync);
     tolua_endmodule(tolua_S);
     std::string typeName = typeid(cocos2d::Sprite3D).name();
     g_luaType[typeName] = "cc.Sprite3D";
@@ -1378,6 +1304,194 @@ int lua_register_cocos2dx_3d_Sprite3D(lua_State* tolua_S)
     return 1;
 }
 
+int lua_cocos2dx_3d_Sprite3DCache_removeSprite3DData(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::Sprite3DCache* 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.Sprite3DCache",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::Sprite3DCache*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Sprite3DCache_removeSprite3DData'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 1) 
+    {
+        std::string arg0;
+
+        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3DCache:removeSprite3DData");
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Sprite3DCache_removeSprite3DData'", nullptr);
+            return 0;
+        }
+        cobj->removeSprite3DData(arg0);
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3DCache:removeSprite3DData",argc, 1);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3DCache_removeSprite3DData'.",&tolua_err);
+#endif
+
+    return 0;
+}
+int lua_cocos2dx_3d_Sprite3DCache_removeAllSprite3DData(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::Sprite3DCache* 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.Sprite3DCache",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::Sprite3DCache*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Sprite3DCache_removeAllSprite3DData'", 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_Sprite3DCache_removeAllSprite3DData'", nullptr);
+            return 0;
+        }
+        cobj->removeAllSprite3DData();
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3DCache:removeAllSprite3DData",argc, 0);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3DCache_removeAllSprite3DData'.",&tolua_err);
+#endif
+
+    return 0;
+}
+int lua_cocos2dx_3d_Sprite3DCache_destroyInstance(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.Sprite3DCache",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_3d_Sprite3DCache_destroyInstance'", nullptr);
+            return 0;
+        }
+        cocos2d::Sprite3DCache::destroyInstance();
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Sprite3DCache:destroyInstance",argc, 0);
+    return 0;
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3DCache_destroyInstance'.",&tolua_err);
+#endif
+    return 0;
+}
+int lua_cocos2dx_3d_Sprite3DCache_getInstance(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.Sprite3DCache",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_3d_Sprite3DCache_getInstance'", nullptr);
+            return 0;
+        }
+        cocos2d::Sprite3DCache* ret = cocos2d::Sprite3DCache::getInstance();
+        object_to_luaval<cocos2d::Sprite3DCache>(tolua_S, "cc.Sprite3DCache",(cocos2d::Sprite3DCache*)ret);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Sprite3DCache:getInstance",argc, 0);
+    return 0;
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3DCache_getInstance'.",&tolua_err);
+#endif
+    return 0;
+}
+static int lua_cocos2dx_3d_Sprite3DCache_finalize(lua_State* tolua_S)
+{
+    printf("luabindings: finalizing LUA object (Sprite3DCache)");
+    return 0;
+}
+
+int lua_register_cocos2dx_3d_Sprite3DCache(lua_State* tolua_S)
+{
+    tolua_usertype(tolua_S,"cc.Sprite3DCache");
+    tolua_cclass(tolua_S,"Sprite3DCache","cc.Sprite3DCache","",nullptr);
+
+    tolua_beginmodule(tolua_S,"Sprite3DCache");
+        tolua_function(tolua_S,"removeSprite3DData",lua_cocos2dx_3d_Sprite3DCache_removeSprite3DData);
+        tolua_function(tolua_S,"removeAllSprite3DData",lua_cocos2dx_3d_Sprite3DCache_removeAllSprite3DData);
+        tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_3d_Sprite3DCache_destroyInstance);
+        tolua_function(tolua_S,"getInstance", lua_cocos2dx_3d_Sprite3DCache_getInstance);
+    tolua_endmodule(tolua_S);
+    std::string typeName = typeid(cocos2d::Sprite3DCache).name();
+    g_luaType[typeName] = "cc.Sprite3DCache";
+    g_typeCast["Sprite3DCache"] = "cc.Sprite3DCache";
+    return 1;
+}
+
 int lua_cocos2dx_3d_Mesh_getMeshVertexAttribCount(lua_State* tolua_S)
 {
     int argc = 0;
@@ -2881,6 +2995,7 @@ TOLUA_API int register_all_cocos2dx_3d(lua_State* tolua_S)
 	lua_register_cocos2dx_3d_Animate3D(tolua_S);
 	lua_register_cocos2dx_3d_Sprite3D(tolua_S);
 	lua_register_cocos2dx_3d_AttachNode(tolua_S);
+	lua_register_cocos2dx_3d_Sprite3DCache(tolua_S);
 	lua_register_cocos2dx_3d_BillBoard(tolua_S);
 	lua_register_cocos2dx_3d_Animation3D(tolua_S);
 	lua_register_cocos2dx_3d_Skeleton3D(tolua_S);

cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp

@@ -67,6 +67,10 @@ int register_all_cocos2dx_3d(lua_State* tolua_S);
 
 
 
+
+
+
+
 
 
 

cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp

@@ -1,6 +1,7 @@
 #include "lua_cocos2dx_auto.hpp"
 #include "cocos2d.h"
 #include "CCProtectedNode.h"
+#include "CCAsyncTaskPool.h"
 #include "tolua_fix.h"
 #include "LuaBasicConversions.h"
 
@@ -72824,6 +72825,146 @@ int lua_register_cocos2dx_Component(lua_State* tolua_S)
     g_typeCast["Component"] = "cc.Component";
     return 1;
 }
+
+int lua_cocos2dx_AsyncTaskPool_stopTasks(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::AsyncTaskPool* 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.AsyncTaskPool",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::AsyncTaskPool*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_AsyncTaskPool_stopTasks'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 1) 
+    {
+        cocos2d::AsyncTaskPool::TaskType arg0;
+
+        ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.AsyncTaskPool:stopTasks");
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AsyncTaskPool_stopTasks'", nullptr);
+            return 0;
+        }
+        cobj->stopTasks(arg0);
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.AsyncTaskPool:stopTasks",argc, 1);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_AsyncTaskPool_stopTasks'.",&tolua_err);
+#endif
+
+    return 0;
+}
+int lua_cocos2dx_AsyncTaskPool_destoryInstance(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.AsyncTaskPool",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_AsyncTaskPool_destoryInstance'", nullptr);
+            return 0;
+        }
+        cocos2d::AsyncTaskPool::destoryInstance();
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AsyncTaskPool:destoryInstance",argc, 0);
+    return 0;
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_AsyncTaskPool_destoryInstance'.",&tolua_err);
+#endif
+    return 0;
+}
+int lua_cocos2dx_AsyncTaskPool_getInstance(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.AsyncTaskPool",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_AsyncTaskPool_getInstance'", nullptr);
+            return 0;
+        }
+        cocos2d::AsyncTaskPool* ret = cocos2d::AsyncTaskPool::getInstance();
+        object_to_luaval<cocos2d::AsyncTaskPool>(tolua_S, "cc.AsyncTaskPool",(cocos2d::AsyncTaskPool*)ret);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AsyncTaskPool:getInstance",argc, 0);
+    return 0;
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_AsyncTaskPool_getInstance'.",&tolua_err);
+#endif
+    return 0;
+}
+static int lua_cocos2dx_AsyncTaskPool_finalize(lua_State* tolua_S)
+{
+    printf("luabindings: finalizing LUA object (AsyncTaskPool)");
+    return 0;
+}
+
+int lua_register_cocos2dx_AsyncTaskPool(lua_State* tolua_S)
+{
+    tolua_usertype(tolua_S,"cc.AsyncTaskPool");
+    tolua_cclass(tolua_S,"AsyncTaskPool","cc.AsyncTaskPool","",nullptr);
+
+    tolua_beginmodule(tolua_S,"AsyncTaskPool");
+        tolua_function(tolua_S,"stopTasks",lua_cocos2dx_AsyncTaskPool_stopTasks);
+        tolua_function(tolua_S,"destoryInstance", lua_cocos2dx_AsyncTaskPool_destoryInstance);
+        tolua_function(tolua_S,"getInstance", lua_cocos2dx_AsyncTaskPool_getInstance);
+    tolua_endmodule(tolua_S);
+    std::string typeName = typeid(cocos2d::AsyncTaskPool).name();
+    g_luaType[typeName] = "cc.AsyncTaskPool";
+    g_typeCast["AsyncTaskPool"] = "cc.AsyncTaskPool";
+    return 1;
+}
 TOLUA_API int register_all_cocos2dx(lua_State* tolua_S)
 {
 	tolua_open(tolua_S);
@@ -72925,6 +73066,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S)
 	lua_register_cocos2dx_Application(tolua_S);
 	lua_register_cocos2dx_DelayTime(tolua_S);
 	lua_register_cocos2dx_LabelAtlas(tolua_S);
+	lua_register_cocos2dx_AsyncTaskPool(tolua_S);
 	lua_register_cocos2dx_ParticleSnow(tolua_S);
 	lua_register_cocos2dx_EaseElasticIn(tolua_S);
 	lua_register_cocos2dx_EaseCircleActionInOut(tolua_S);

cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp

@@ -1637,6 +1637,10 @@ int register_all_cocos2dx(lua_State* tolua_S);
 
 
 
+
+
+
+