Merge pull request #11142 from CocosRobot/update_lua_bindings_1427255864

[AUTO]: updating luabinding automatically
This commit is contained in:
minggo 2015-03-25 13:36:49 +08:00
commit 518536964f
12 changed files with 144 additions and 93 deletions

View File

@ -5,20 +5,23 @@
-- @parent_module cc
--------------------------------
--
-- Gets the event type of the controller.<br>
-- return The event type of the controller.
-- @function [parent=#EventController] getControllerEventType
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- Sets the connect status.<br>
-- param True if it's connected.
-- @function [parent=#EventController] setConnectStatus
-- @param self
-- @param #bool isConnected
-- @return EventController#EventController self (return value: cc.EventController)
--------------------------------
--
-- Gets the connect status.<br>
-- return True if it's connected.
-- @function [parent=#EventController] isConnected
-- @param self
-- @return bool#bool ret (return value: bool)
@ -37,7 +40,8 @@
-- @return Controller#Controller ret (return value: cc.Controller)
--------------------------------
--
-- Gets the key code of the controller.<br>
-- return The key code of the controller.
-- @function [parent=#EventController] getKeyCode
-- @param self
-- @return int#int ret (return value: int)

View File

@ -13,7 +13,8 @@
--------------------------------
-- Constructor.<br>
-- param eventName A given name of the custom event.
-- param eventName A given name of the custom event.<br>
-- js ctor
-- @function [parent=#EventCustom] EventCustom
-- @param self
-- @param #string eventName

View File

@ -7,7 +7,8 @@
--------------------------------
-- Constructor.<br>
-- param widgetLoseFocus The widget which lose focus.<br>
-- param widgetGetFocus The widget which get focus.
-- param widgetGetFocus The widget which get focus.<br>
-- js ctor
-- @function [parent=#EventFocus] EventFocus
-- @param self
-- @param #ccui.Widget widgetLoseFocus

View File

@ -7,7 +7,8 @@
--------------------------------
-- Constructor.<br>
-- param keyCode A given keycode.<br>
-- param isPressed True if the key is pressed.
-- param isPressed True if the key is pressed.<br>
-- js ctor
-- @function [parent=#EventKeyboard] EventKeyboard
-- @param self
-- @param #int keyCode

View File

@ -6,7 +6,8 @@
--------------------------------
-- Returns the previous touch location in screen coordinates.<br>
-- return The previous touch location in screen coordinates.
-- return The previous touch location in screen coordinates.<br>
-- js NA
-- @function [parent=#EventMouse] getPreviousLocationInView
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
@ -20,14 +21,16 @@
--------------------------------
-- Get mouse button.<br>
-- return The mouse button.
-- return The mouse button.<br>
-- js getButton
-- @function [parent=#EventMouse] getMouseButton
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Returns the previous touch location in OpenGL coordinates.<br>
-- return The previous touch location in OpenGL coordinates.
-- return The previous touch location in OpenGL coordinates.<br>
-- js NA
-- @function [parent=#EventMouse] getPreviousLocation
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
@ -51,21 +54,24 @@
--------------------------------
-- Returns the start touch location in screen coordinates.<br>
-- return The start touch location in screen coordinates.
-- return The start touch location in screen coordinates.<br>
-- js NA
-- @function [parent=#EventMouse] getStartLocationInView
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
-- Returns the start touch location in OpenGL coordinates.<br>
-- return The start touch location in OpenGL coordinates.
-- return The start touch location in OpenGL coordinates.<br>
-- js NA
-- @function [parent=#EventMouse] getStartLocation
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
-- Set mouse button.<br>
-- param button a given mouse button.
-- param button a given mouse button.<br>
-- js setButton
-- @function [parent=#EventMouse] setMouseButton
-- @param self
-- @param #int button
@ -94,14 +100,16 @@
--------------------------------
-- Get the cursor position of x axis.<br>
-- return The x coordinate of cursor position.
-- return The x coordinate of cursor position.<br>
-- js getLocationX
-- @function [parent=#EventMouse] getCursorX
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Get the cursor position of y axis.<br>
-- return The y coordinate of cursor position.
-- return The y coordinate of cursor position.<br>
-- js getLocationY
-- @function [parent=#EventMouse] getCursorY
-- @param self
-- @return float#float ret (return value: float)
@ -109,7 +117,8 @@
--------------------------------
-- Set the cursor position.<br>
-- param x The x coordinate of cursor position.<br>
-- param y The y coordinate of cursor position.
-- param y The y coordinate of cursor position.<br>
-- js setLocation
-- @function [parent=#EventMouse] setCursorPosition
-- @param self
-- @param #float x
@ -118,7 +127,8 @@
--------------------------------
-- Constructor.<br>
-- param mouseEventCode A given mouse event type.
-- param mouseEventCode A given mouse event type.<br>
-- js ctor
-- @function [parent=#EventMouse] EventMouse
-- @param self
-- @param #int mouseEventCode

View File

@ -20,7 +20,8 @@
-- @return EventTouch#EventTouch self (return value: cc.EventTouch)
--------------------------------
-- Constructor.
-- Constructor.<br>
-- js NA
-- @function [parent=#EventTouch] EventTouch
-- @param self
-- @return EventTouch#EventTouch self (return value: cc.EventTouch)

View File

@ -11,7 +11,8 @@
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @{<br>
-- Getter and Setter for depth test state when blit.
-- @function [parent=#Grid3D] setNeedDepthTestForBlit
-- @param self
-- @param #bool neededDepthTest
@ -34,7 +35,8 @@
-- @return Grid3D#Grid3D self (return value: cc.Grid3D)
--------------------------------
--
-- @{<br>
-- Implementations for interfaces in base calss.
-- @function [parent=#Grid3D] beforeBlit
-- @param self
-- @return Grid3D#Grid3D self (return value: cc.Grid3D)
@ -58,6 +60,7 @@
-- @return Grid3D#Grid3D self (return value: cc.Grid3D)
--------------------------------
-- Constructor.<br>
-- js ctor
-- @function [parent=#Grid3D] Grid3D
-- @param self

View File

@ -5,7 +5,7 @@
-- @parent_module cc
--------------------------------
--
-- Set the size of the grid.
-- @function [parent=#GridBase] setGridSize
-- @param self
-- @param #size_table gridSize
@ -25,57 +25,58 @@
-- @return GridBase#GridBase self (return value: cc.GridBase)
--------------------------------
--
-- @{<br>
-- Init and reset the status when render effects by using the grid.
-- @function [parent=#GridBase] beforeDraw
-- @param self
-- @return GridBase#GridBase self (return value: cc.GridBase)
--------------------------------
--
-- Interface, Calculate the vertices used for the blit.
-- @function [parent=#GridBase] calculateVertexPoints
-- @param self
-- @return GridBase#GridBase self (return value: cc.GridBase)
--------------------------------
-- is texture flipped
-- is texture flipped.
-- @function [parent=#GridBase] isTextureFlipped
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- size of the grid
-- Size of the grid.
-- @function [parent=#GridBase] getGridSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
-- pixels between the grids
-- Pixels between the grids.
-- @function [parent=#GridBase] getStep
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- Change projection to 2D for grabbing.
-- @function [parent=#GridBase] set2DProjection
-- @param self
-- @return GridBase#GridBase self (return value: cc.GridBase)
--------------------------------
--
-- Get the pixels between the grids.
-- @function [parent=#GridBase] setStep
-- @param self
-- @param #vec2_table step
-- @return GridBase#GridBase self (return value: cc.GridBase)
--------------------------------
--
-- Set the texture flipped or not.
-- @function [parent=#GridBase] setTextureFlipped
-- @param self
-- @param #bool flipped
-- @return GridBase#GridBase self (return value: cc.GridBase)
--------------------------------
--
-- Interface used to blit the texture with grid to screen.
-- @function [parent=#GridBase] blit
-- @param self
-- @return GridBase#GridBase self (return value: cc.GridBase)
@ -88,7 +89,7 @@
-- @return GridBase#GridBase self (return value: cc.GridBase)
--------------------------------
-- number of times that the grid will be reused
-- Get number of times that the grid will be reused.
-- @function [parent=#GridBase] getReuseGrid
-- @param self
-- @return int#int ret (return value: int)
@ -104,26 +105,28 @@
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @{<br>
-- Interface for custom action when before or after draw.
-- @function [parent=#GridBase] beforeBlit
-- @param self
-- @return GridBase#GridBase self (return value: cc.GridBase)
--------------------------------
--
-- Set number of times that the grid will be reused.
-- @function [parent=#GridBase] setReuseGrid
-- @param self
-- @param #int reuseGrid
-- @return GridBase#GridBase self (return value: cc.GridBase)
--------------------------------
-- whether or not the grid is active
-- @} @{<br>
-- Getter and setter of the active state of the grid.
-- @function [parent=#GridBase] isActive
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- Interface, Reuse the grid vertices.
-- @function [parent=#GridBase] reuse
-- @param self
-- @return GridBase#GridBase self (return value: cc.GridBase)

View File

@ -6,16 +6,16 @@
--------------------------------
-- Changes the progress direction of slider.<br>
-- param percent percent value from 1 to 100.
-- param percent Percent value from 1 to 100.
-- @function [parent=#Slider] setPercent
-- @param self
-- @param #int percent
-- @return Slider#Slider self (return value: ccui.Slider)
--------------------------------
-- Load dark state texture for slider ball.<br>
-- param disabled dark state texture.<br>
-- param texType @see TextureResType
-- Load disabled state texture for slider ball.<br>
-- param disabled Disabled state texture.<br>
-- param resType @see TextureResType .
-- @function [parent=#Slider] loadSlidBallTextureDisabled
-- @param self
-- @param #string disabled
@ -24,8 +24,8 @@
--------------------------------
-- Load normal state texture for slider ball.<br>
-- param normal normal state texture.<br>
-- param texType @see TextureResType
-- param normal Normal state texture.<br>
-- param resType @see TextureResType .
-- @function [parent=#Slider] loadSlidBallTextureNormal
-- @param self
-- @param #string normal
@ -34,8 +34,8 @@
--------------------------------
-- Load texture for slider bar.<br>
-- param fileName file name of texture.<br>
-- param texType @see TextureResType
-- param fileName File name of texture.<br>
-- param resType @see TextureResType .
-- @function [parent=#Slider] loadBarTexture
-- @param self
-- @param #string fileName
@ -44,8 +44,8 @@
--------------------------------
-- Load dark state texture for slider progress bar.<br>
-- param fileName file path of texture.<br>
-- param texType @see TextureResType
-- param fileName File path of texture.<br>
-- param resType @see TextureResType .
-- @function [parent=#Slider] loadProgressBarTexture
-- @param self
-- @param #string fileName
@ -54,10 +54,10 @@
--------------------------------
-- Load textures for slider ball.<br>
-- param slider ball normal normal state texture.<br>
-- param slider ball selected selected state texture.<br>
-- param slider ball disabled dark state texture.<br>
-- param texType @see TextureResType
-- param normal Normal state texture.<br>
-- param pressed Pressed state texture.<br>
-- param disabled Disabled state texture.<br>
-- param texType @see TextureResType .
-- @function [parent=#Slider] loadSlidBallTextures
-- @param self
-- @param #string normal
@ -67,30 +67,31 @@
-- @return Slider#Slider self (return value: ccui.Slider)
--------------------------------
-- Sets capinsets for slider, if slider is using scale9 renderer.<br>
-- param capInsets capinsets for slider
-- Sets capinsets for progress bar slider, if slider is using scale9 renderer.<br>
-- param capInsets Capinsets for progress bar slider.
-- @function [parent=#Slider] setCapInsetProgressBarRebderer
-- @param self
-- @param #rect_table capInsets
-- @return Slider#Slider self (return value: ccui.Slider)
--------------------------------
-- Sets capinsets for slider, if slider is using scale9 renderer.<br>
-- param capInsets capinsets for slider
-- Sets capinsets for bar slider, if slider is using scale9 renderer.<br>
-- param capInsets Capinsets for bar slider.
-- @function [parent=#Slider] setCapInsetsBarRenderer
-- @param self
-- @param #rect_table capInsets
-- @return Slider#Slider self (return value: ccui.Slider)
--------------------------------
--
-- Gets capinsets for progress bar slider, if slider is using scale9 renderer.<br>
-- return Capinsets for progress bar slider.
-- @function [parent=#Slider] getCapInsetsProgressBarRebderer
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
--------------------------------
-- Sets if slider is using scale9 renderer.<br>
-- param true that using scale9 renderer, false otherwise.
-- param able True that using scale9 renderer, false otherwise.
-- @function [parent=#Slider] setScale9Enabled
-- @param self
-- @param #bool able
@ -107,7 +108,7 @@
--------------------------------
-- Sets capinsets for slider, if slider is using scale9 renderer.<br>
-- param capInsets capinsets for slider
-- param capInsets Capinsets for slider.
-- @function [parent=#Slider] setCapInsets
-- @param self
-- @param #rect_table capInsets
@ -128,9 +129,9 @@
-- @return Slider#Slider self (return value: ccui.Slider)
--------------------------------
-- Load selected state texture for slider ball.<br>
-- param selected selected state texture.<br>
-- param texType @see TextureResType
-- Load pressed state texture for slider ball.<br>
-- param pressed Pressed state texture.<br>
-- param resType @see TextureResType .
-- @function [parent=#Slider] loadSlidBallTexturePressed
-- @param self
-- @param #string pressed
@ -138,20 +139,22 @@
-- @return Slider#Slider self (return value: ccui.Slider)
--------------------------------
--
-- Gets If slider is using scale9 renderer.<br>
-- return True that using scale9 renderer, false otherwise.
-- @function [parent=#Slider] isScale9Enabled
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- Gets capinsets for bar slider, if slider is using scale9 renderer.<br>
-- return capInsets Capinsets for bar slider.
-- @function [parent=#Slider] getCapInsetsBarRenderer
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
--------------------------------
-- Gets the progress direction of slider.<br>
-- return percent percent value from 1 to 100.
-- return percent Percent value from 1 to 100.
-- @function [parent=#Slider] getPercent
-- @param self
-- @return int#int ret (return value: int)
@ -205,7 +208,7 @@
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
-- Default constructor
-- Default constructor.
-- @function [parent=#Slider] Slider
-- @param self
-- @return Slider#Slider self (return value: ccui.Slider)

View File

@ -5,14 +5,18 @@
-- @parent_module ccui
--------------------------------
-- Enable shadow for the label<br>
-- todo support blur for shadow effect
-- Enable shadow for the label.<br>
-- todo support blur for shadow effect<br>
-- param shadowColor The color of shadow effect.<br>
-- param offset The offset of shadow effect.<br>
-- param blurRadius The blur radius of shadow effect.
-- @function [parent=#Text] enableShadow
-- @param self
-- @return Text#Text self (return value: ccui.Text)
--------------------------------
--
-- Gets the font size of label.<br>
-- return The font size.
-- @function [parent=#Text] getFontSize
-- @param self
-- @return int#int ret (return value: int)
@ -24,19 +28,21 @@
-- @return string#string ret (return value: string)
--------------------------------
-- disable shadow/outline/glow rendering
-- Disable shadow/outline/glow rendering.
-- @function [parent=#Text] disableEffect
-- @param self
-- @return Text#Text self (return value: ccui.Text)
--------------------------------
--
-- Gets text color.<br>
-- return Text color.
-- @function [parent=#Text] getTextColor
-- @param self
-- @return color4b_table#color4b_table ret (return value: color4b_table)
--------------------------------
--
-- Sets text vertical alignment.<br>
-- param alignment vertical text alignment type
-- @function [parent=#Text] setTextVerticalAlignment
-- @param self
-- @param #int alignment
@ -49,7 +55,7 @@
-- Usage: Text *text = Text::create("Hello", "Arial", 20);create a system font UIText<br>
-- text->setFontName("Marfelt"); it will change the font to system font no matter the previous font type is TTF or system font<br>
-- text->setFontName("xxxx/xxx.ttf");it will change the font to TTF font no matter the previous font type is TTF or system font<br>
-- param name font name.
-- param name Font name.
-- @function [parent=#Text] setFontName
-- @param self
-- @param #string name
@ -57,7 +63,7 @@
--------------------------------
-- Sets the touch scale enabled of label.<br>
-- param enabled touch scale enabled of label.
-- param enabled Touch scale enabled of label.
-- @function [parent=#Text] setTouchScaleChangeEnabled
-- @param self
-- @param #bool enabled
@ -72,22 +78,23 @@
--------------------------------
-- Gets the touch scale enabled of label.<br>
-- return touch scale enabled of label.
-- return Touch scale enabled of label.
-- @function [parent=#Text] isTouchScaleChangeEnabled
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- Gets the font name.<br>
-- return Font name.
-- @function [parent=#Text] getFontName
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
-- Set the rendering size of the text, you should call this method<br>
-- Sets the rendering size of the text, you should call this method<br>
-- along with calling `ignoreContentAdaptWithSize(false)`, otherwise the text area<br>
-- size is caculated by the real size of the text content<br>
-- param size The text rendering area size
-- size is caculated by the real size of the text content.<br>
-- param size The text rendering area size.
-- @function [parent=#Text] setTextAreaSize
-- @param self
-- @param #size_table size
@ -96,21 +103,24 @@
--------------------------------
-- Gets the string length of the label.<br>
-- Note: This length will be larger than the raw string length,<br>
-- if you want to get the raw string length, you should call this->getString().size() instead<br>
-- return string length.
-- if you want to get the raw string length, you should call this->getString().size() instead.<br>
-- return String length.
-- @function [parent=#Text] getStringLength
-- @param self
-- @return long#long ret (return value: long)
--------------------------------
--
-- Gets the render size in auto mode.<br>
-- return The size of render size in auto mode.
-- @function [parent=#Text] getAutoRenderSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
-- Enable outline for the label<br>
-- It only works on IOS and Android when you use System fonts
-- Enable outline for the label.<br>
-- It only works on IOS and Android when you use System fonts.<br>
-- param outlineColor The color of outline.<br>
-- param outlineSize The size of outline.
-- @function [parent=#Text] enableOutline
-- @param self
-- @param #color4b_table outlineColor
@ -118,53 +128,60 @@
-- @return Text#Text self (return value: ccui.Text)
--------------------------------
--
-- Gets the font type.<br>
-- return The font type.
-- @function [parent=#Text] getType
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- Gets text horizontal alignment.<br>
-- return Horizontal text alignment type
-- @function [parent=#Text] getTextHorizontalAlignment
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Sets the font size of label.<br>
-- param size font size.
-- param size The font size.
-- @function [parent=#Text] setFontSize
-- @param self
-- @param #int size
-- @return Text#Text self (return value: ccui.Text)
--------------------------------
--
-- Sets text color.<br>
-- param color Text color.
-- @function [parent=#Text] setTextColor
-- @param self
-- @param #color4b_table color
-- @return Text#Text self (return value: ccui.Text)
--------------------------------
-- only support for TTF
-- Only support for TTF.<br>
-- param glowColor The color of glow.
-- @function [parent=#Text] enableGlow
-- @param self
-- @param #color4b_table glowColor
-- @return Text#Text self (return value: ccui.Text)
--------------------------------
--
-- Gets text vertical alignment.<br>
-- return Vertical text alignment type
-- @function [parent=#Text] getTextVerticalAlignment
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- Return the text rendering area size.<br>
-- return The text rendering area size.
-- @function [parent=#Text] getTextAreaSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
--
-- Sets text horizontal alignment.<br>
-- param alignment Horizontal text alignment type
-- @function [parent=#Text] setTextHorizontalAlignment
-- @param self
-- @param #int alignment
@ -205,7 +222,7 @@
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
-- Default constructor
-- Default constructor.
-- @function [parent=#Text] Text
-- @param self
-- @return Text#Text self (return value: ccui.Text)

View File

@ -27,7 +27,12 @@
-- @return TextAtlas#TextAtlas self (return value: ccui.TextAtlas)
--------------------------------
-- initializes the LabelAtlas with a string, a char map file(the atlas), the width and height of each element and the starting char of the atlas
-- Initializes the LabelAtlas with a string, a char map file(the atlas), the width and height of each element and the starting char of the atlas.<br>
-- param stringValue A given string needs to be displayed.<br>
-- param charMapFile A given char map file name.<br>
-- param itemWidth The element width.<br>
-- param itemHeight The element height.<br>
-- param startCharMap The starting char of the atlas.
-- @function [parent=#TextAtlas] setProperty
-- @param self
-- @param #string stringValue
@ -80,7 +85,7 @@
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
-- Default constructor
-- Default constructor.
-- @function [parent=#TextAtlas] TextAtlas
-- @param self
-- @return TextAtlas#TextAtlas self (return value: ccui.TextAtlas)

View File

@ -21,7 +21,8 @@
-- @return TiledGrid3D#TiledGrid3D self (return value: cc.TiledGrid3D)
--------------------------------
--
-- @{<br>
-- Implementations for interfaces in base calss.
-- @function [parent=#TiledGrid3D] blit
-- @param self
-- @return TiledGrid3D#TiledGrid3D self (return value: cc.TiledGrid3D)
@ -33,6 +34,7 @@
-- @return TiledGrid3D#TiledGrid3D self (return value: cc.TiledGrid3D)
--------------------------------
-- Constructor.<br>
-- js ctor
-- @function [parent=#TiledGrid3D] TiledGrid3D
-- @param self