Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ci skip][AUTO]: updating luabinding & jsbinding automatically

This commit is contained in:
CocosRobot 2015-07-09 07:45:43 +00:00
parent 8e256dcd09
commit 2065e5b4a7
7 changed files with 2571 additions and 2318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

554
cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
View File

@ -11439,268 +11439,6 @@ DrawNode : function (
};
/**
* @class SpriteBatchNode
*/
cc.SpriteBatchNode = {
/**
* @method appendChild
* @param {cc.Sprite} arg0
*/
appendChild : function (
sprite
)
{
},
/**
* @method addSpriteWithoutQuad
* @param {cc.Sprite} arg0
* @param {int} arg1
* @param {int} arg2
* @return {cc.SpriteBatchNode}
*/
addSpriteWithoutQuad : function (
sprite,
int,
int
)
{
return cc.SpriteBatchNode;
},
/**
* @method reorderBatch
* @param {bool} arg0
*/
reorderBatch : function (
bool
)
{
},
/**
* @method initWithTexture
* @param {cc.Texture2D} arg0
* @param {long} arg1
* @return {bool}
*/
initWithTexture : function (
texture2d,
long
)
{
return false;
},
/**
* @method getBlendFunc
* @return {cc.BlendFunc}
*/
getBlendFunc : function (
)
{
return cc.BlendFunc;
},
/**
* @method lowestAtlasIndexInChild
* @param {cc.Sprite} arg0
* @return {long}
*/
lowestAtlasIndexInChild : function (
sprite
)
{
return 0;
},
/**
* @method atlasIndexForChild
* @param {cc.Sprite} arg0
* @param {int} arg1
* @return {long}
*/
atlasIndexForChild : function (
sprite,
int
)
{
return 0;
},
/**
* @method setTextureAtlas
* @param {cc.TextureAtlas} arg0
*/
setTextureAtlas : function (
textureatlas
)
{
},
/**
* @method initWithFile
* @param {String} arg0
* @param {long} arg1
* @return {bool}
*/
initWithFile : function (
str,
long
)
{
return false;
},
/**
* @method getTexture
* @return {cc.Texture2D}
*/
getTexture : function (
)
{
return cc.Texture2D;
},
/**
* @method increaseAtlasCapacity
*/
increaseAtlasCapacity : function (
)
{
},
/**
* @method getTextureAtlas
* @return {cc.TextureAtlas}
*/
getTextureAtlas : function (
)
{
return cc.TextureAtlas;
},
/**
* @method insertQuadFromSprite
* @param {cc.Sprite} arg0
* @param {long} arg1
*/
insertQuadFromSprite : function (
sprite,
long
)
{
},
/**
* @method setTexture
* @param {cc.Texture2D} arg0
*/
setTexture : function (
texture2d
)
{
},
/**
* @method rebuildIndexInOrder
* @param {cc.Sprite} arg0
* @param {long} arg1
* @return {long}
*/
rebuildIndexInOrder : function (
sprite,
long
)
{
return 0;
},
/**
* @method highestAtlasIndexInChild
* @param {cc.Sprite} arg0
* @return {long}
*/
highestAtlasIndexInChild : function (
sprite
)
{
return 0;
},
/**
* @method removeChildAtIndex
* @param {long} arg0
* @param {bool} arg1
*/
removeChildAtIndex : function (
long,
bool
)
{
},
/**
* @method removeSpriteFromAtlas
* @param {cc.Sprite} arg0
*/
removeSpriteFromAtlas : function (
sprite
)
{
},
/**
* @method setBlendFunc
* @param {cc.BlendFunc} arg0
*/
setBlendFunc : function (
blendfunc
)
{
},
/**
* @method create
* @param {String} arg0
* @param {long} arg1
* @return {cc.SpriteBatchNode}
*/
create : function (
str,
long
)
{
return cc.SpriteBatchNode;
},
/**
* @method createWithTexture
* @param {cc.Texture2D} arg0
* @param {long} arg1
* @return {cc.SpriteBatchNode}
*/
createWithTexture : function (
texture2d,
long
)
{
return cc.SpriteBatchNode;
},
/**
* @method SpriteBatchNode
* @constructor
*/
SpriteBatchNode : function (
)
{
},
};
/**
* @class Label
*/
@ -11776,6 +11514,16 @@ getTextColor : function (
return cc.Color4B;
},
/**
* @method getBlendFunc
* @return {cc.BlendFunc}
*/
getBlendFunc : function (
)
{
return cc.BlendFunc;
},
/**
* @method setWidth
* @param {float} arg0
@ -11930,6 +11678,16 @@ getAdditionalKerning : function (
return 0;
},
/**
* @method removeAllChildrenWithCleanup
* @param {bool} arg0
*/
removeAllChildrenWithCleanup : function (
bool
)
{
},
/**
* @method setCharMap
* @param {cc.Texture2D|String|String} texture2d
@ -12090,6 +11848,16 @@ getSystemFontSize : function (
return 0;
},
/**
* @method setBlendFunc
* @param {cc.BlendFunc} arg0
*/
setBlendFunc : function (
blendfunc
)
{
},
/**
* @method getTextAlignment
* @return {cc.TextHAlignment}
@ -20713,6 +20481,268 @@ AnimationCache : function (
};
/**
* @class SpriteBatchNode
*/
cc.SpriteBatchNode = {
/**
* @method appendChild
* @param {cc.Sprite} arg0
*/
appendChild : function (
sprite
)
{
},
/**
* @method addSpriteWithoutQuad
* @param {cc.Sprite} arg0
* @param {int} arg1
* @param {int} arg2
* @return {cc.SpriteBatchNode}
*/
addSpriteWithoutQuad : function (
sprite,
int,
int
)
{
return cc.SpriteBatchNode;
},
/**
* @method reorderBatch
* @param {bool} arg0
*/
reorderBatch : function (
bool
)
{
},
/**
* @method initWithTexture
* @param {cc.Texture2D} arg0
* @param {long} arg1
* @return {bool}
*/
initWithTexture : function (
texture2d,
long
)
{
return false;
},
/**
* @method getBlendFunc
* @return {cc.BlendFunc}
*/
getBlendFunc : function (
)
{
return cc.BlendFunc;
},
/**
* @method lowestAtlasIndexInChild
* @param {cc.Sprite} arg0
* @return {long}
*/
lowestAtlasIndexInChild : function (
sprite
)
{
return 0;
},
/**
* @method atlasIndexForChild
* @param {cc.Sprite} arg0
* @param {int} arg1
* @return {long}
*/
atlasIndexForChild : function (
sprite,
int
)
{
return 0;
},
/**
* @method setTextureAtlas
* @param {cc.TextureAtlas} arg0
*/
setTextureAtlas : function (
textureatlas
)
{
},
/**
* @method initWithFile
* @param {String} arg0
* @param {long} arg1
* @return {bool}
*/
initWithFile : function (
str,
long
)
{
return false;
},
/**
* @method getTexture
* @return {cc.Texture2D}
*/
getTexture : function (
)
{
return cc.Texture2D;
},
/**
* @method increaseAtlasCapacity
*/
increaseAtlasCapacity : function (
)
{
},
/**
* @method getTextureAtlas
* @return {cc.TextureAtlas}
*/
getTextureAtlas : function (
)
{
return cc.TextureAtlas;
},
/**
* @method insertQuadFromSprite
* @param {cc.Sprite} arg0
* @param {long} arg1
*/
insertQuadFromSprite : function (
sprite,
long
)
{
},
/**
* @method setTexture
* @param {cc.Texture2D} arg0
*/
setTexture : function (
texture2d
)
{
},
/**
* @method rebuildIndexInOrder
* @param {cc.Sprite} arg0
* @param {long} arg1
* @return {long}
*/
rebuildIndexInOrder : function (
sprite,
long
)
{
return 0;
},
/**
* @method highestAtlasIndexInChild
* @param {cc.Sprite} arg0
* @return {long}
*/
highestAtlasIndexInChild : function (
sprite
)
{
return 0;
},
/**
* @method removeChildAtIndex
* @param {long} arg0
* @param {bool} arg1
*/
removeChildAtIndex : function (
long,
bool
)
{
},
/**
* @method removeSpriteFromAtlas
* @param {cc.Sprite} arg0
*/
removeSpriteFromAtlas : function (
sprite
)
{
},
/**
* @method setBlendFunc
* @param {cc.BlendFunc} arg0
*/
setBlendFunc : function (
blendfunc
)
{
},
/**
* @method create
* @param {String} arg0
* @param {long} arg1
* @return {cc.SpriteBatchNode}
*/
create : function (
str,
long
)
{
return cc.SpriteBatchNode;
},
/**
* @method createWithTexture
* @param {cc.Texture2D} arg0
* @param {long} arg1
* @return {cc.SpriteBatchNode}
*/
createWithTexture : function (
texture2d,
long
)
{
return cc.SpriteBatchNode;
},
/**
* @method SpriteBatchNode
* @constructor
*/
SpriteBatchNode : function (
)
{
},
};
/**
* @class SpriteFrameCache
*/

1613
cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
View File

File diff suppressed because it is too large Load Diff

63
cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
View File

@ -2144,36 +2144,6 @@ bool js_cocos2dx_DrawNode_drawCubicBezier(JSContext *cx, uint32_t argc, jsval *v
bool js_cocos2dx_DrawNode_create(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_DrawNode_DrawNode(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_cocos2d_SpriteBatchNode_class;
extern JSObject *jsb_cocos2d_SpriteBatchNode_prototype;
bool js_cocos2dx_SpriteBatchNode_constructor(JSContext *cx, uint32_t argc, jsval *vp);
void js_cocos2dx_SpriteBatchNode_finalize(JSContext *cx, JSObject *obj);
void js_register_cocos2dx_SpriteBatchNode(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_SpriteBatchNode_appendChild(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_addSpriteWithoutQuad(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_reorderBatch(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_initWithTexture(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_getBlendFunc(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_lowestAtlasIndexInChild(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_atlasIndexForChild(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_setTextureAtlas(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_initWithFile(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_getTexture(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_increaseAtlasCapacity(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_getTextureAtlas(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_insertQuadFromSprite(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_setTexture(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_rebuildIndexInOrder(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_highestAtlasIndexInChild(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_removeChildAtIndex(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_removeSpriteFromAtlas(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_setBlendFunc(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_create(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_createWithTexture(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_SpriteBatchNode(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_cocos2d_Label_class;
extern JSObject *jsb_cocos2d_Label_prototype;
@ -2188,6 +2158,7 @@ bool js_cocos2dx_Label_getString(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getHeight(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_disableEffect(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getTextColor(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getBlendFunc(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setWidth(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getMaxLineWidth(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getHorizontalAlignment(JSContext *cx, uint32_t argc, jsval *vp);
@ -2203,6 +2174,7 @@ bool js_cocos2dx_Label_setLineBreakWithoutSpace(JSContext *cx, uint32_t argc, js
bool js_cocos2dx_Label_getStringNumLines(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_enableOutline(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getAdditionalKerning(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_removeAllChildrenWithCleanup(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setCharMap(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getDimensions(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setMaxLineWidth(JSContext *cx, uint32_t argc, jsval *vp);
@ -2218,6 +2190,7 @@ bool js_cocos2dx_Label_enableGlow(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getLetter(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setAdditionalKerning(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getSystemFontSize(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setBlendFunc(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getTextAlignment(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getBMFontFilePath(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setHorizontalAlignment(JSContext *cx, uint32_t argc, jsval *vp);
@ -3705,6 +3678,36 @@ bool js_cocos2dx_AnimationCache_destroyInstance(JSContext *cx, uint32_t argc, js
bool js_cocos2dx_AnimationCache_getInstance(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_AnimationCache_AnimationCache(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_cocos2d_SpriteBatchNode_class;
extern JSObject *jsb_cocos2d_SpriteBatchNode_prototype;
bool js_cocos2dx_SpriteBatchNode_constructor(JSContext *cx, uint32_t argc, jsval *vp);
void js_cocos2dx_SpriteBatchNode_finalize(JSContext *cx, JSObject *obj);
void js_register_cocos2dx_SpriteBatchNode(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_SpriteBatchNode_appendChild(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_addSpriteWithoutQuad(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_reorderBatch(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_initWithTexture(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_getBlendFunc(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_lowestAtlasIndexInChild(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_atlasIndexForChild(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_setTextureAtlas(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_initWithFile(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_getTexture(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_increaseAtlasCapacity(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_getTextureAtlas(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_insertQuadFromSprite(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_setTexture(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_rebuildIndexInOrder(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_highestAtlasIndexInChild(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_removeChildAtIndex(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_removeSpriteFromAtlas(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_setBlendFunc(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_create(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_createWithTexture(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_SpriteBatchNode_SpriteBatchNode(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_cocos2d_SpriteFrameCache_class;
extern JSObject *jsb_cocos2d_SpriteFrameCache_prototype;

50
cocos/scripting/lua-bindings/auto/api/Label.lua
View File

@ -1,7 +1,7 @@
--------------------------------
-- @module Label
-- @extend SpriteBatchNode,LabelProtocol
-- @extend Node,LabelProtocol,BlendProtocol
-- @parent_module cc
--------------------------------
@ -59,6 +59,12 @@
-- @param self
-- @return color4b_table#color4b_table ret (return value: color4b_table)
--------------------------------
--
-- @function [parent=#Label] getBlendFunc
-- @param self
-- @return BlendFunc#BlendFunc ret (return value: cc.BlendFunc)
--------------------------------
-- Makes the Label exactly this untransformed width.<br>
-- The Label's width be used for text align if the value not equal zero.
@ -175,6 +181,13 @@
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#Label] removeAllChildrenWithCleanup
-- @param self
-- @param #bool cleanup
-- @return Label#Label self (return value: cc.Label)
--------------------------------
-- @overload self, cc.Texture2D, int, int, int
-- @overload self, string, int, int, int
@ -290,6 +303,13 @@
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#Label] setBlendFunc
-- @param self
-- @param #cc.BlendFunc blendFunc
-- @return Label#Label self (return value: cc.Label)
--------------------------------
-- Returns the Label's text horizontal alignment.
-- @function [parent=#Label] getTextAlignment
@ -390,15 +410,6 @@
-- @param #unsigned int flags
-- @return Label#Label self (return value: cc.Label)
--------------------------------
--
-- @function [parent=#Label] addChild
-- @param self
-- @param #cc.Node child
-- @param #int zOrder
-- @param #int tag
-- @return Label#Label self (return value: cc.Label)
--------------------------------
--
-- @function [parent=#Label] setScaleY
@ -427,10 +438,9 @@
--------------------------------
--
-- @function [parent=#Label] setBlendFunc
-- @function [parent=#Label] getScaleX
-- @param self
-- @param #cc.BlendFunc blendFunc
-- @return Label#Label self (return value: cc.Label)
-- @return float#float ret (return value: float)
--------------------------------
--
@ -441,12 +451,6 @@
-- @param #unsigned int parentFlags
-- @return Label#Label self (return value: cc.Label)
--------------------------------
--
-- @function [parent=#Label] getScaleX
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#Label] getDescription
@ -469,15 +473,17 @@
--------------------------------
--
-- @function [parent=#Label] sortAllChildren
-- @function [parent=#Label] updateDisplayedOpacity
-- @param self
-- @param #unsigned char parentOpacity
-- @return Label#Label self (return value: cc.Label)
--------------------------------
--
-- @function [parent=#Label] updateDisplayedOpacity
-- @function [parent=#Label] removeChild
-- @param self
-- @param #unsigned char parentOpacity
-- @param #cc.Node child
-- @param #bool cleanup
-- @return Label#Label self (return value: cc.Label)
--------------------------------

10
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
View File

@ -766,11 +766,6 @@
-- @field [parent=#cc] DrawNode#DrawNode DrawNode preloaded module
--------------------------------------------------------
-- the cc SpriteBatchNode
-- @field [parent=#cc] SpriteBatchNode#SpriteBatchNode SpriteBatchNode preloaded module
--------------------------------------------------------
-- the cc Label
-- @field [parent=#cc] Label#Label Label preloaded module
@ -1241,6 +1236,11 @@
-- @field [parent=#cc] AnimationCache#AnimationCache AnimationCache preloaded module
--------------------------------------------------------
-- the cc SpriteBatchNode
-- @field [parent=#cc] SpriteBatchNode#SpriteBatchNode SpriteBatchNode preloaded module
--------------------------------------------------------
-- the cc SpriteFrameCache
-- @field [parent=#cc] SpriteFrameCache#SpriteFrameCache SpriteFrameCache preloaded module

2596
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

File diff suppressed because it is too large Load Diff

3
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
View File

@ -2061,6 +2061,9 @@ int register_all_cocos2dx(lua_State* tolua_S);