Merge pull request #7973 from CocosRobot/update_lua_bindings_1410244922

[AUTO]: updating luabinding automatically

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

@@ -38,34 +38,45 @@
 -- @param #float duration
 -- @return Animate3D#Animate3D ret (retunr value: cc.Animate3D)
 
+--------------------------------
+--  animate transistion time 
+-- @function [parent=#Animate3D] getTransitionTime 
+-- @param self
+-- @return float#float ret (return value: float)
+        
 --------------------------------
 -- 
 -- @function [parent=#Animate3D] startWithTarget 
 -- @param self
 -- @param #cc.Node target
         
---------------------------------
--- 
--- @function [parent=#Animate3D] step 
--- @param self
--- @param #float dt
-        
---------------------------------
--- 
--- @function [parent=#Animate3D] clone 
--- @param self
--- @return Animate3D#Animate3D ret (return value: cc.Animate3D)
-        
 --------------------------------
 -- 
 -- @function [parent=#Animate3D] reverse 
 -- @param self
 -- @return Animate3D#Animate3D ret (return value: cc.Animate3D)
         
+--------------------------------
+-- 
+-- @function [parent=#Animate3D] clone 
+-- @param self
+-- @return Animate3D#Animate3D ret (return value: cc.Animate3D)
+        
+--------------------------------
+-- 
+-- @function [parent=#Animate3D] stop 
+-- @param self
+        
 --------------------------------
 -- 
 -- @function [parent=#Animate3D] update 
 -- @param self
 -- @param #float t
         
+--------------------------------
+-- 
+-- @function [parent=#Animate3D] step 
+-- @param self
+-- @param #float dt
+        
 return nil

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

@@ -18,7 +18,7 @@
         
 --------------------------------
 -- 
--- @function [parent=#TextField] getStringValue 
+-- @function [parent=#TextField] getString 
 -- @param self
 -- @return string#string ret (return value: string)
         
@@ -64,6 +64,12 @@
 -- @param self
 -- @param #bool insertText
         
+--------------------------------
+-- 
+-- @function [parent=#TextField] setString 
+-- @param self
+-- @param #string text
+        
 --------------------------------
 -- 
 -- @function [parent=#TextField] getDetachWithIME 
@@ -195,12 +201,6 @@
 -- @param self
 -- @param #bool detach
         
---------------------------------
--- 
--- @function [parent=#TextField] setText 
--- @param self
--- @param #string text
-        
 --------------------------------
 -- 
 -- @function [parent=#TextField] setTouchAreaEnabled 

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

@@ -2225,6 +2225,37 @@ int lua_cocos2dx_3d_Animate3D_create(lua_State* tolua_S)
 #endif
     return 0;
 }
+int lua_cocos2dx_3d_Animate3D_getTransitionTime(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.Animate3D",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    argc = lua_gettop(tolua_S) - 1;
+
+    if (argc == 0)
+    {
+        if(!ok)
+            return 0;
+        double ret = cocos2d::Animate3D::getTransitionTime();
+        tolua_pushnumber(tolua_S,(lua_Number)ret);
+        return 1;
+    }
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Animate3D:getTransitionTime",argc, 0);
+    return 0;
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animate3D_getTransitionTime'.",&tolua_err);
+#endif
+    return 0;
+}
 static int lua_cocos2dx_3d_Animate3D_finalize(lua_State* tolua_S)
 {
     printf("luabindings: finalizing LUA object (Animate3D)");
@@ -2242,6 +2273,7 @@ int lua_register_cocos2dx_3d_Animate3D(lua_State* tolua_S)
         tolua_function(tolua_S,"getSpeed",lua_cocos2dx_3d_Animate3D_getSpeed);
         tolua_function(tolua_S,"getWeight",lua_cocos2dx_3d_Animate3D_getWeight);
         tolua_function(tolua_S,"create", lua_cocos2dx_3d_Animate3D_create);
+        tolua_function(tolua_S,"getTransitionTime", lua_cocos2dx_3d_Animate3D_getTransitionTime);
     tolua_endmodule(tolua_S);
     std::string typeName = typeid(cocos2d::Animate3D).name();
     g_luaType[typeName] = "cc.Animate3D";

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

@@ -63,6 +63,7 @@ int register_all_cocos2dx_3d(lua_State* tolua_S);
 
 
 
+
 
 
 #endif // __cocos2dx_3d_h__

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

@@ -13516,7 +13516,7 @@ int lua_cocos2dx_ui_TextField_getFontSize(lua_State* tolua_S)
 
     return 0;
 }
-int lua_cocos2dx_ui_TextField_getStringValue(lua_State* tolua_S)
+int lua_cocos2dx_ui_TextField_getString(lua_State* tolua_S)
 {
     int argc = 0;
     cocos2d::ui::TextField* cobj = nullptr;
@@ -13536,7 +13536,7 @@ int lua_cocos2dx_ui_TextField_getStringValue(lua_State* tolua_S)
 #if COCOS2D_DEBUG >= 1
     if (!cobj) 
     {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_getStringValue'", nullptr);
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_getString'", nullptr);
         return 0;
     }
 #endif
@@ -13546,16 +13546,16 @@ int lua_cocos2dx_ui_TextField_getStringValue(lua_State* tolua_S)
     {
         if(!ok)
             return 0;
-        const std::string& ret = cobj->getStringValue();
+        const std::string& ret = cobj->getString();
         tolua_pushcppstring(tolua_S,ret);
         return 1;
     }
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getStringValue",argc, 0);
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getString",argc, 0);
     return 0;
 
 #if COCOS2D_DEBUG >= 1
     tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_getStringValue'.",&tolua_err);
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_getString'.",&tolua_err);
 #endif
 
     return 0;
@@ -13874,6 +13874,52 @@ int lua_cocos2dx_ui_TextField_setInsertText(lua_State* tolua_S)
 
     return 0;
 }
+int lua_cocos2dx_ui_TextField_setString(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::ui::TextField* cobj = nullptr;
+    bool ok  = true;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"ccui.TextField",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::ui::TextField*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_setString'", 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, "ccui.TextField:setString");
+        if(!ok)
+            return 0;
+        cobj->setString(arg0);
+        return 0;
+    }
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setString",argc, 1);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_setString'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_ui_TextField_getDetachWithIME(lua_State* tolua_S)
 {
     int argc = 0;
@@ -14875,52 +14921,6 @@ int lua_cocos2dx_ui_TextField_setDetachWithIME(lua_State* tolua_S)
 
     return 0;
 }
-int lua_cocos2dx_ui_TextField_setText(lua_State* tolua_S)
-{
-    int argc = 0;
-    cocos2d::ui::TextField* cobj = nullptr;
-    bool ok  = true;
-
-#if COCOS2D_DEBUG >= 1
-    tolua_Error tolua_err;
-#endif
-
-
-#if COCOS2D_DEBUG >= 1
-    if (!tolua_isusertype(tolua_S,1,"ccui.TextField",0,&tolua_err)) goto tolua_lerror;
-#endif
-
-    cobj = (cocos2d::ui::TextField*)tolua_tousertype(tolua_S,1,0);
-
-#if COCOS2D_DEBUG >= 1
-    if (!cobj) 
-    {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_setText'", 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, "ccui.TextField:setText");
-        if(!ok)
-            return 0;
-        cobj->setText(arg0);
-        return 0;
-    }
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setText",argc, 1);
-    return 0;
-
-#if COCOS2D_DEBUG >= 1
-    tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_setText'.",&tolua_err);
-#endif
-
-    return 0;
-}
 int lua_cocos2dx_ui_TextField_setTouchAreaEnabled(lua_State* tolua_S)
 {
     int argc = 0;
@@ -15281,7 +15281,7 @@ int lua_register_cocos2dx_ui_TextField(lua_State* tolua_S)
         tolua_function(tolua_S,"new",lua_cocos2dx_ui_TextField_constructor);
         tolua_function(tolua_S,"setAttachWithIME",lua_cocos2dx_ui_TextField_setAttachWithIME);
         tolua_function(tolua_S,"getFontSize",lua_cocos2dx_ui_TextField_getFontSize);
-        tolua_function(tolua_S,"getStringValue",lua_cocos2dx_ui_TextField_getStringValue);
+        tolua_function(tolua_S,"getString",lua_cocos2dx_ui_TextField_getString);
         tolua_function(tolua_S,"setPasswordStyleText",lua_cocos2dx_ui_TextField_setPasswordStyleText);
         tolua_function(tolua_S,"getDeleteBackward",lua_cocos2dx_ui_TextField_getDeleteBackward);
         tolua_function(tolua_S,"getPlaceHolder",lua_cocos2dx_ui_TextField_getPlaceHolder);
@@ -15289,6 +15289,7 @@ int lua_register_cocos2dx_ui_TextField(lua_State* tolua_S)
         tolua_function(tolua_S,"setFontName",lua_cocos2dx_ui_TextField_setFontName);
         tolua_function(tolua_S,"getInsertText",lua_cocos2dx_ui_TextField_getInsertText);
         tolua_function(tolua_S,"setInsertText",lua_cocos2dx_ui_TextField_setInsertText);
+        tolua_function(tolua_S,"setString",lua_cocos2dx_ui_TextField_setString);
         tolua_function(tolua_S,"getDetachWithIME",lua_cocos2dx_ui_TextField_getDetachWithIME);
         tolua_function(tolua_S,"setTextVerticalAlignment",lua_cocos2dx_ui_TextField_setTextVerticalAlignment);
         tolua_function(tolua_S,"addEventListener",lua_cocos2dx_ui_TextField_addEventListener);
@@ -15311,7 +15312,6 @@ int lua_register_cocos2dx_ui_TextField(lua_State* tolua_S)
         tolua_function(tolua_S,"getMaxLength",lua_cocos2dx_ui_TextField_getMaxLength);
         tolua_function(tolua_S,"isMaxLengthEnabled",lua_cocos2dx_ui_TextField_isMaxLengthEnabled);
         tolua_function(tolua_S,"setDetachWithIME",lua_cocos2dx_ui_TextField_setDetachWithIME);
-        tolua_function(tolua_S,"setText",lua_cocos2dx_ui_TextField_setText);
         tolua_function(tolua_S,"setTouchAreaEnabled",lua_cocos2dx_ui_TextField_setTouchAreaEnabled);
         tolua_function(tolua_S,"hitTest",lua_cocos2dx_ui_TextField_hitTest);
         tolua_function(tolua_S,"setMaxLength",lua_cocos2dx_ui_TextField_setMaxLength);