Merge pull request #6849 from CocosRobot/update_lua_bindings_1400586331

[AUTO]: updating luabinding automatically

cocos/scripting/lua-bindings/auto/api/GLProgramCache.lua

@@ -0,0 +1,39 @@
+
+--------------------------------
+-- @module GLProgramCache
+-- @extend Ref
+
+--------------------------------
+-- @function [parent=#GLProgramCache] addGLProgram 
+-- @param self
+-- @param #cc.GLProgram glprogram
+-- @param #string str
+        
+--------------------------------
+-- @function [parent=#GLProgramCache] getGLProgram 
+-- @param self
+-- @param #string str
+-- @return GLProgram#GLProgram ret (return value: cc.GLProgram)
+        
+--------------------------------
+-- @function [parent=#GLProgramCache] reloadDefaultGLPrograms 
+-- @param self
+        
+--------------------------------
+-- @function [parent=#GLProgramCache] loadDefaultGLPrograms 
+-- @param self
+        
+--------------------------------
+-- @function [parent=#GLProgramCache] destroyInstance 
+-- @param self
+        
+--------------------------------
+-- @function [parent=#GLProgramCache] getInstance 
+-- @param self
+-- @return GLProgramCache#GLProgramCache ret (return value: cc.GLProgramCache)
+        
+--------------------------------
+-- @function [parent=#GLProgramCache] GLProgramCache 
+-- @param self
+        
+return nil

cocos/scripting/lua-bindings/auto/api/GLProgramState.lua

@@ -0,0 +1,100 @@
+
+--------------------------------
+-- @module GLProgramState
+-- @extend Ref
+
+--------------------------------
+-- overload function: setUniformTexture(string, unsigned int)
+--          
+-- overload function: setUniformTexture(string, cc.Texture2D)
+--          
+-- @function [parent=#GLProgramState] setUniformTexture
+-- @param self
+-- @param #string str
+-- @param #cc.Texture2D texture2d
+
+--------------------------------
+-- @function [parent=#GLProgramState] setUniformMat4 
+-- @param self
+-- @param #string str
+-- @param #cc.Mat4 mat4
+        
+--------------------------------
+-- @function [parent=#GLProgramState] getUniformCount 
+-- @param self
+-- @return long#long ret (return value: long)
+        
+--------------------------------
+-- @function [parent=#GLProgramState] setUniformFloat 
+-- @param self
+-- @param #string str
+-- @param #float float
+        
+--------------------------------
+-- @function [parent=#GLProgramState] setUniformVec3 
+-- @param self
+-- @param #string str
+-- @param #cc.Vec3 vec3
+        
+--------------------------------
+-- @function [parent=#GLProgramState] setGLProgram 
+-- @param self
+-- @param #cc.GLProgram glprogram
+        
+--------------------------------
+-- @function [parent=#GLProgramState] setUniformVec4 
+-- @param self
+-- @param #string str
+-- @param #cc.Vec4 vec4
+        
+--------------------------------
+-- @function [parent=#GLProgramState] getVertexAttribCount 
+-- @param self
+-- @return long#long ret (return value: long)
+        
+--------------------------------
+-- @function [parent=#GLProgramState] setUniformInt 
+-- @param self
+-- @param #string str
+-- @param #int int
+        
+--------------------------------
+-- @function [parent=#GLProgramState] setUniformVec2 
+-- @param self
+-- @param #string str
+-- @param #cc.Vec2 vec2
+        
+--------------------------------
+-- @function [parent=#GLProgramState] getVertexAttribsFlags 
+-- @param self
+-- @return unsigned int#unsigned int ret (return value: unsigned int)
+        
+--------------------------------
+-- @function [parent=#GLProgramState] apply 
+-- @param self
+-- @param #cc.Mat4 mat4
+        
+--------------------------------
+-- @function [parent=#GLProgramState] getGLProgram 
+-- @param self
+-- @return GLProgram#GLProgram ret (return value: cc.GLProgram)
+        
+--------------------------------
+-- @function [parent=#GLProgramState] create 
+-- @param self
+-- @param #cc.GLProgram glprogram
+-- @return GLProgramState#GLProgramState ret (return value: cc.GLProgramState)
+        
+--------------------------------
+-- @function [parent=#GLProgramState] getOrCreateWithGLProgramName 
+-- @param self
+-- @param #string str
+-- @return GLProgramState#GLProgramState ret (return value: cc.GLProgramState)
+        
+--------------------------------
+-- @function [parent=#GLProgramState] getOrCreateWithGLProgram 
+-- @param self
+-- @param #cc.GLProgram glprogram
+-- @return GLProgramState#GLProgramState ret (return value: cc.GLProgramState)
+        
+return nil

cocos/scripting/lua-bindings/auto/api/Mesh.lua

@@ -0,0 +1,66 @@
+
+--------------------------------
+-- @module Mesh
+-- @extend Ref
+
+--------------------------------
+-- @function [parent=#Mesh] restore 
+-- @param self
+        
+--------------------------------
+-- @function [parent=#Mesh] getMeshVertexAttribCount 
+-- @param self
+-- @return long#long ret (return value: long)
+        
+--------------------------------
+-- @function [parent=#Mesh] getIndexFormat 
+-- @param self
+-- @return Mesh::IndexFormat#Mesh::IndexFormat ret (return value: cc.Mesh::IndexFormat)
+        
+--------------------------------
+-- @function [parent=#Mesh] getVertexSizeInBytes 
+-- @param self
+-- @return int#int ret (return value: int)
+        
+--------------------------------
+-- @function [parent=#Mesh] getPrimitiveType 
+-- @param self
+-- @return Mesh::PrimitiveType#Mesh::PrimitiveType ret (return value: cc.Mesh::PrimitiveType)
+        
+--------------------------------
+-- @function [parent=#Mesh] getIndexCount 
+-- @param self
+-- @return long#long ret (return value: long)
+        
+--------------------------------
+-- @function [parent=#Mesh] getVertexBuffer 
+-- @param self
+-- @return unsigned int#unsigned int ret (return value: unsigned int)
+        
+--------------------------------
+-- @function [parent=#Mesh] getMeshVertexAttribute 
+-- @param self
+-- @param #int int
+-- @return MeshVertexAttrib#MeshVertexAttrib ret (return value: cc.MeshVertexAttrib)
+        
+--------------------------------
+-- @function [parent=#Mesh] getIndexBuffer 
+-- @param self
+-- @return unsigned int#unsigned int ret (return value: unsigned int)
+        
+--------------------------------
+-- @function [parent=#Mesh] hasVertexAttrib 
+-- @param self
+-- @param #int int
+-- @return bool#bool ret (return value: bool)
+        
+--------------------------------
+-- @function [parent=#Mesh] create 
+-- @param self
+-- @param #array_table array
+-- @param #array_table array
+-- @param #array_table array
+-- @param #array_table vector<short, std::allocator<short> >
+-- @return Mesh#Mesh ret (return value: cc.Mesh)
+        
+return nil

cocos/scripting/lua-bindings/auto/api/Sprite3D.lua

@@ -12,6 +12,11 @@
 -- @param self
 -- @param #string str
 
+--------------------------------
+-- @function [parent=#Sprite3D] getMesh 
+-- @param self
+-- @return Mesh#Mesh ret (return value: cc.Mesh)
+        
 --------------------------------
 -- @function [parent=#Sprite3D] getBlendFunc 
 -- @param self

cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua

@@ -51,6 +51,11 @@
 -- @field [parent=#cc] Node#Node Node preloaded module
 
 
+--------------------------------------------------------
+-- the cc GLProgramState
+-- @field [parent=#cc] GLProgramState#GLProgramState GLProgramState preloaded module
+
+
 --------------------------------------------------------
 -- the cc AtlasNode
 -- @field [parent=#cc] AtlasNode#AtlasNode AtlasNode preloaded module
@@ -1126,6 +1131,11 @@
 -- @field [parent=#cc] TiledGrid3D#TiledGrid3D TiledGrid3D preloaded module
 
 
+--------------------------------------------------------
+-- the cc GLProgramCache
+-- @field [parent=#cc] GLProgramCache#GLProgramCache GLProgramCache preloaded module
+
+
 --------------------------------------------------------
 -- the cc TextureCache
 -- @field [parent=#cc] TextureCache#TextureCache TextureCache preloaded module
@@ -1206,6 +1216,11 @@
 -- @field [parent=#cc] Sprite3D#Sprite3D Sprite3D preloaded module
 
 
+--------------------------------------------------------
+-- the cc Mesh
+-- @field [parent=#cc] Mesh#Mesh Mesh preloaded module
+
+
 --------------------------------------------------------
 -- the cc SimpleAudioEngine
 -- @field [parent=#cc] SimpleAudioEngine#SimpleAudioEngine SimpleAudioEngine preloaded module

cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp

@@ -1548,6 +1548,44 @@ int register_all_cocos2dx(lua_State* tolua_S);
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+