From 07d1a54a922c45b843c44621522cc65e296fafa1 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Fri, 28 Mar 2014 08:20:29 +0000 Subject: [PATCH] [AUTO]: updating luabinding automatically --- cocos/scripting/lua-bindings/auto/api/Label.lua | 10 +++++----- .../scripting/lua-bindings/auto/api/LabelBMFont.lua | 10 ++++++++++ cocos/scripting/lua-bindings/auto/api/LabelTTF.lua | 13 +++++++++---- .../auto/lua_cocos2dx_auto.cpp.REMOVED.git-id | 2 +- .../lua-bindings/auto/lua_cocos2dx_auto.hpp | 1 - 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/cocos/scripting/lua-bindings/auto/api/Label.lua b/cocos/scripting/lua-bindings/auto/api/Label.lua index 391d6113bb..789d48198f 100644 --- a/cocos/scripting/lua-bindings/auto/api/Label.lua +++ b/cocos/scripting/lua-bindings/auto/api/Label.lua @@ -94,11 +94,6 @@ -- @param self -- @return FontDefinition#FontDefinition ret (return value: cc.FontDefinition) --------------------------------- --- @function [parent=#Label] getBoundingBox --- @param self --- @return rect_table#rect_table ret (return value: rect_table) - -------------------------------- -- @function [parent=#Label] getFontName -- @param self @@ -343,6 +338,11 @@ -- @param self -- @return size_table#size_table ret (return value: size_table) +-------------------------------- +-- @function [parent=#Label] getBoundingBox +-- @param self +-- @return rect_table#rect_table ret (return value: rect_table) + -------------------------------- -- @function [parent=#Label] updateDisplayedColor -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua b/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua index 825ce15f51..5c7e05d03a 100644 --- a/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua +++ b/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua @@ -89,6 +89,11 @@ -- @param #point_table point -- @return LabelBMFont#LabelBMFont ret (retunr value: cc.LabelBMFont) +-------------------------------- +-- @function [parent=#LabelBMFont] getBoundingBox +-- @param self +-- @return rect_table#rect_table ret (return value: rect_table) + -------------------------------- -- @function [parent=#LabelBMFont] getDescription -- @param self @@ -105,6 +110,11 @@ -- @param #int int -- @return Node#Node ret (return value: cc.Node) +-------------------------------- +-- @function [parent=#LabelBMFont] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + -------------------------------- -- @function [parent=#LabelBMFont] LabelBMFont -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/LabelTTF.lua b/cocos/scripting/lua-bindings/auto/api/LabelTTF.lua index a6a0ab9aa1..59ac364dab 100644 --- a/cocos/scripting/lua-bindings/auto/api/LabelTTF.lua +++ b/cocos/scripting/lua-bindings/auto/api/LabelTTF.lua @@ -163,11 +163,9 @@ -- @return LabelTTF#LabelTTF ret (return value: cc.LabelTTF) -------------------------------- --- @function [parent=#LabelTTF] visit +-- @function [parent=#LabelTTF] getBoundingBox -- @param self --- @param #cc.Renderer renderer --- @param #kmMat4 kmmat4 --- @param #bool bool +-- @return rect_table#rect_table ret (return value: rect_table) -------------------------------- -- @function [parent=#LabelTTF] getDescription @@ -179,6 +177,13 @@ -- @param self -- @return size_table#size_table ret (return value: size_table) +-------------------------------- +-- @function [parent=#LabelTTF] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + -------------------------------- -- @function [parent=#LabelTTF] LabelTTF -- @param self diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp.REMOVED.git-id b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp.REMOVED.git-id index a9cb83db7d..3bc115b36a 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp.REMOVED.git-id +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp.REMOVED.git-id @@ -1 +1 @@ -7aff65efe54886d705b227ba45205bc6d4f8a650 \ No newline at end of file +55307bad4398fdd7bedf9a96f00adb57cbaa7d2e \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index 682e55e5be..87bbdf1c67 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -1561,7 +1561,6 @@ int register_all_cocos2dx(lua_State* tolua_S); - #endif // __cocos2dx_h__