Merge pull request #11193 from CocosRobot/update_lua_bindings_1427435046

[AUTO]: updating luabinding automatically
This commit is contained in:
minggo 2015-03-27 15:26:36 +08:00
commit 3c3163d7dd
13 changed files with 23 additions and 26 deletions

View File

@ -57,7 +57,7 @@
-- @return Action#Action self (return value: cc.Action)
--------------------------------
-- Return certain target..<br>
-- Return certain target.<br>
-- return A certain target.
-- @function [parent=#Action] getTarget
-- @param self

View File

@ -65,7 +65,7 @@
--------------------------------
-- Sets the delay in seconds of the "delay unit".<br>
-- param setDelayPerUnit The delay in seconds of the "delay unit".
-- param delayPerUnit The delay in seconds of the "delay unit".
-- @function [parent=#Animation] setDelayPerUnit
-- @param self
-- @param #float delayPerUnit

View File

@ -11,12 +11,13 @@
--------------------------------
-- Sets the current playback position of an audio instance.<br>
-- param audioID An audioID returned by the play2d function.<br>
-- param audioID An audioID returned by the play2d function.<br>
-- param sec The offset in seconds from the start to seek to.<br>
-- return
-- @function [parent=#AudioEngine] setCurrentTime
-- @param self
-- @param #int audioID
-- @param #float time
-- @param #float sec
-- @return bool#bool ret (return value: bool)
--------------------------------

View File

@ -22,7 +22,7 @@
--------------------------------
-- Initializes the action with a duration and an array of points.<br>
-- param duration In seconds.<br>
-- param point An PointArray.<br>
-- param points An PointArray.<br>
-- param tension Goodness of fit.
-- @function [parent=#CardinalSplineTo] initWithDuration
-- @param self

View File

@ -25,13 +25,14 @@
-- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState)
--------------------------------
--
-- Apply user defined uniforms.
-- @function [parent=#GLProgramState] applyUniforms
-- @param self
-- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState)
--------------------------------
--
-- Apply GLProgram, and built in uniforms.<br>
-- param modelView The applied modelView matrix to shader.
-- @function [parent=#GLProgramState] applyGLProgram
-- @param self
-- @param #mat4_table modelView
@ -44,7 +45,8 @@
-- @return long#long ret (return value: long)
--------------------------------
--
-- Apply attributes.<br>
-- param applyAttribFlags Call GL::enableVertexAttribs(_vertexAttribsFlags) or not.
-- @function [parent=#GLProgramState] applyAttributes
-- @param self
-- @return GLProgramState#GLProgramState self (return value: cc.GLProgramState)
@ -115,14 +117,8 @@
-- @return unsigned int#unsigned int ret (return value: unsigned int)
--------------------------------
-- @{<br>
-- Apply GLProgram, attributes and uniforms.<br>
-- `apply` function will apply all the states, include GLProgram, attributes and uniforms.<br>
-- `applyGLProgram` function will apply GLProgram and built in uniform.<br>
-- `applyAttributes` will apply the vertex attributes.<br>
-- `applyUniforms` will apply user defined uniforms.<br>
-- param The applied modelView matrix to shader.<br>
-- param applyAttribFlags Call GL::enableVertexAttribs(_vertexAttribsFlags) or not.
-- param modelView The applied modelView matrix to shader.
-- @function [parent=#GLProgramState] apply
-- @param self
-- @param #mat4_table modelView

View File

@ -9,9 +9,9 @@
-- param t Duration in seconds.<br>
-- param radius The start radius.<br>
-- param deltaRadius The delta radius.<br>
-- param angelZ The start Angel in Z.<br>
-- param angleZ The start Angel in Z.<br>
-- param deltaAngleZ The delta angle in Z.<br>
-- param angelX The start Angel in X.<br>
-- param angleX The start Angel in X.<br>
-- param deltaAngleX The delta angle in X.<br>
-- return An OrbitCamera.
-- @function [parent=#OrbitCamera] create

View File

@ -306,7 +306,7 @@
--------------------------------
-- brief Set the body mass.<br>
-- attension If you need add/subtract mass to body, don't use setMass(getMass() +/- mass), because the mass of body may be equal to PHYSICS_INFINITY, it will cause some unexpected result, please use addMass() instead.
-- attention If you need add/subtract mass to body, don't use setMass(getMass() +/- mass), because the mass of body may be equal to PHYSICS_INFINITY, it will cause some unexpected result, please use addMass() instead.
-- @function [parent=#PhysicsBody] setMass
-- @param self
-- @param #float mass

View File

@ -6,7 +6,7 @@
--------------------------------
-- Get this box's width and height.<br>
-- preturn An Size object.
-- return An Size object.
-- @function [parent=#PhysicsShapeBox] getSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)

View File

@ -6,7 +6,7 @@
--------------------------------
-- Get this chain's points array count.<br>
-- preturn An interger number.
-- return An interger number.
-- @function [parent=#PhysicsShapeEdgeChain] getPointsCount
-- @param self
-- @return int#int ret (return value: int)

View File

@ -6,7 +6,7 @@
--------------------------------
-- Get this polygon's points array count.<br>
-- preturn An interger number.
-- return An interger number.
-- @function [parent=#PhysicsShapeEdgePolygon] getPointsCount
-- @param self
-- @return int#int ret (return value: int)

View File

@ -6,7 +6,7 @@
--------------------------------
-- Get this polygon's points array count.<br>
-- preturn An interger number.
-- return An interger number.
-- @function [parent=#PhysicsShapePolygon] getPointsCount
-- @param self
-- @return int#int ret (return value: int)

View File

@ -18,7 +18,7 @@
--------------------------------
-- Clears the texture with a specified stencil value.<br>
-- param A specified stencil value.
-- param stencilValue A specified stencil value.
-- @function [parent=#RenderTexture] clearStencil
-- @param self
-- @param #int stencilValue
@ -54,7 +54,7 @@
--------------------------------
-- Sets the Sprite being used. <br>
-- param A Sprite.
-- param sprite A Sprite.
-- @function [parent=#RenderTexture] setSprite
-- @param self
-- @param #cc.Sprite sprite
@ -146,7 +146,7 @@
--------------------------------
-- Clears the texture with a specified depth value. <br>
-- param A specified depth value.
-- param depthValue A specified depth value.
-- @function [parent=#RenderTexture] clearDepth
-- @param self
-- @param #float depthValue

View File

@ -46,7 +46,7 @@
--------------------------------
-- Set the group name. <br>
-- param groupname A string,it is used to set the group name.
-- param groupName A string,it is used to set the group name.
-- @function [parent=#TMXObjectGroup] setGroupName
-- @param self
-- @param #string groupName