Merge pull request #10762 from CocosRobot/update_lua_bindings_1425867910

[AUTO]: updating luabinding automatically
This commit is contained in:
minggo 2015-03-09 10:54:06 +08:00
commit 6d2e6b97ec
6 changed files with 1580 additions and 682 deletions

View File

@ -5,77 +5,36 @@
-- @parent_module cc
--------------------------------
-- Set the maximum velocity a particle can have.
-- @function [parent=#PUParticleSystem3D] setMaxVelocity
-- @param self
-- @param #float maxVelocity
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
-- Returns the velocity scale, defined in the particle system, but passed to the technique for convenience.
-- Returns the velocity scale, defined in the particle system, but passed to the technique for convenience.
-- @function [parent=#PUParticleSystem3D] getParticleSystemScaleVelocity
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] getDerivedPosition
-- @function [parent=#PUParticleSystem3D] setEmittedSystemQuota
-- @param self
-- @return vec3_table#vec3_table ret (return value: vec3_table)
--------------------------------
-- If the orientation of the particle system has been changed since the last update, the passed vector<br>
-- is rotated accordingly.
-- @function [parent=#PUParticleSystem3D] rotationOffset
-- @param self
-- @param #vec3_table pos
-- @param #unsigned int quota
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] getDefaultWidth
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] setParticleSystemScaleVelocity
-- @param self
-- @param #float scaleVelocity
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
-- add particle affector
-- @function [parent=#PUParticleSystem3D] addEmitter
-- @param self
-- @param #cc.PUParticle3DEmitter emitter
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] getDerivedScale
-- @param self
-- @return vec3_table#vec3_table ret (return value: vec3_table)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] getDefaultHeight
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] setDefaultHeight
-- @param self
-- @param #float height
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- default particle depth
-- @function [parent=#PUParticleSystem3D] getDefaultDepth
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] getEmittedSystemQuota
-- @param self
-- @return unsigned int#unsigned int ret (return value: unsigned int)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] clearAllParticles
-- @param self
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] getMaterialName
@ -84,9 +43,21 @@
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] setDefaultWidth
-- @function [parent=#PUParticleSystem3D] calulateRotationOffset
-- @param self
-- @param #float width
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
-- Return the maximum velocity a particle can have, even if the velocity of the particle has been set higher (either by initialisation of the particle or by means of an affector).
-- @function [parent=#PUParticleSystem3D] getMaxVelocity
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] forceUpdate
-- @param self
-- @param #float delta
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
@ -95,6 +66,94 @@
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] removeAllBehaviourTemplate
-- @param self
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] getEmittedEmitterQuota
-- @param self
-- @return unsigned int#unsigned int ret (return value: unsigned int)
--------------------------------
-- Forces emission of particles.<br>
-- remarks The number of requested particles are the exact number that are emitted. No down-scalling is applied.
-- @function [parent=#PUParticleSystem3D] forceEmission
-- @param self
-- @param #cc.PUEmitter emitter
-- @param #unsigned int requested
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] addListener
-- @param self
-- @param #cc.PUListener listener
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] isMarkedForEmission
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- default particle width
-- @function [parent=#PUParticleSystem3D] getDefaultWidth
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] setEmittedEmitterQuota
-- @param self
-- @param #unsigned int quota
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] setMarkedForEmission
-- @param self
-- @param #bool isMarked
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] clone
-- @param self
-- @return PUParticleSystem3D#PUParticleSystem3D ret (return value: cc.PUParticleSystem3D)
--------------------------------
-- add particle affector
-- @function [parent=#PUParticleSystem3D] addEmitter
-- @param self
-- @param #cc.PUEmitter emitter
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] addBehaviourTemplate
-- @param self
-- @param #cc.PUBehaviour behaviour
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] setDefaultWidth
-- @param self
-- @param #float width
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] copyAttributesTo
-- @param self
-- @param #cc.PUParticleSystem3D system
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] setMaterialName
@ -102,6 +161,90 @@
-- @param #string name
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] getParentParticleSystem
-- @param self
-- @return PUParticleSystem3D#PUParticleSystem3D ret (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] removeListener
-- @param self
-- @param #cc.PUListener listener
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
-- Set the maximum velocity a particle can have.
-- @function [parent=#PUParticleSystem3D] setMaxVelocity
-- @param self
-- @param #float maxVelocity
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
-- default particle height
-- @function [parent=#PUParticleSystem3D] getDefaultHeight
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] getDerivedPosition
-- @param self
-- @return vec3_table#vec3_table ret (return value: vec3_table)
--------------------------------
-- If the orientation of the particle system has been changed since the last update, the passed vector is rotated accordingly.
-- @function [parent=#PUParticleSystem3D] rotationOffset
-- @param self
-- @param #vec3_table pos
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] removeAllEmitter
-- @param self
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] setParticleSystemScaleVelocity
-- @param self
-- @param #float scaleVelocity
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] getDerivedScale
-- @param self
-- @return vec3_table#vec3_table ret (return value: vec3_table)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] setDefaultHeight
-- @param self
-- @param #float height
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] removeAllListener
-- @param self
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] makeParticleLocal
-- @param self
-- @param #cc.PUParticle3D particle
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] removerAllObserver
-- @param self
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] setDefaultDepth
@ -110,11 +253,11 @@
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
-- Return the maximum velocity a particle can have, even if the velocity of the particle has been set higher (either by <br>
-- initialisation of the particle or by means of an affector).
-- @function [parent=#PUParticleSystem3D] getMaxVelocity
--
-- @function [parent=#PUParticleSystem3D] addObserver
-- @param self
-- @return float#float ret (return value: float)
-- @param #cc.PUObserver observer
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
-- @overload self, string
@ -126,6 +269,15 @@
-- @param #string materialPath
-- @return PUParticleSystem3D#PUParticleSystem3D ret (return value: cc.PUParticleSystem3D)
--------------------------------
--
-- @function [parent=#PUParticleSystem3D] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #mat4_table transform
-- @param #unsigned int flags
-- @return PUParticleSystem3D#PUParticleSystem3D self (return value: cc.PUParticleSystem3D)
--------------------------------
-- particle system play control
-- @function [parent=#PUParticleSystem3D] startParticleSystem

View File

@ -1,43 +0,0 @@
--------------------------------
-- @module ParticlePool
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ParticlePool] lockLatestParticle
-- @param self
-- @return ParticlePool#ParticlePool self (return value: cc.ParticlePool)
--------------------------------
--
-- @function [parent=#ParticlePool] lockAllParticles
-- @param self
-- @return ParticlePool#ParticlePool self (return value: cc.ParticlePool)
--------------------------------
--
-- @function [parent=#ParticlePool] addParticle
-- @param self
-- @param #cc.Particle3D particle
-- @return ParticlePool#ParticlePool self (return value: cc.ParticlePool)
--------------------------------
--
-- @function [parent=#ParticlePool] empty
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ParticlePool] removeAllParticles
-- @param self
-- @return ParticlePool#ParticlePool self (return value: cc.ParticlePool)
--------------------------------
--
-- @function [parent=#ParticlePool] ParticlePool
-- @param self
-- @return ParticlePool#ParticlePool self (return value: cc.ParticlePool)
return nil

View File

@ -12,19 +12,19 @@
-- @return ParticleSystem3D#ParticleSystem3D self (return value: cc.ParticleSystem3D)
--------------------------------
--
-- get particle quota
-- @function [parent=#ParticleSystem3D] getParticleQuota
-- @param self
-- @return unsigned int#unsigned int ret (return value: unsigned int)
--------------------------------
--
-- override function
-- @function [parent=#ParticleSystem3D] getBlendFunc
-- @param self
-- @return BlendFunc#BlendFunc ret (return value: cc.BlendFunc)
--------------------------------
--
-- set particle quota
-- @function [parent=#ParticleSystem3D] setParticleQuota
-- @param self
-- @param #unsigned int quota
@ -37,7 +37,7 @@
-- @return ParticleSystem3D#ParticleSystem3D self (return value: cc.ParticleSystem3D)
--------------------------------
--
-- override function
-- @function [parent=#ParticleSystem3D] setBlendFunc
-- @param self
-- @param #cc.BlendFunc blendFunc
@ -51,7 +51,7 @@
-- @return ParticleSystem3D#ParticleSystem3D self (return value: cc.ParticleSystem3D)
--------------------------------
--
-- is enabled
-- @function [parent=#ParticleSystem3D] isEnabled
-- @param self
-- @return bool#bool ret (return value: bool)
@ -63,7 +63,7 @@
-- @return ParticleSystem3D#ParticleSystem3D self (return value: cc.ParticleSystem3D)
--------------------------------
-- Enables or disables the system.
-- Enables or disables the system.
-- @function [parent=#ParticleSystem3D] setEnabled
-- @param self
-- @param #bool enabled
@ -96,7 +96,7 @@
-- @return ParticleSystem3D#ParticleSystem3D self (return value: cc.ParticleSystem3D)
--------------------------------
--
-- get particle playing state
-- @function [parent=#ParticleSystem3D] getState
-- @param self
-- @return int#int ret (return value: int)
@ -121,13 +121,13 @@
-- @return ParticleSystem3D#ParticleSystem3D self (return value: cc.ParticleSystem3D)
--------------------------------
--
-- get alive particles count
-- @function [parent=#ParticleSystem3D] getAliveParticleCount
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- override function
-- @function [parent=#ParticleSystem3D] draw
-- @param self
-- @param #cc.Renderer renderer
@ -136,7 +136,7 @@
-- @return ParticleSystem3D#ParticleSystem3D self (return value: cc.ParticleSystem3D)
--------------------------------
--
-- override function
-- @function [parent=#ParticleSystem3D] update
-- @param self
-- @param #float delta

View File

@ -86,11 +86,6 @@
-- @field [parent=#cc] EventListenerAssetsManagerEx#EventListenerAssetsManagerEx EventListenerAssetsManagerEx preloaded module
--------------------------------------------------------
-- the cc ParticlePool
-- @field [parent=#cc] ParticlePool#ParticlePool ParticlePool preloaded module
--------------------------------------------------------
-- the cc ParticleSystem3D
-- @field [parent=#cc] ParticleSystem3D#ParticleSystem3D ParticleSystem3D preloaded module

View File

@ -322,6 +322,21 @@ int register_all_cocos2dx_extension(lua_State* tolua_S);