Merge pull request #8098 from CocosRobot/update_lua_bindings_1411009391

[AUTO]: updating luabinding automatically

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

@@ -4,6 +4,18 @@
 -- @extend GridBase
 -- @parent_module cc
 
+--------------------------------
+-- 
+-- @function [parent=#Grid3D] getNeedDepthTestForBlit 
+-- @param self
+-- @return bool#bool ret (return value: bool)
+        
+--------------------------------
+-- 
+-- @function [parent=#Grid3D] setNeedDepthTestForBlit 
+-- @param self
+-- @param #bool neededDepthTest
+        
 --------------------------------
 -- @overload self, size_table         
 -- @overload self, size_table, cc.Texture2D, bool         
@@ -21,7 +33,12 @@
         
 --------------------------------
 -- 
--- @function [parent=#Grid3D] blit 
+-- @function [parent=#Grid3D] beforeBlit 
+-- @param self
+        
+--------------------------------
+-- 
+-- @function [parent=#Grid3D] afterBlit 
 -- @param self
         
 --------------------------------
@@ -29,6 +46,11 @@
 -- @function [parent=#Grid3D] reuse 
 -- @param self
         
+--------------------------------
+-- 
+-- @function [parent=#Grid3D] blit 
+-- @param self
+        
 --------------------------------
 -- js ctor
 -- @function [parent=#Grid3D] Grid3D 

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

@@ -12,7 +12,7 @@
         
 --------------------------------
 -- 
--- @function [parent=#GridBase] calculateVertexPoints 
+-- @function [parent=#GridBase] afterBlit 
 -- @param self
         
 --------------------------------
@@ -26,6 +26,11 @@
 -- @function [parent=#GridBase] beforeDraw 
 -- @param self
         
+--------------------------------
+-- 
+-- @function [parent=#GridBase] calculateVertexPoints 
+-- @param self
+        
 --------------------------------
 --  is texture flipped 
 -- @function [parent=#GridBase] isTextureFlipped 
@@ -88,6 +93,11 @@
 -- @param #bool flipped
 -- @return bool#bool ret (retunr value: bool)
 
+--------------------------------
+-- 
+-- @function [parent=#GridBase] beforeBlit 
+-- @param self
+        
 --------------------------------
 -- 
 -- @function [parent=#GridBase] setReuseGrid 

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

@@ -4,6 +4,12 @@
 -- @extend Grid3DAction
 -- @parent_module cc
 
+--------------------------------
+-- 
+-- @function [parent=#PageTurn3D] getGrid 
+-- @param self
+-- @return GridBase#GridBase ret (return value: cc.GridBase)
+        
 --------------------------------
 --  create the action 
 -- @function [parent=#PageTurn3D] create 

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

@@ -29944,6 +29944,50 @@ int lua_register_cocos2dx_Twirl(lua_State* tolua_S)
     return 1;
 }
 
+int lua_cocos2dx_PageTurn3D_getGrid(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::PageTurn3D* 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.PageTurn3D",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::PageTurn3D*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_PageTurn3D_getGrid'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+            return 0;
+        cocos2d::GridBase* ret = cobj->getGrid();
+        object_to_luaval<cocos2d::GridBase>(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret);
+        return 1;
+    }
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PageTurn3D:getGrid",argc, 0);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_PageTurn3D_getGrid'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_PageTurn3D_create(lua_State* tolua_S)
 {
     int argc = 0;
@@ -29991,6 +30035,7 @@ int lua_register_cocos2dx_PageTurn3D(lua_State* tolua_S)
     tolua_cclass(tolua_S,"PageTurn3D","cc.PageTurn3D","cc.Grid3DAction",nullptr);
 
     tolua_beginmodule(tolua_S,"PageTurn3D");
+        tolua_function(tolua_S,"getGrid",lua_cocos2dx_PageTurn3D_getGrid);
         tolua_function(tolua_S,"create", lua_cocos2dx_PageTurn3D_create);
     tolua_endmodule(tolua_S);
     std::string typeName = typeid(cocos2d::PageTurn3D).name();
@@ -56087,7 +56132,7 @@ int lua_cocos2dx_GridBase_setGridSize(lua_State* tolua_S)
 
     return 0;
 }
-int lua_cocos2dx_GridBase_calculateVertexPoints(lua_State* tolua_S)
+int lua_cocos2dx_GridBase_afterBlit(lua_State* tolua_S)
 {
     int argc = 0;
     cocos2d::GridBase* cobj = nullptr;
@@ -56107,7 +56152,7 @@ int lua_cocos2dx_GridBase_calculateVertexPoints(lua_State* tolua_S)
 #if COCOS2D_DEBUG >= 1
     if (!cobj) 
     {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GridBase_calculateVertexPoints'", nullptr);
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GridBase_afterBlit'", nullptr);
         return 0;
     }
 #endif
@@ -56117,15 +56162,15 @@ int lua_cocos2dx_GridBase_calculateVertexPoints(lua_State* tolua_S)
     {
         if(!ok)
             return 0;
-        cobj->calculateVertexPoints();
+        cobj->afterBlit();
         return 0;
     }
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:calculateVertexPoints",argc, 0);
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:afterBlit",argc, 0);
     return 0;
 
 #if COCOS2D_DEBUG >= 1
     tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GridBase_calculateVertexPoints'.",&tolua_err);
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GridBase_afterBlit'.",&tolua_err);
 #endif
 
     return 0;
@@ -56219,6 +56264,49 @@ int lua_cocos2dx_GridBase_beforeDraw(lua_State* tolua_S)
 
     return 0;
 }
+int lua_cocos2dx_GridBase_calculateVertexPoints(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::GridBase* 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.GridBase",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::GridBase*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GridBase_calculateVertexPoints'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+            return 0;
+        cobj->calculateVertexPoints();
+        return 0;
+    }
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:calculateVertexPoints",argc, 0);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GridBase_calculateVertexPoints'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_GridBase_isTextureFlipped(lua_State* tolua_S)
 {
     int argc = 0;
@@ -56682,6 +56770,49 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S)
 
     return 0;
 }
+int lua_cocos2dx_GridBase_beforeBlit(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::GridBase* 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.GridBase",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::GridBase*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GridBase_beforeBlit'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+            return 0;
+        cobj->beforeBlit();
+        return 0;
+    }
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:beforeBlit",argc, 0);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GridBase_beforeBlit'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_GridBase_setReuseGrid(lua_State* tolua_S)
 {
     int argc = 0;
@@ -56882,9 +57013,10 @@ int lua_register_cocos2dx_GridBase(lua_State* tolua_S)
 
     tolua_beginmodule(tolua_S,"GridBase");
         tolua_function(tolua_S,"setGridSize",lua_cocos2dx_GridBase_setGridSize);
-        tolua_function(tolua_S,"calculateVertexPoints",lua_cocos2dx_GridBase_calculateVertexPoints);
+        tolua_function(tolua_S,"afterBlit",lua_cocos2dx_GridBase_afterBlit);
         tolua_function(tolua_S,"afterDraw",lua_cocos2dx_GridBase_afterDraw);
         tolua_function(tolua_S,"beforeDraw",lua_cocos2dx_GridBase_beforeDraw);
+        tolua_function(tolua_S,"calculateVertexPoints",lua_cocos2dx_GridBase_calculateVertexPoints);
         tolua_function(tolua_S,"isTextureFlipped",lua_cocos2dx_GridBase_isTextureFlipped);
         tolua_function(tolua_S,"getGridSize",lua_cocos2dx_GridBase_getGridSize);
         tolua_function(tolua_S,"getStep",lua_cocos2dx_GridBase_getStep);
@@ -56895,6 +57027,7 @@ int lua_register_cocos2dx_GridBase(lua_State* tolua_S)
         tolua_function(tolua_S,"setActive",lua_cocos2dx_GridBase_setActive);
         tolua_function(tolua_S,"getReuseGrid",lua_cocos2dx_GridBase_getReuseGrid);
         tolua_function(tolua_S,"initWithSize",lua_cocos2dx_GridBase_initWithSize);
+        tolua_function(tolua_S,"beforeBlit",lua_cocos2dx_GridBase_beforeBlit);
         tolua_function(tolua_S,"setReuseGrid",lua_cocos2dx_GridBase_setReuseGrid);
         tolua_function(tolua_S,"isActive",lua_cocos2dx_GridBase_isActive);
         tolua_function(tolua_S,"reuse",lua_cocos2dx_GridBase_reuse);
@@ -56906,6 +57039,96 @@ int lua_register_cocos2dx_GridBase(lua_State* tolua_S)
     return 1;
 }
 
+int lua_cocos2dx_Grid3D_getNeedDepthTestForBlit(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::Grid3D* 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.Grid3D",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::Grid3D*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Grid3D_getNeedDepthTestForBlit'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+            return 0;
+        bool ret = cobj->getNeedDepthTestForBlit();
+        tolua_pushboolean(tolua_S,(bool)ret);
+        return 1;
+    }
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Grid3D:getNeedDepthTestForBlit",argc, 0);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Grid3D_getNeedDepthTestForBlit'.",&tolua_err);
+#endif
+
+    return 0;
+}
+int lua_cocos2dx_Grid3D_setNeedDepthTestForBlit(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::Grid3D* 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.Grid3D",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::Grid3D*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Grid3D_setNeedDepthTestForBlit'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 1) 
+    {
+        bool arg0;
+
+        ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Grid3D:setNeedDepthTestForBlit");
+        if(!ok)
+            return 0;
+        cobj->setNeedDepthTestForBlit(arg0);
+        return 0;
+    }
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Grid3D:setNeedDepthTestForBlit",argc, 1);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Grid3D_setNeedDepthTestForBlit'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_Grid3D_create(lua_State* tolua_S)
 {
     int argc = 0;
@@ -57007,6 +57230,8 @@ int lua_register_cocos2dx_Grid3D(lua_State* tolua_S)
 
     tolua_beginmodule(tolua_S,"Grid3D");
         tolua_function(tolua_S,"new",lua_cocos2dx_Grid3D_constructor);
+        tolua_function(tolua_S,"getNeedDepthTestForBlit",lua_cocos2dx_Grid3D_getNeedDepthTestForBlit);
+        tolua_function(tolua_S,"setNeedDepthTestForBlit",lua_cocos2dx_Grid3D_setNeedDepthTestForBlit);
         tolua_function(tolua_S,"create", lua_cocos2dx_Grid3D_create);
     tolua_endmodule(tolua_S);
     std::string typeName = typeid(cocos2d::Grid3D).name();

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

@@ -1564,6 +1564,11 @@ int register_all_cocos2dx(lua_State* tolua_S);
 
 
 
+
+
+
+
+