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

Merge pull request #6660 from CocosRobot/update_lua_bindings_1399693609 

[AUTO]: updating luabinding automatically
This commit is contained in:
Ricardo Quesada 2014-05-09 20:56:03 -07:00
parent 36074f7bbe f0c240f885
commit 029c38a789
7 changed files with 2699 additions and 2760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cocos/scripting/lua-bindings/auto/api/GLProgram.lua
View File

@ -44,6 +44,12 @@
-- @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(matrix_table) -- overload function: setUniformsForBuiltins(matrix_table)
-- --
@ -82,7 +88,7 @@
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] getUniformLocation -- @function [parent=#GLProgram] getUniformLocation
-- @param self -- @param self
-- @param #char char -- @param #string str
-- @return int#int ret (return value: int) -- @return int#int ret (return value: int)
-------------------------------- --------------------------------
@ -112,15 +118,21 @@
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] bindAttribLocation -- @function [parent=#GLProgram] bindAttribLocation
-- @param self -- @param self
-- @param #char char -- @param #string str
-- @param #unsigned int int -- @param #unsigned int int
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] getAttribLocation -- @function [parent=#GLProgram] getAttribLocation
-- @param self -- @param self
-- @param #char char -- @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 -- @function [parent=#GLProgram] setUniformLocationWithMatrix2fv
-- @param self -- @param self
@ -149,6 +161,20 @@
-- @param #int int -- @param #int int
-- @param #int int -- @param #int int
--------------------------------
-- @function [parent=#GLProgram] createWithByteArrays
-- @param self
-- @param #char char
-- @param #char char
-- @return GLProgram#GLProgram ret (return value: cc.GLProgram)
--------------------------------
-- @function [parent=#GLProgram] createWithFilenames
-- @param self
-- @param #string str
-- @param #string str
-- @return GLProgram#GLProgram ret (return value: cc.GLProgram)
-------------------------------- --------------------------------
-- @function [parent=#GLProgram] GLProgram -- @function [parent=#GLProgram] GLProgram
-- @param self -- @param self

46
cocos/scripting/lua-bindings/auto/api/Node.lua
View File

@ -27,15 +27,6 @@
-- @param self -- @param self
-- @param #cc.PhysicsBody physicsbody -- @param #cc.PhysicsBody physicsbody
--------------------------------
-- overload function: getShaderProgram()
--
-- overload function: getShaderProgram()
--
-- @function [parent=#Node] getShaderProgram
-- @param self
-- @return GLProgram#GLProgram ret (retunr value: cc.GLProgram)
-------------------------------- --------------------------------
-- @function [parent=#Node] getDescription -- @function [parent=#Node] getDescription
-- @param self -- @param self
@ -125,9 +116,9 @@
-- @return int#int ret (return value: int) -- @return int#int ret (return value: int)
-------------------------------- --------------------------------
-- @function [parent=#Node] getNodeToWorldAffineTransform -- @function [parent=#Node] getGLProgram
-- @param self -- @param self
-- @return AffineTransform#AffineTransform ret (return value: cc.AffineTransform) -- @return GLProgram#GLProgram ret (return value: cc.GLProgram)
-------------------------------- --------------------------------
-- @function [parent=#Node] getNodeToWorldTransform -- @function [parent=#Node] getNodeToWorldTransform
@ -167,9 +158,9 @@
-- @param #float float -- @param #float float
-------------------------------- --------------------------------
-- @function [parent=#Node] setSkewY -- @function [parent=#Node] setGLProgramState
-- @param self -- @param self
-- @param #float float -- @param #cc.GLProgramState glprogramstate
-------------------------------- --------------------------------
-- @function [parent=#Node] getOpacity -- @function [parent=#Node] getOpacity
@ -263,6 +254,11 @@
-- @param self -- @param self
-- @param #bool bool -- @param #bool bool
--------------------------------
-- @function [parent=#Node] setSkewY
-- @param self
-- @param #float float
-------------------------------- --------------------------------
-- @function [parent=#Node] setPositionZ -- @function [parent=#Node] setPositionZ
-- @param self -- @param self
@ -320,9 +316,9 @@
-- @return bool#bool ret (return value: bool) -- @return bool#bool ret (return value: bool)
-------------------------------- --------------------------------
-- @function [parent=#Node] setShaderProgram -- @function [parent=#Node] isOpacityModifyRGB
-- @param self -- @param self
-- @param #cc.GLProgram glprogram -- @return bool#bool ret (return value: bool)
-------------------------------- --------------------------------
-- @function [parent=#Node] getRotation -- @function [parent=#Node] getRotation
@ -340,6 +336,11 @@
-- @param #cc.Action action -- @param #cc.Action action
-- @return Action#Action ret (return value: cc.Action) -- @return Action#Action ret (return value: cc.Action)
--------------------------------
-- @function [parent=#Node] getGLProgramState
-- @param self
-- @return GLProgramState#GLProgramState ret (return value: cc.GLProgramState)
-------------------------------- --------------------------------
-- @function [parent=#Node] setScheduler -- @function [parent=#Node] setScheduler
-- @param self -- @param self
@ -458,6 +459,11 @@
-- @param self -- @param self
-- @param #float float -- @param #float float
--------------------------------
-- @function [parent=#Node] getNodeToWorldAffineTransform
-- @param self
-- @return AffineTransform#AffineTransform ret (return value: cc.AffineTransform)
-------------------------------- --------------------------------
-- @function [parent=#Node] updateDisplayedColor -- @function [parent=#Node] updateDisplayedColor
-- @param self -- @param self
@ -613,6 +619,11 @@
-- @param self -- @param self
-- @return matrix_table#matrix_table ret (return value: matrix_table) -- @return matrix_table#matrix_table ret (return value: matrix_table)
--------------------------------
-- @function [parent=#Node] setGLProgram
-- @param self
-- @param #cc.GLProgram glprogram
-------------------------------- --------------------------------
-- @function [parent=#Node] getScale -- @function [parent=#Node] getScale
-- @param self -- @param self
@ -638,11 +649,6 @@
-- @param self -- @param self
-- @return bool#bool ret (return value: bool) -- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#Node] isOpacityModifyRGB
-- @param self
-- @return bool#bool ret (return value: bool)
-------------------------------- --------------------------------
-- @function [parent=#Node] stopAction -- @function [parent=#Node] stopAction
-- @param self -- @param self

39
cocos/scripting/lua-bindings/auto/api/ShaderCache.lua
View File

@ -1,39 +0,0 @@
--------------------------------
-- @module ShaderCache
-- @extend Ref
--------------------------------
-- @function [parent=#ShaderCache] reloadDefaultShaders
-- @param self
--------------------------------
-- @function [parent=#ShaderCache] addProgram
-- @param self
-- @param #cc.GLProgram glprogram
-- @param #string str
--------------------------------
-- @function [parent=#ShaderCache] getProgram
-- @param self
-- @param #string str
-- @return GLProgram#GLProgram ret (return value: cc.GLProgram)
--------------------------------
-- @function [parent=#ShaderCache] loadDefaultShaders
-- @param self
--------------------------------
-- @function [parent=#ShaderCache] destroyInstance
-- @param self
--------------------------------
-- @function [parent=#ShaderCache] getInstance
-- @param self
-- @return ShaderCache#ShaderCache ret (return value: cc.ShaderCache)
--------------------------------
-- @function [parent=#ShaderCache] ShaderCache
-- @param self
return nil

20
cocos/scripting/lua-bindings/auto/api/Texture2D.lua
View File

@ -3,11 +3,6 @@
-- @module Texture2D -- @module Texture2D
-- @extend Ref -- @extend Ref
--------------------------------
-- @function [parent=#Texture2D] getShaderProgram
-- @param self
-- @return GLProgram#GLProgram ret (return value: cc.GLProgram)
-------------------------------- --------------------------------
-- @function [parent=#Texture2D] getMaxT -- @function [parent=#Texture2D] getMaxT
-- @param self -- @param self
@ -29,11 +24,6 @@
-- @param #cc.Texture2D::PixelFormat pixelformat -- @param #cc.Texture2D::PixelFormat pixelformat
-- @return bool#bool ret (retunr value: bool) -- @return bool#bool ret (retunr value: bool)
--------------------------------
-- @function [parent=#Texture2D] setShaderProgram
-- @param self
-- @param #cc.GLProgram glprogram
-------------------------------- --------------------------------
-- @function [parent=#Texture2D] getMaxS -- @function [parent=#Texture2D] getMaxS
-- @param self -- @param self
@ -151,11 +141,21 @@
-- @param self -- @param self
-- @param #vector2_table array -- @param #vector2_table array
--------------------------------
-- @function [parent=#Texture2D] getGLProgram
-- @param self
-- @return GLProgram#GLProgram ret (return value: cc.GLProgram)
-------------------------------- --------------------------------
-- @function [parent=#Texture2D] hasMipmaps -- @function [parent=#Texture2D] hasMipmaps
-- @param self -- @param self
-- @return bool#bool ret (return value: bool) -- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#Texture2D] setGLProgram
-- @param self
-- @param #cc.GLProgram glprogram
-------------------------------- --------------------------------
-- @function [parent=#Texture2D] setMaxS -- @function [parent=#Texture2D] setMaxS
-- @param self -- @param self

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

@ -12,13 +12,8 @@
-------------------------------------------------------- --------------------------------------------------------
-- the cc GLProgram -- the cc EventListener
-- @field [parent=#cc] GLProgram#GLProgram GLProgram preloaded module -- @field [parent=#cc] EventListener#EventListener EventListener preloaded module
--------------------------------------------------------
-- the cc Touch
-- @field [parent=#cc] Touch#Touch Touch preloaded module
-------------------------------------------------------- --------------------------------------------------------
@ -26,6 +21,16 @@
-- @field [parent=#cc] Event#Event Event preloaded module -- @field [parent=#cc] Event#Event Event preloaded module
--------------------------------------------------------
-- the cc EventDispatcher
-- @field [parent=#cc] EventDispatcher#EventDispatcher EventDispatcher preloaded module
--------------------------------------------------------
-- the cc Touch
-- @field [parent=#cc] Touch#Touch Touch preloaded module
-------------------------------------------------------- --------------------------------------------------------
-- the cc EventTouch -- the cc EventTouch
-- @field [parent=#cc] EventTouch#EventTouch EventTouch preloaded module -- @field [parent=#cc] EventTouch#EventTouch EventTouch preloaded module
@ -41,21 +46,16 @@
-- @field [parent=#cc] Texture2D#Texture2D Texture2D preloaded module -- @field [parent=#cc] Texture2D#Texture2D Texture2D preloaded module
--------------------------------------------------------
-- the cc EventListener
-- @field [parent=#cc] EventListener#EventListener EventListener preloaded module
--------------------------------------------------------
-- the cc EventDispatcher
-- @field [parent=#cc] EventDispatcher#EventDispatcher EventDispatcher preloaded module
-------------------------------------------------------- --------------------------------------------------------
-- the cc Node -- the cc Node
-- @field [parent=#cc] Node#Node Node preloaded module -- @field [parent=#cc] Node#Node Node preloaded module
--------------------------------------------------------
-- the cc GLProgram
-- @field [parent=#cc] GLProgram#GLProgram GLProgram preloaded module
-------------------------------------------------------- --------------------------------------------------------
-- the cc AtlasNode -- the cc AtlasNode
-- @field [parent=#cc] AtlasNode#AtlasNode AtlasNode preloaded module -- @field [parent=#cc] AtlasNode#AtlasNode AtlasNode preloaded module
@ -1136,11 +1136,6 @@
-- @field [parent=#cc] GLView#GLView GLView preloaded module -- @field [parent=#cc] GLView#GLView GLView preloaded module
--------------------------------------------------------
-- the cc ShaderCache
-- @field [parent=#cc] ShaderCache#ShaderCache ShaderCache preloaded module
-------------------------------------------------------- --------------------------------------------------------
-- the cc AnimationCache -- the cc AnimationCache
-- @field [parent=#cc] AnimationCache#AnimationCache AnimationCache preloaded module -- @field [parent=#cc] AnimationCache#AnimationCache AnimationCache preloaded module

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

File diff suppressed because it is too large Load Diff

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

@ -1561,8 +1561,6 @@ int register_all_cocos2dx(lua_State* tolua_S);