Merge pull request #7110 from CocosRobot/update_lua_bindings_1403062939

[AUTO]: updating luabinding automatically
This commit is contained in:
minggo 2014-06-18 13:35:36 +08:00
commit a672f03382
26 changed files with 262 additions and 4715 deletions

View File

@ -46,11 +46,6 @@
-- @param self -- @param self
-- @return Bone#Bone ret (return value: ccs.Bone) -- @return Bone#Bone ret (return value: ccs.Bone)
--------------------------------
-- @function [parent=#Armature] setArmatureData
-- @param self
-- @param #ccs.ArmatureData armaturedata
-------------------------------- --------------------------------
-- @function [parent=#Armature] removeBone -- @function [parent=#Armature] removeBone
-- @param self -- @param self
@ -62,11 +57,6 @@
-- @param self -- @param self
-- @return BatchNode#BatchNode ret (return value: ccs.BatchNode) -- @return BatchNode#BatchNode ret (return value: ccs.BatchNode)
--------------------------------
-- @function [parent=#Armature] getName
-- @param self
-- @return string#string ret (return value: string)
-------------------------------- --------------------------------
-- overload function: init(string) -- overload function: init(string)
-- --
@ -95,9 +85,9 @@
-- @param #ccs.BatchNode batchnode -- @param #ccs.BatchNode batchnode
-------------------------------- --------------------------------
-- @function [parent=#Armature] setName -- @function [parent=#Armature] setArmatureData
-- @param self -- @param self
-- @param #string str -- @param #ccs.ArmatureData armaturedata
-------------------------------- --------------------------------
-- @function [parent=#Armature] addBone -- @function [parent=#Armature] addBone

View File

@ -51,11 +51,6 @@
-- @function [parent=#Bone] updateColor -- @function [parent=#Bone] updateColor
-- @param self -- @param self
--------------------------------
-- @function [parent=#Bone] getName
-- @param self
-- @return string#string ret (return value: string)
-------------------------------- --------------------------------
-- @function [parent=#Bone] setTransformDirty -- @function [parent=#Bone] setTransformDirty
-- @param self -- @param self
@ -101,11 +96,6 @@
-- @param #ccs.DisplayData displaydata -- @param #ccs.DisplayData displaydata
-- @param #int int -- @param #int int
--------------------------------
-- @function [parent=#Bone] setName
-- @param self
-- @param #string str
-------------------------------- --------------------------------
-- @function [parent=#Bone] removeFromParent -- @function [parent=#Bone] removeFromParent
-- @param self -- @param self

View File

@ -15,13 +15,6 @@
-- @param #char char -- @param #char char
-- @return bool#bool ret (return value: bool) -- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#GLProgram] setUniformLocationWithMatrix4fv
-- @param self
-- @param #int int
-- @param #float float
-- @param #unsigned int int
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] initWithFilenames -- @function [parent=#GLProgram] initWithFilenames
-- @param self -- @param self
@ -29,12 +22,6 @@
-- @param #string str -- @param #string str
-- @return bool#bool ret (return value: bool) -- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#GLProgram] getUniformLocationForName
-- @param self
-- @param #char char
-- @return int#int ret (return value: int)
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] use -- @function [parent=#GLProgram] use
-- @param self -- @param self
@ -44,12 +31,6 @@
-- @param self -- @param self
-- @return string#string ret (return value: string) -- @return string#string ret (return value: string)
--------------------------------
-- @function [parent=#GLProgram] getUniform
-- @param self
-- @param #string str
-- @return Uniform#Uniform ret (return value: cc.Uniform)
-------------------------------- --------------------------------
-- overload function: setUniformsForBuiltins(mat4_table) -- overload function: setUniformsForBuiltins(mat4_table)
-- --
@ -59,58 +40,16 @@
-- @param self -- @param self
-- @param #mat4_table mat4 -- @param #mat4_table mat4
--------------------------------
-- @function [parent=#GLProgram] setUniformLocationWith3i
-- @param self
-- @param #int int
-- @param #int int
-- @param #int int
-- @param #int int
--------------------------------
-- @function [parent=#GLProgram] setUniformLocationWith3iv
-- @param self
-- @param #int int
-- @param #int int
-- @param #unsigned int int
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] updateUniforms -- @function [parent=#GLProgram] updateUniforms
-- @param self -- @param self
--------------------------------
-- @function [parent=#GLProgram] setUniformLocationWith4iv
-- @param self
-- @param #int int
-- @param #int int
-- @param #unsigned int int
--------------------------------
-- @function [parent=#GLProgram] getUniformLocation
-- @param self
-- @param #string str
-- @return int#int ret (return value: int)
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] setUniformLocationWith1i -- @function [parent=#GLProgram] setUniformLocationWith1i
-- @param self -- @param self
-- @param #int int -- @param #int int
-- @param #int int -- @param #int int
--------------------------------
-- @function [parent=#GLProgram] setUniformLocationWith2iv
-- @param self
-- @param #int int
-- @param #int int
-- @param #unsigned int int
--------------------------------
-- @function [parent=#GLProgram] setUniformLocationWithMatrix3fv
-- @param self
-- @param #int int
-- @param #float float
-- @param #unsigned int int
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] reset -- @function [parent=#GLProgram] reset
-- @param self -- @param self
@ -127,40 +66,11 @@
-- @param #string str -- @param #string str
-- @return int#int ret (return value: int) -- @return int#int ret (return value: int)
--------------------------------
-- @function [parent=#GLProgram] getVertexAttrib
-- @param self
-- @param #string str
-- @return VertexAttrib#VertexAttrib ret (return value: cc.VertexAttrib)
--------------------------------
-- @function [parent=#GLProgram] setUniformLocationWithMatrix2fv
-- @param self
-- @param #int int
-- @param #float float
-- @param #unsigned int int
--------------------------------
-- @function [parent=#GLProgram] setUniformLocationWith4i
-- @param self
-- @param #int int
-- @param #int int
-- @param #int int
-- @param #int int
-- @param #int int
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] link -- @function [parent=#GLProgram] link
-- @param self -- @param self
-- @return bool#bool ret (return value: bool) -- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#GLProgram] setUniformLocationWith2i
-- @param self
-- @param #int int
-- @param #int int
-- @param #int int
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] createWithByteArrays -- @function [parent=#GLProgram] createWithByteArrays
-- @param self -- @param self

View File

@ -1,122 +0,0 @@
--------------------------------
-- @module LabelBMFont
-- @extend Node,LabelProtocol,BlendProtocol
--------------------------------
-- @function [parent=#LabelBMFont] setLineBreakWithoutSpace
-- @param self
-- @param #bool bool
--------------------------------
-- @function [parent=#LabelBMFont] getBlendFunc
-- @param self
-- @return BlendFunc#BlendFunc ret (return value: cc.BlendFunc)
--------------------------------
-- @function [parent=#LabelBMFont] isOpacityModifyRGB
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#LabelBMFont] getLetter
-- @param self
-- @param #int int
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
-- @function [parent=#LabelBMFont] getString
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
-- @function [parent=#LabelBMFont] setBlendFunc
-- @param self
-- @param #cc.BlendFunc blendfunc
--------------------------------
-- @function [parent=#LabelBMFont] setString
-- @param self
-- @param #string str
--------------------------------
-- @function [parent=#LabelBMFont] initWithString
-- @param self
-- @param #string str
-- @param #string str
-- @param #float float
-- @param #cc.TextHAlignment texthalignment
-- @param #vec2_table vec2
-- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#LabelBMFont] setOpacityModifyRGB
-- @param self
-- @param #bool bool
--------------------------------
-- @function [parent=#LabelBMFont] getFntFile
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
-- @function [parent=#LabelBMFont] setFntFile
-- @param self
-- @param #string str
-- @param #vec2_table vec2
--------------------------------
-- @function [parent=#LabelBMFont] setAlignment
-- @param self
-- @param #cc.TextHAlignment texthalignment
--------------------------------
-- @function [parent=#LabelBMFont] setWidth
-- @param self
-- @param #float float
--------------------------------
-- overload function: create()
--
-- overload function: create(string, string, float, cc.TextHAlignment, vec2_table)
--
-- @function [parent=#LabelBMFont] create
-- @param self
-- @param #string str
-- @param #string str
-- @param #float float
-- @param #cc.TextHAlignment texthalignment
-- @param #vec2_table vec2
-- @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
-- @return string#string ret (return value: string)
--------------------------------
-- @function [parent=#LabelBMFont] setColor
-- @param self
-- @param #color3b_table color3b
--------------------------------
-- @function [parent=#LabelBMFont] getChildByTag
-- @param self
-- @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
return nil

View File

@ -1,191 +0,0 @@
--------------------------------
-- @module LabelTTF
-- @extend Node,LabelProtocol,BlendProtocol
--------------------------------
-- @function [parent=#LabelTTF] enableShadow
-- @param self
-- @param #size_table size
-- @param #float float
-- @param #float float
-- @param #bool bool
--------------------------------
-- @function [parent=#LabelTTF] setDimensions
-- @param self
-- @param #size_table size
--------------------------------
-- @function [parent=#LabelTTF] getFontSize
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- @function [parent=#LabelTTF] getString
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
-- @function [parent=#LabelTTF] setFlippedY
-- @param self
-- @param #bool bool
--------------------------------
-- @function [parent=#LabelTTF] setFlippedX
-- @param self
-- @param #bool bool
--------------------------------
-- @function [parent=#LabelTTF] setTextDefinition
-- @param self
-- @param #cc.FontDefinition fontdefinition
--------------------------------
-- @function [parent=#LabelTTF] setFontName
-- @param self
-- @param #string str
--------------------------------
-- @function [parent=#LabelTTF] getHorizontalAlignment
-- @param self
-- @return TextHAlignment#TextHAlignment ret (return value: cc.TextHAlignment)
--------------------------------
-- @function [parent=#LabelTTF] initWithStringAndTextDefinition
-- @param self
-- @param #string str
-- @param #cc.FontDefinition fontdefinition
-- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#LabelTTF] setString
-- @param self
-- @param #string str
--------------------------------
-- @function [parent=#LabelTTF] initWithString
-- @param self
-- @param #string str
-- @param #string str
-- @param #float float
-- @param #size_table size
-- @param #cc.TextHAlignment texthalignment
-- @param #cc.TextVAlignment textvalignment
-- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#LabelTTF] setFontFillColor
-- @param self
-- @param #color3b_table color3b
-- @param #bool bool
--------------------------------
-- @function [parent=#LabelTTF] getBlendFunc
-- @param self
-- @return BlendFunc#BlendFunc ret (return value: cc.BlendFunc)
--------------------------------
-- @function [parent=#LabelTTF] enableStroke
-- @param self
-- @param #color3b_table color3b
-- @param #float float
-- @param #bool bool
--------------------------------
-- @function [parent=#LabelTTF] getDimensions
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
-- @function [parent=#LabelTTF] setVerticalAlignment
-- @param self
-- @param #cc.TextVAlignment textvalignment
--------------------------------
-- @function [parent=#LabelTTF] setFontSize
-- @param self
-- @param #float float
--------------------------------
-- @function [parent=#LabelTTF] getVerticalAlignment
-- @param self
-- @return TextVAlignment#TextVAlignment ret (return value: cc.TextVAlignment)
--------------------------------
-- @function [parent=#LabelTTF] getTextDefinition
-- @param self
-- @return FontDefinition#FontDefinition ret (return value: cc.FontDefinition)
--------------------------------
-- @function [parent=#LabelTTF] setBlendFunc
-- @param self
-- @param #cc.BlendFunc blendfunc
--------------------------------
-- @function [parent=#LabelTTF] getFontName
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
-- @function [parent=#LabelTTF] setHorizontalAlignment
-- @param self
-- @param #cc.TextHAlignment texthalignment
--------------------------------
-- @function [parent=#LabelTTF] disableShadow
-- @param self
--------------------------------
-- @function [parent=#LabelTTF] disableStroke
-- @param self
--------------------------------
-- overload function: create()
--
-- overload function: create(string, string, float, size_table, cc.TextHAlignment, cc.TextVAlignment)
--
-- @function [parent=#LabelTTF] create
-- @param self
-- @param #string str
-- @param #string str
-- @param #float float
-- @param #size_table size
-- @param #cc.TextHAlignment texthalignment
-- @param #cc.TextVAlignment textvalignment
-- @return LabelTTF#LabelTTF ret (retunr value: cc.LabelTTF)
--------------------------------
-- @function [parent=#LabelTTF] createWithFontDefinition
-- @param self
-- @param #string str
-- @param #cc.FontDefinition fontdefinition
-- @return LabelTTF#LabelTTF ret (return value: cc.LabelTTF)
--------------------------------
-- @function [parent=#LabelTTF] getBoundingBox
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
--------------------------------
-- @function [parent=#LabelTTF] getDescription
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
-- @function [parent=#LabelTTF] getContentSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
-- @function [parent=#LabelTTF] visit
-- @param self
-- @param #cc.Renderer renderer
-- @param #mat4_table mat4
-- @param #unsigned int int
--------------------------------
-- @function [parent=#LabelTTF] LabelTTF
-- @param self
return nil

View File

@ -71,6 +71,12 @@
-- @param self -- @param self
-- @return bool#bool ret (return value: bool) -- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#Node] getChildByName
-- @param self
-- @param #string str
-- @return Node#Node ret (return value: cc.Node)
-------------------------------- --------------------------------
-- @function [parent=#Node] updateDisplayedOpacity -- @function [parent=#Node] updateDisplayedOpacity
-- @param self -- @param self
@ -202,6 +208,11 @@
-- @param self -- @param self
-- @param #cc.Node node -- @param #cc.Node node
--------------------------------
-- @function [parent=#Node] getName
-- @param self
-- @return string#string ret (return value: string)
-------------------------------- --------------------------------
-- @function [parent=#Node] getRotation3D -- @function [parent=#Node] getRotation3D
-- @param self -- @param self
@ -392,6 +403,11 @@
-- @param #int int -- @param #int int
-- @return Action#Action ret (return value: cc.Action) -- @return Action#Action ret (return value: cc.Action)
--------------------------------
-- @function [parent=#Node] setName
-- @param self
-- @param #string str
-------------------------------- --------------------------------
-- overload function: setAdditionalTransform(cc.AffineTransform) -- overload function: setAdditionalTransform(cc.AffineTransform)
-- --
@ -612,6 +628,12 @@
-- @param self -- @param self
-- @param #cc.Ref ref -- @param #cc.Ref ref
--------------------------------
-- @function [parent=#Node] enumerateChildren
-- @param self
-- @param #string str
-- @param #function func
-------------------------------- --------------------------------
-- overload function: removeFromParentAndCleanup(bool) -- overload function: removeFromParentAndCleanup(bool)
-- --

View File

@ -3,13 +3,6 @@
-- @module OrbitCamera -- @module OrbitCamera
-- @extend ActionCamera -- @extend ActionCamera
--------------------------------
-- @function [parent=#OrbitCamera] sphericalRadius
-- @param self
-- @param #float float
-- @param #float float
-- @param #float float
-------------------------------- --------------------------------
-- @function [parent=#OrbitCamera] create -- @function [parent=#OrbitCamera] create
-- @param self -- @param self

View File

@ -16,11 +16,6 @@
-- @param self -- @param self
-- @param #bool bool -- @param #bool bool
--------------------------------
-- @function [parent=#ParallaxNode] setParallaxArray
-- @param self
-- @param #cc._ccArray _ccarray
-------------------------------- --------------------------------
-- @function [parent=#ParallaxNode] create -- @function [parent=#ParallaxNode] create
-- @param self -- @param self

View File

@ -196,12 +196,6 @@
-- @param self -- @param self
-- @param #color4f_table color4f -- @param #color4f_table color4f
--------------------------------
-- @function [parent=#ParticleSystem] updateQuadWithParticle
-- @param self
-- @param #cc.sParticle sparticle
-- @param #vec2_table vec2
-------------------------------- --------------------------------
-- @function [parent=#ParticleSystem] getAtlasIndex -- @function [parent=#ParticleSystem] getAtlasIndex
-- @param self -- @param self
@ -276,11 +270,6 @@
-- @param self -- @param self
-- @return float#float ret (return value: float) -- @return float#float ret (return value: float)
--------------------------------
-- @function [parent=#ParticleSystem] initParticle
-- @param self
-- @param #cc.sParticle sparticle
-------------------------------- --------------------------------
-- @function [parent=#ParticleSystem] setEmitterMode -- @function [parent=#ParticleSystem] setEmitterMode
-- @param self -- @param self

View File

@ -196,7 +196,7 @@
-- @function [parent=#ScrollView] getChildByName -- @function [parent=#ScrollView] getChildByName
-- @param self -- @param self
-- @param #string str -- @param #string str
-- @return Widget#Widget ret (return value: ccui.Widget) -- @return Node#Node ret (return value: cc.Node)
-------------------------------- --------------------------------
-- @function [parent=#ScrollView] getDescription -- @function [parent=#ScrollView] getDescription

View File

@ -3,18 +3,6 @@
-- @module ShuffleTiles -- @module ShuffleTiles
-- @extend TiledGrid3DAction -- @extend TiledGrid3DAction
--------------------------------
-- @function [parent=#ShuffleTiles] placeTile
-- @param self
-- @param #vec2_table vec2
-- @param #cc.Tile tile
--------------------------------
-- @function [parent=#ShuffleTiles] shuffle
-- @param self
-- @param #unsigned int int
-- @param #unsigned int int
-------------------------------- --------------------------------
-- @function [parent=#ShuffleTiles] getDelta -- @function [parent=#ShuffleTiles] getDelta
-- @param self -- @param self

View File

@ -18,12 +18,4 @@
-- @function [parent=#SkeletonAnimation] clearTrack -- @function [parent=#SkeletonAnimation] clearTrack
-- @param self -- @param self
--------------------------------
-- @function [parent=#SkeletonAnimation] onAnimationStateEvent
-- @param self
-- @param #int int
-- @param #spEventType speventtype
-- @param #spEvent spevent
-- @param #int int
return nil return nil

View File

@ -3,13 +3,6 @@
-- @module TMXLayer -- @module TMXLayer
-- @extend SpriteBatchNode -- @extend SpriteBatchNode
--------------------------------
-- @function [parent=#TMXLayer] getTileGIDAt
-- @param self
-- @param #vec2_table vec2
-- @param #cc.TMXTileFlags_ tmxtileflags_
-- @return unsigned int#unsigned int ret (return value: unsigned int)
-------------------------------- --------------------------------
-- @function [parent=#TMXLayer] getPositionAt -- @function [parent=#TMXLayer] getPositionAt
-- @param self -- @param self
@ -25,11 +18,6 @@
-- @function [parent=#TMXLayer] releaseMap -- @function [parent=#TMXLayer] releaseMap
-- @param self -- @param self
--------------------------------
-- @function [parent=#TMXLayer] setTiles
-- @param self
-- @param #unsigned int int
-------------------------------- --------------------------------
-- @function [parent=#TMXLayer] getLayerSize -- @function [parent=#TMXLayer] getLayerSize
-- @param self -- @param self

View File

@ -33,31 +33,11 @@
-- @function [parent=#Texture2D] releaseGLTexture -- @function [parent=#Texture2D] releaseGLTexture
-- @param self -- @param self
--------------------------------
-- @function [parent=#Texture2D] updateWithData
-- @param self
-- @param #void void
-- @param #int int
-- @param #int int
-- @param #int int
-- @param #int int
-- @return bool#bool ret (return value: bool)
-------------------------------- --------------------------------
-- @function [parent=#Texture2D] hasPremultipliedAlpha -- @function [parent=#Texture2D] hasPremultipliedAlpha
-- @param self -- @param self
-- @return bool#bool ret (return value: bool) -- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#Texture2D] initWithMipmaps
-- @param self
-- @param #cc._MipmapInfo map
-- @param #int int
-- @param #cc.Texture2D::PixelFormat pixelformat
-- @param #int int
-- @param #int int
-- @return bool#bool ret (return value: bool)
-------------------------------- --------------------------------
-- @function [parent=#Texture2D] getPixelsHigh -- @function [parent=#Texture2D] getPixelsHigh
-- @param self -- @param self

View File

@ -28,11 +28,6 @@
-- @param #color3b_table color3b -- @param #color3b_table color3b
-- @param #vec2_table vec2 -- @param #vec2_table vec2
--------------------------------
-- @function [parent=#TileMapAtlas] setTGAInfo
-- @param self
-- @param #cc.sImageTGA simagetga
-------------------------------- --------------------------------
-- @function [parent=#TileMapAtlas] create -- @function [parent=#TileMapAtlas] create
-- @param self -- @param self

View File

@ -13,12 +13,6 @@
-- @param self -- @param self
-- @param #vec2_table vec2 -- @param #vec2_table vec2
--------------------------------
-- @function [parent=#TurnOffTiles] shuffle
-- @param self
-- @param #unsigned int int
-- @param #unsigned int int
-------------------------------- --------------------------------
-- overload function: create(float, size_table, unsigned int) -- overload function: create(float, size_table, unsigned int)
-- --

View File

@ -14,9 +14,9 @@
-- @return size_table#size_table ret (return value: size_table) -- @return size_table#size_table ret (return value: size_table)
-------------------------------- --------------------------------
-- @function [parent=#Widget] getLeftBoundary -- @function [parent=#Widget] setFlippedY
-- @param self -- @param self
-- @return float#float ret (return value: float) -- @param #bool bool
-------------------------------- --------------------------------
-- @function [parent=#Widget] setFlippedX -- @function [parent=#Widget] setFlippedX
@ -53,11 +53,6 @@
-- @param self -- @param self
-- @param #ccui.Widget::PositionType positiontype -- @param #ccui.Widget::PositionType positiontype
--------------------------------
-- @function [parent=#Widget] getName
-- @param self
-- @return string#string ret (return value: string)
-------------------------------- --------------------------------
-- @function [parent=#Widget] isIgnoreContentAdaptWithSize -- @function [parent=#Widget] isIgnoreContentAdaptWithSize
-- @param self -- @param self
@ -96,10 +91,9 @@
-- @return float#float ret (return value: float) -- @return float#float ret (return value: float)
-------------------------------- --------------------------------
-- @function [parent=#Widget] getChildByName -- @function [parent=#Widget] ignoreContentAdaptWithSize
-- @param self -- @param self
-- @param #string str -- @param #bool bool
-- @return Widget#Widget ret (return value: ccui.Widget)
-------------------------------- --------------------------------
-- @function [parent=#Widget] isEnabled -- @function [parent=#Widget] isEnabled
@ -147,9 +141,9 @@
-- @param #bool bool -- @param #bool bool
-------------------------------- --------------------------------
-- @function [parent=#Widget] setFlippedY -- @function [parent=#Widget] getLeftBoundary
-- @param self -- @param self
-- @param #bool bool -- @return float#float ret (return value: float)
-------------------------------- --------------------------------
-- @function [parent=#Widget] setEnabled -- @function [parent=#Widget] setEnabled
@ -166,11 +160,6 @@
-- @param self -- @param self
-- @param #ccui.Widget::BrightStyle brightstyle -- @param #ccui.Widget::BrightStyle brightstyle
--------------------------------
-- @function [parent=#Widget] setName
-- @param self
-- @param #string str
-------------------------------- --------------------------------
-- @function [parent=#Widget] setLayoutParameter -- @function [parent=#Widget] setLayoutParameter
-- @param self -- @param self
@ -229,11 +218,6 @@
-- @param self -- @param self
-- @return Widget::SizeType#Widget::SizeType ret (return value: ccui.Widget::SizeType) -- @return Widget::SizeType#Widget::SizeType ret (return value: ccui.Widget::SizeType)
--------------------------------
-- @function [parent=#Widget] ignoreContentAdaptWithSize
-- @param self
-- @param #bool bool
-------------------------------- --------------------------------
-- @function [parent=#Widget] addTouchEventListener -- @function [parent=#Widget] addTouchEventListener
-- @param self -- @param self

View File

@ -736,11 +736,6 @@
-- @field [parent=#cc] DrawNode#DrawNode DrawNode preloaded module -- @field [parent=#cc] DrawNode#DrawNode DrawNode preloaded module
--------------------------------------------------------
-- the cc LabelTTF
-- @field [parent=#cc] LabelTTF#LabelTTF LabelTTF preloaded module
-------------------------------------------------------- --------------------------------------------------------
-- the cc GLProgram -- the cc GLProgram
-- @field [parent=#cc] GLProgram#GLProgram GLProgram preloaded module -- @field [parent=#cc] GLProgram#GLProgram GLProgram preloaded module
@ -756,11 +751,6 @@
-- @field [parent=#cc] Label#Label Label preloaded module -- @field [parent=#cc] Label#Label Label preloaded module
--------------------------------------------------------
-- the cc LabelBMFont
-- @field [parent=#cc] LabelBMFont#LabelBMFont LabelBMFont preloaded module
-------------------------------------------------------- --------------------------------------------------------
-- the cc Layer -- the cc Layer
-- @field [parent=#cc] Layer#Layer Layer preloaded module -- @field [parent=#cc] Layer#Layer Layer preloaded module

File diff suppressed because it is too large Load Diff

View File

@ -1530,72 +1530,6 @@ int register_all_cocos2dx(lua_State* tolua_S);

View File

@ -494,61 +494,6 @@ int lua_cocos2dx_spine_SkeletonAnimation_clearTrack(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_spine_SkeletonAnimation_onAnimationStateEvent(lua_State* tolua_S)
{
int argc = 0;
spine::SkeletonAnimation* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"sp.SkeletonAnimation",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (spine::SkeletonAnimation*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_spine_SkeletonAnimation_onAnimationStateEvent'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 4)
{
int arg0;
spEventType arg1;
spEvent* arg2;
int arg3;
ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1);
#pragma warning NO CONVERSION TO NATIVE FOR spEvent*;
ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3);
if(!ok)
return 0;
cobj->onAnimationStateEvent(arg0, arg1, arg2, arg3);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onAnimationStateEvent",argc, 4);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_spine_SkeletonAnimation_onAnimationStateEvent'.",&tolua_err);
#endif
return 0;
}
static int lua_cocos2dx_spine_SkeletonAnimation_finalize(lua_State* tolua_S) static int lua_cocos2dx_spine_SkeletonAnimation_finalize(lua_State* tolua_S)
{ {
printf("luabindings: finalizing LUA object (SkeletonAnimation)"); printf("luabindings: finalizing LUA object (SkeletonAnimation)");
@ -564,7 +509,6 @@ int lua_register_cocos2dx_spine_SkeletonAnimation(lua_State* tolua_S)
tolua_function(tolua_S,"setMix",lua_cocos2dx_spine_SkeletonAnimation_setMix); tolua_function(tolua_S,"setMix",lua_cocos2dx_spine_SkeletonAnimation_setMix);
tolua_function(tolua_S,"clearTracks",lua_cocos2dx_spine_SkeletonAnimation_clearTracks); tolua_function(tolua_S,"clearTracks",lua_cocos2dx_spine_SkeletonAnimation_clearTracks);
tolua_function(tolua_S,"clearTrack",lua_cocos2dx_spine_SkeletonAnimation_clearTrack); tolua_function(tolua_S,"clearTrack",lua_cocos2dx_spine_SkeletonAnimation_clearTrack);
tolua_function(tolua_S,"onAnimationStateEvent",lua_cocos2dx_spine_SkeletonAnimation_onAnimationStateEvent);
tolua_endmodule(tolua_S); tolua_endmodule(tolua_S);
std::string typeName = typeid(spine::SkeletonAnimation).name(); std::string typeName = typeid(spine::SkeletonAnimation).name();
g_luaType[typeName] = "sp.SkeletonAnimation"; g_luaType[typeName] = "sp.SkeletonAnimation";

View File

@ -22,5 +22,4 @@ int register_all_cocos2dx_spine(lua_State* tolua_S);
#endif // __cocos2dx_spine_h__ #endif // __cocos2dx_spine_h__

View File

@ -5130,50 +5130,6 @@ int lua_cocos2dx_studio_Bone_updateColor(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_studio_Bone_getName(lua_State* tolua_S)
{
int argc = 0;
cocostudio::Bone* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccs.Bone",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocostudio::Bone*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_Bone_getName'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
const std::string ret = cobj->getName();
tolua_pushcppstring(tolua_S,ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_Bone_getName'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_studio_Bone_setTransformDirty(lua_State* tolua_S) int lua_cocos2dx_studio_Bone_setTransformDirty(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
@ -5514,52 +5470,6 @@ int lua_cocos2dx_studio_Bone_addDisplay(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_studio_Bone_setName(lua_State* tolua_S)
{
int argc = 0;
cocostudio::Bone* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccs.Bone",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocostudio::Bone*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_Bone_setName'", 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);
if(!ok)
return 0;
cobj->setName(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setName",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_Bone_setName'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_studio_Bone_removeFromParent(lua_State* tolua_S) int lua_cocos2dx_studio_Bone_removeFromParent(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
@ -6301,7 +6211,6 @@ int lua_register_cocos2dx_studio_Bone(lua_State* tolua_S)
tolua_function(tolua_S,"getTween",lua_cocos2dx_studio_Bone_getTween); tolua_function(tolua_S,"getTween",lua_cocos2dx_studio_Bone_getTween);
tolua_function(tolua_S,"getParentBone",lua_cocos2dx_studio_Bone_getParentBone); tolua_function(tolua_S,"getParentBone",lua_cocos2dx_studio_Bone_getParentBone);
tolua_function(tolua_S,"updateColor",lua_cocos2dx_studio_Bone_updateColor); tolua_function(tolua_S,"updateColor",lua_cocos2dx_studio_Bone_updateColor);
tolua_function(tolua_S,"getName",lua_cocos2dx_studio_Bone_getName);
tolua_function(tolua_S,"setTransformDirty",lua_cocos2dx_studio_Bone_setTransformDirty); tolua_function(tolua_S,"setTransformDirty",lua_cocos2dx_studio_Bone_setTransformDirty);
tolua_function(tolua_S,"getDisplayRenderNodeType",lua_cocos2dx_studio_Bone_getDisplayRenderNodeType); tolua_function(tolua_S,"getDisplayRenderNodeType",lua_cocos2dx_studio_Bone_getDisplayRenderNodeType);
tolua_function(tolua_S,"removeDisplay",lua_cocos2dx_studio_Bone_removeDisplay); tolua_function(tolua_S,"removeDisplay",lua_cocos2dx_studio_Bone_removeDisplay);
@ -6309,7 +6218,6 @@ int lua_register_cocos2dx_studio_Bone(lua_State* tolua_S)
tolua_function(tolua_S,"init",lua_cocos2dx_studio_Bone_init); tolua_function(tolua_S,"init",lua_cocos2dx_studio_Bone_init);
tolua_function(tolua_S,"setParentBone",lua_cocos2dx_studio_Bone_setParentBone); tolua_function(tolua_S,"setParentBone",lua_cocos2dx_studio_Bone_setParentBone);
tolua_function(tolua_S,"addDisplay",lua_cocos2dx_studio_Bone_addDisplay); tolua_function(tolua_S,"addDisplay",lua_cocos2dx_studio_Bone_addDisplay);
tolua_function(tolua_S,"setName",lua_cocos2dx_studio_Bone_setName);
tolua_function(tolua_S,"removeFromParent",lua_cocos2dx_studio_Bone_removeFromParent); tolua_function(tolua_S,"removeFromParent",lua_cocos2dx_studio_Bone_removeFromParent);
tolua_function(tolua_S,"getColliderDetector",lua_cocos2dx_studio_Bone_getColliderDetector); tolua_function(tolua_S,"getColliderDetector",lua_cocos2dx_studio_Bone_getColliderDetector);
tolua_function(tolua_S,"getChildArmature",lua_cocos2dx_studio_Bone_getChildArmature); tolua_function(tolua_S,"getChildArmature",lua_cocos2dx_studio_Bone_getChildArmature);
@ -8749,52 +8657,6 @@ int lua_cocos2dx_studio_Armature_getParentBone(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_studio_Armature_setArmatureData(lua_State* tolua_S)
{
int argc = 0;
cocostudio::Armature* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccs.Armature",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocostudio::Armature*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_Armature_setArmatureData'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocostudio::ArmatureData* arg0;
ok &= luaval_to_object<cocostudio::ArmatureData>(tolua_S, 2, "ccs.ArmatureData",&arg0);
if(!ok)
return 0;
cobj->setArmatureData(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setArmatureData",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_Armature_setArmatureData'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_studio_Armature_removeBone(lua_State* tolua_S) int lua_cocos2dx_studio_Armature_removeBone(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
@ -8888,50 +8750,6 @@ int lua_cocos2dx_studio_Armature_getBatchNode(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_studio_Armature_getName(lua_State* tolua_S)
{
int argc = 0;
cocostudio::Armature* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccs.Armature",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocostudio::Armature*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_Armature_getName'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
const std::string& ret = cobj->getName();
tolua_pushcppstring(tolua_S,ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_Armature_getName'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_studio_Armature_init(lua_State* tolua_S) int lua_cocos2dx_studio_Armature_init(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
@ -9134,7 +8952,7 @@ int lua_cocos2dx_studio_Armature_setBatchNode(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_studio_Armature_setName(lua_State* tolua_S) int lua_cocos2dx_studio_Armature_setArmatureData(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
cocostudio::Armature* cobj = nullptr; cocostudio::Armature* cobj = nullptr;
@ -9154,7 +8972,7 @@ int lua_cocos2dx_studio_Armature_setName(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!cobj) if (!cobj)
{ {
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_Armature_setName'", nullptr); tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_Armature_setArmatureData'", nullptr);
return 0; return 0;
} }
#endif #endif
@ -9162,20 +8980,20 @@ int lua_cocos2dx_studio_Armature_setName(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1; argc = lua_gettop(tolua_S)-1;
if (argc == 1) if (argc == 1)
{ {
std::string arg0; cocostudio::ArmatureData* arg0;
ok &= luaval_to_std_string(tolua_S, 2,&arg0); ok &= luaval_to_object<cocostudio::ArmatureData>(tolua_S, 2, "ccs.ArmatureData",&arg0);
if(!ok) if(!ok)
return 0; return 0;
cobj->setName(arg0); cobj->setArmatureData(arg0);
return 0; return 0;
} }
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setName",argc, 1); CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setArmatureData",argc, 1);
return 0; return 0;
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
tolua_lerror: tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_Armature_setName'.",&tolua_err); tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_Armature_setArmatureData'.",&tolua_err);
#endif #endif
return 0; return 0;
@ -9521,15 +9339,13 @@ int lua_register_cocos2dx_studio_Armature(lua_State* tolua_S)
tolua_function(tolua_S,"setVersion",lua_cocos2dx_studio_Armature_setVersion); tolua_function(tolua_S,"setVersion",lua_cocos2dx_studio_Armature_setVersion);
tolua_function(tolua_S,"updateOffsetPoint",lua_cocos2dx_studio_Armature_updateOffsetPoint); tolua_function(tolua_S,"updateOffsetPoint",lua_cocos2dx_studio_Armature_updateOffsetPoint);
tolua_function(tolua_S,"getParentBone",lua_cocos2dx_studio_Armature_getParentBone); tolua_function(tolua_S,"getParentBone",lua_cocos2dx_studio_Armature_getParentBone);
tolua_function(tolua_S,"setArmatureData",lua_cocos2dx_studio_Armature_setArmatureData);
tolua_function(tolua_S,"removeBone",lua_cocos2dx_studio_Armature_removeBone); tolua_function(tolua_S,"removeBone",lua_cocos2dx_studio_Armature_removeBone);
tolua_function(tolua_S,"getBatchNode",lua_cocos2dx_studio_Armature_getBatchNode); tolua_function(tolua_S,"getBatchNode",lua_cocos2dx_studio_Armature_getBatchNode);
tolua_function(tolua_S,"getName",lua_cocos2dx_studio_Armature_getName);
tolua_function(tolua_S,"init",lua_cocos2dx_studio_Armature_init); tolua_function(tolua_S,"init",lua_cocos2dx_studio_Armature_init);
tolua_function(tolua_S,"setParentBone",lua_cocos2dx_studio_Armature_setParentBone); tolua_function(tolua_S,"setParentBone",lua_cocos2dx_studio_Armature_setParentBone);
tolua_function(tolua_S,"drawContour",lua_cocos2dx_studio_Armature_drawContour); tolua_function(tolua_S,"drawContour",lua_cocos2dx_studio_Armature_drawContour);
tolua_function(tolua_S,"setBatchNode",lua_cocos2dx_studio_Armature_setBatchNode); tolua_function(tolua_S,"setBatchNode",lua_cocos2dx_studio_Armature_setBatchNode);
tolua_function(tolua_S,"setName",lua_cocos2dx_studio_Armature_setName); tolua_function(tolua_S,"setArmatureData",lua_cocos2dx_studio_Armature_setArmatureData);
tolua_function(tolua_S,"addBone",lua_cocos2dx_studio_Armature_addBone); tolua_function(tolua_S,"addBone",lua_cocos2dx_studio_Armature_addBone);
tolua_function(tolua_S,"getArmatureData",lua_cocos2dx_studio_Armature_getArmatureData); tolua_function(tolua_S,"getArmatureData",lua_cocos2dx_studio_Armature_getArmatureData);
tolua_function(tolua_S,"getVersion",lua_cocos2dx_studio_Armature_getVersion); tolua_function(tolua_S,"getVersion",lua_cocos2dx_studio_Armature_getVersion);

View File

@ -299,10 +299,6 @@ int register_all_cocos2dx_studio(lua_State* tolua_S);

View File

@ -903,7 +903,7 @@ int lua_cocos2dx_ui_Widget_getCustomSize(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_ui_Widget_getLeftBoundary(lua_State* tolua_S) int lua_cocos2dx_ui_Widget_setFlippedY(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
cocos2d::ui::Widget* cobj = nullptr; cocos2d::ui::Widget* cobj = nullptr;
@ -923,26 +923,28 @@ int lua_cocos2dx_ui_Widget_getLeftBoundary(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!cobj) if (!cobj)
{ {
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_getLeftBoundary'", nullptr); tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_setFlippedY'", nullptr);
return 0; return 0;
} }
#endif #endif
argc = lua_gettop(tolua_S)-1; argc = lua_gettop(tolua_S)-1;
if (argc == 0) if (argc == 1)
{ {
bool arg0;
ok &= luaval_to_boolean(tolua_S, 2,&arg0);
if(!ok) if(!ok)
return 0; return 0;
double ret = cobj->getLeftBoundary(); cobj->setFlippedY(arg0);
tolua_pushnumber(tolua_S,(lua_Number)ret); return 0;
return 1;
} }
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLeftBoundary",argc, 0); CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedY",argc, 1);
return 0; return 0;
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
tolua_lerror: tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_getLeftBoundary'.",&tolua_err); tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_setFlippedY'.",&tolua_err);
#endif #endif
return 0; return 0;
@ -1263,50 +1265,6 @@ int lua_cocos2dx_ui_Widget_setPositionType(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_ui_Widget_getName(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::Widget* 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.Widget",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_getName'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
const std::string& ret = cobj->getName();
tolua_pushcppstring(tolua_S,ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_getName'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_Widget_isIgnoreContentAdaptWithSize(lua_State* tolua_S) int lua_cocos2dx_ui_Widget_isIgnoreContentAdaptWithSize(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
@ -1621,7 +1579,7 @@ int lua_cocos2dx_ui_Widget_getTopBoundary(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_ui_Widget_getChildByName(lua_State* tolua_S) int lua_cocos2dx_ui_Widget_ignoreContentAdaptWithSize(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
cocos2d::ui::Widget* cobj = nullptr; cocos2d::ui::Widget* cobj = nullptr;
@ -1641,7 +1599,7 @@ int lua_cocos2dx_ui_Widget_getChildByName(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!cobj) if (!cobj)
{ {
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_getChildByName'", nullptr); tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_ignoreContentAdaptWithSize'", nullptr);
return 0; return 0;
} }
#endif #endif
@ -1649,21 +1607,20 @@ int lua_cocos2dx_ui_Widget_getChildByName(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1; argc = lua_gettop(tolua_S)-1;
if (argc == 1) if (argc == 1)
{ {
std::string arg0; bool arg0;
ok &= luaval_to_std_string(tolua_S, 2,&arg0); ok &= luaval_to_boolean(tolua_S, 2,&arg0);
if(!ok) if(!ok)
return 0; return 0;
cocos2d::ui::Widget* ret = cobj->getChildByName(arg0); cobj->ignoreContentAdaptWithSize(arg0);
object_to_luaval<cocos2d::ui::Widget>(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 0;
return 1;
} }
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildByName",argc, 1); CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ignoreContentAdaptWithSize",argc, 1);
return 0; return 0;
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
tolua_lerror: tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_getChildByName'.",&tolua_err); tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_ignoreContentAdaptWithSize'.",&tolua_err);
#endif #endif
return 0; return 0;
@ -2070,7 +2027,7 @@ int lua_cocos2dx_ui_Widget_setTouchEnabled(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_ui_Widget_setFlippedY(lua_State* tolua_S) int lua_cocos2dx_ui_Widget_getLeftBoundary(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
cocos2d::ui::Widget* cobj = nullptr; cocos2d::ui::Widget* cobj = nullptr;
@ -2090,28 +2047,26 @@ int lua_cocos2dx_ui_Widget_setFlippedY(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!cobj) if (!cobj)
{ {
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_setFlippedY'", nullptr); tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_getLeftBoundary'", nullptr);
return 0; return 0;
} }
#endif #endif
argc = lua_gettop(tolua_S)-1; argc = lua_gettop(tolua_S)-1;
if (argc == 1) if (argc == 0)
{ {
bool arg0;
ok &= luaval_to_boolean(tolua_S, 2,&arg0);
if(!ok) if(!ok)
return 0; return 0;
cobj->setFlippedY(arg0); double ret = cobj->getLeftBoundary();
return 0; tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
} }
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedY",argc, 1); CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLeftBoundary",argc, 0);
return 0; return 0;
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
tolua_lerror: tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_setFlippedY'.",&tolua_err); tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_getLeftBoundary'.",&tolua_err);
#endif #endif
return 0; return 0;
@ -2252,52 +2207,6 @@ int lua_cocos2dx_ui_Widget_setBrightStyle(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_ui_Widget_setName(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::Widget* 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.Widget",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_setName'", 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);
if(!ok)
return 0;
cobj->setName(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setName",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_setName'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_Widget_setLayoutParameter(lua_State* tolua_S) int lua_cocos2dx_ui_Widget_setLayoutParameter(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
@ -2790,52 +2699,6 @@ int lua_cocos2dx_ui_Widget_getSizeType(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_ui_Widget_ignoreContentAdaptWithSize(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::Widget* 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.Widget",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_ignoreContentAdaptWithSize'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
bool arg0;
ok &= luaval_to_boolean(tolua_S, 2,&arg0);
if(!ok)
return 0;
cobj->ignoreContentAdaptWithSize(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ignoreContentAdaptWithSize",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_ignoreContentAdaptWithSize'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_Widget_addTouchEventListener(lua_State* tolua_S) int lua_cocos2dx_ui_Widget_addTouchEventListener(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
@ -3450,7 +3313,7 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S)
tolua_function(tolua_S,"new",lua_cocos2dx_ui_Widget_constructor); tolua_function(tolua_S,"new",lua_cocos2dx_ui_Widget_constructor);
tolua_function(tolua_S,"setSizePercent",lua_cocos2dx_ui_Widget_setSizePercent); tolua_function(tolua_S,"setSizePercent",lua_cocos2dx_ui_Widget_setSizePercent);
tolua_function(tolua_S,"getCustomSize",lua_cocos2dx_ui_Widget_getCustomSize); tolua_function(tolua_S,"getCustomSize",lua_cocos2dx_ui_Widget_getCustomSize);
tolua_function(tolua_S,"getLeftBoundary",lua_cocos2dx_ui_Widget_getLeftBoundary); tolua_function(tolua_S,"setFlippedY",lua_cocos2dx_ui_Widget_setFlippedY);
tolua_function(tolua_S,"setFlippedX",lua_cocos2dx_ui_Widget_setFlippedX); tolua_function(tolua_S,"setFlippedX",lua_cocos2dx_ui_Widget_setFlippedX);
tolua_function(tolua_S,"getVirtualRenderer",lua_cocos2dx_ui_Widget_getVirtualRenderer); tolua_function(tolua_S,"getVirtualRenderer",lua_cocos2dx_ui_Widget_getVirtualRenderer);
tolua_function(tolua_S,"getSize",lua_cocos2dx_ui_Widget_getSize); tolua_function(tolua_S,"getSize",lua_cocos2dx_ui_Widget_getSize);
@ -3458,7 +3321,6 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S)
tolua_function(tolua_S,"getLayoutSize",lua_cocos2dx_ui_Widget_getLayoutSize); tolua_function(tolua_S,"getLayoutSize",lua_cocos2dx_ui_Widget_getLayoutSize);
tolua_function(tolua_S,"setHighlighted",lua_cocos2dx_ui_Widget_setHighlighted); tolua_function(tolua_S,"setHighlighted",lua_cocos2dx_ui_Widget_setHighlighted);
tolua_function(tolua_S,"setPositionType",lua_cocos2dx_ui_Widget_setPositionType); tolua_function(tolua_S,"setPositionType",lua_cocos2dx_ui_Widget_setPositionType);
tolua_function(tolua_S,"getName",lua_cocos2dx_ui_Widget_getName);
tolua_function(tolua_S,"isIgnoreContentAdaptWithSize",lua_cocos2dx_ui_Widget_isIgnoreContentAdaptWithSize); tolua_function(tolua_S,"isIgnoreContentAdaptWithSize",lua_cocos2dx_ui_Widget_isIgnoreContentAdaptWithSize);
tolua_function(tolua_S,"getVirtualRendererSize",lua_cocos2dx_ui_Widget_getVirtualRendererSize); tolua_function(tolua_S,"getVirtualRendererSize",lua_cocos2dx_ui_Widget_getVirtualRendererSize);
tolua_function(tolua_S,"isHighlighted",lua_cocos2dx_ui_Widget_isHighlighted); tolua_function(tolua_S,"isHighlighted",lua_cocos2dx_ui_Widget_isHighlighted);
@ -3466,7 +3328,7 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S)
tolua_function(tolua_S,"findNextFocusedWidget",lua_cocos2dx_ui_Widget_findNextFocusedWidget); tolua_function(tolua_S,"findNextFocusedWidget",lua_cocos2dx_ui_Widget_findNextFocusedWidget);
tolua_function(tolua_S,"getPositionType",lua_cocos2dx_ui_Widget_getPositionType); tolua_function(tolua_S,"getPositionType",lua_cocos2dx_ui_Widget_getPositionType);
tolua_function(tolua_S,"getTopBoundary",lua_cocos2dx_ui_Widget_getTopBoundary); tolua_function(tolua_S,"getTopBoundary",lua_cocos2dx_ui_Widget_getTopBoundary);
tolua_function(tolua_S,"getChildByName",lua_cocos2dx_ui_Widget_getChildByName); tolua_function(tolua_S,"ignoreContentAdaptWithSize",lua_cocos2dx_ui_Widget_ignoreContentAdaptWithSize);
tolua_function(tolua_S,"isEnabled",lua_cocos2dx_ui_Widget_isEnabled); tolua_function(tolua_S,"isEnabled",lua_cocos2dx_ui_Widget_isEnabled);
tolua_function(tolua_S,"isFocused",lua_cocos2dx_ui_Widget_isFocused); tolua_function(tolua_S,"isFocused",lua_cocos2dx_ui_Widget_isFocused);
tolua_function(tolua_S,"getTouchBeganPosition",lua_cocos2dx_ui_Widget_getTouchBeganPosition); tolua_function(tolua_S,"getTouchBeganPosition",lua_cocos2dx_ui_Widget_getTouchBeganPosition);
@ -3476,11 +3338,10 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S)
tolua_function(tolua_S,"setFocused",lua_cocos2dx_ui_Widget_setFocused); tolua_function(tolua_S,"setFocused",lua_cocos2dx_ui_Widget_setFocused);
tolua_function(tolua_S,"setActionTag",lua_cocos2dx_ui_Widget_setActionTag); tolua_function(tolua_S,"setActionTag",lua_cocos2dx_ui_Widget_setActionTag);
tolua_function(tolua_S,"setTouchEnabled",lua_cocos2dx_ui_Widget_setTouchEnabled); tolua_function(tolua_S,"setTouchEnabled",lua_cocos2dx_ui_Widget_setTouchEnabled);
tolua_function(tolua_S,"setFlippedY",lua_cocos2dx_ui_Widget_setFlippedY); tolua_function(tolua_S,"getLeftBoundary",lua_cocos2dx_ui_Widget_getLeftBoundary);
tolua_function(tolua_S,"setEnabled",lua_cocos2dx_ui_Widget_setEnabled); tolua_function(tolua_S,"setEnabled",lua_cocos2dx_ui_Widget_setEnabled);
tolua_function(tolua_S,"getRightBoundary",lua_cocos2dx_ui_Widget_getRightBoundary); tolua_function(tolua_S,"getRightBoundary",lua_cocos2dx_ui_Widget_getRightBoundary);
tolua_function(tolua_S,"setBrightStyle",lua_cocos2dx_ui_Widget_setBrightStyle); tolua_function(tolua_S,"setBrightStyle",lua_cocos2dx_ui_Widget_setBrightStyle);
tolua_function(tolua_S,"setName",lua_cocos2dx_ui_Widget_setName);
tolua_function(tolua_S,"setLayoutParameter",lua_cocos2dx_ui_Widget_setLayoutParameter); tolua_function(tolua_S,"setLayoutParameter",lua_cocos2dx_ui_Widget_setLayoutParameter);
tolua_function(tolua_S,"clone",lua_cocos2dx_ui_Widget_clone); tolua_function(tolua_S,"clone",lua_cocos2dx_ui_Widget_clone);
tolua_function(tolua_S,"setFocusEnabled",lua_cocos2dx_ui_Widget_setFocusEnabled); tolua_function(tolua_S,"setFocusEnabled",lua_cocos2dx_ui_Widget_setFocusEnabled);
@ -3492,7 +3353,6 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S)
tolua_function(tolua_S,"getSizePercent",lua_cocos2dx_ui_Widget_getSizePercent); tolua_function(tolua_S,"getSizePercent",lua_cocos2dx_ui_Widget_getSizePercent);
tolua_function(tolua_S,"getTouchMovePosition",lua_cocos2dx_ui_Widget_getTouchMovePosition); tolua_function(tolua_S,"getTouchMovePosition",lua_cocos2dx_ui_Widget_getTouchMovePosition);
tolua_function(tolua_S,"getSizeType",lua_cocos2dx_ui_Widget_getSizeType); tolua_function(tolua_S,"getSizeType",lua_cocos2dx_ui_Widget_getSizeType);
tolua_function(tolua_S,"ignoreContentAdaptWithSize",lua_cocos2dx_ui_Widget_ignoreContentAdaptWithSize);
tolua_function(tolua_S,"addTouchEventListener",lua_cocos2dx_ui_Widget_addTouchEventListener); tolua_function(tolua_S,"addTouchEventListener",lua_cocos2dx_ui_Widget_addTouchEventListener);
tolua_function(tolua_S,"getTouchEndPosition",lua_cocos2dx_ui_Widget_getTouchEndPosition); tolua_function(tolua_S,"getTouchEndPosition",lua_cocos2dx_ui_Widget_getTouchEndPosition);
tolua_function(tolua_S,"getPositionPercent",lua_cocos2dx_ui_Widget_getPositionPercent); tolua_function(tolua_S,"getPositionPercent",lua_cocos2dx_ui_Widget_getPositionPercent);

View File

@ -385,9 +385,6 @@ int register_all_cocos2dx_ui(lua_State* tolua_S);