mirror of https://github.com/axmolengine/axmol.git
Merge pull request #13111 from CocosRobot/update_lua_bindings_1438247801
[ci skip][AUTO]: updating luabinding & jsbinding automatically
This commit is contained in:
commit
7a5c91c3d4
|
@ -18595,6 +18595,16 @@ framebuffer
|
|||
{
|
||||
},
|
||||
|
||||
/**
|
||||
* @method isViewProjectionUpdated
|
||||
* @return {bool}
|
||||
*/
|
||||
isViewProjectionUpdated : function (
|
||||
)
|
||||
{
|
||||
return false;
|
||||
},
|
||||
|
||||
/**
|
||||
* @method initPerspective
|
||||
* @param {float} arg0
|
||||
|
|
|
@ -57555,6 +57555,24 @@ bool js_cocos2dx_Camera_setFrameBufferObject(JSContext *cx, uint32_t argc, jsval
|
|||
JS_ReportError(cx, "js_cocos2dx_Camera_setFrameBufferObject : wrong number of arguments: %d, was expecting %d", argc, 1);
|
||||
return false;
|
||||
}
|
||||
bool js_cocos2dx_Camera_isViewProjectionUpdated(JSContext *cx, uint32_t argc, jsval *vp)
|
||||
{
|
||||
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
|
||||
JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
|
||||
js_proxy_t *proxy = jsb_get_js_proxy(obj);
|
||||
cocos2d::Camera* cobj = (cocos2d::Camera *)(proxy ? proxy->ptr : NULL);
|
||||
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Camera_isViewProjectionUpdated : Invalid Native Object");
|
||||
if (argc == 0) {
|
||||
bool ret = cobj->isViewProjectionUpdated();
|
||||
jsval jsret = JSVAL_NULL;
|
||||
jsret = BOOLEAN_TO_JSVAL(ret);
|
||||
args.rval().set(jsret);
|
||||
return true;
|
||||
}
|
||||
|
||||
JS_ReportError(cx, "js_cocos2dx_Camera_isViewProjectionUpdated : wrong number of arguments: %d, was expecting %d", argc, 0);
|
||||
return false;
|
||||
}
|
||||
bool js_cocos2dx_Camera_initPerspective(JSContext *cx, uint32_t argc, jsval *vp)
|
||||
{
|
||||
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
|
||||
|
@ -57819,6 +57837,7 @@ void js_register_cocos2dx_Camera(JSContext *cx, JS::HandleObject global) {
|
|||
JS_FN("getFarPlane", js_cocos2dx_Camera_getFarPlane, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
|
||||
JS_FN("applyFrameBufferObject", js_cocos2dx_Camera_applyFrameBufferObject, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
|
||||
JS_FN("setFrameBufferObject", js_cocos2dx_Camera_setFrameBufferObject, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
|
||||
JS_FN("isViewProjectionUpdated", js_cocos2dx_Camera_isViewProjectionUpdated, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
|
||||
JS_FN("initPerspective", js_cocos2dx_Camera_initPerspective, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE),
|
||||
JS_FS_END
|
||||
};
|
||||
|
|
|
@ -3363,6 +3363,7 @@ bool js_cocos2dx_Camera_setCameraFlag(JSContext *cx, uint32_t argc, jsval *vp);
|
|||
bool js_cocos2dx_Camera_getFarPlane(JSContext *cx, uint32_t argc, jsval *vp);
|
||||
bool js_cocos2dx_Camera_applyFrameBufferObject(JSContext *cx, uint32_t argc, jsval *vp);
|
||||
bool js_cocos2dx_Camera_setFrameBufferObject(JSContext *cx, uint32_t argc, jsval *vp);
|
||||
bool js_cocos2dx_Camera_isViewProjectionUpdated(JSContext *cx, uint32_t argc, jsval *vp);
|
||||
bool js_cocos2dx_Camera_initPerspective(JSContext *cx, uint32_t argc, jsval *vp);
|
||||
bool js_cocos2dx_Camera_createOrthographic(JSContext *cx, uint32_t argc, jsval *vp);
|
||||
bool js_cocos2dx_Camera_getVisitingCamera(JSContext *cx, uint32_t argc, jsval *vp);
|
||||
|
|
|
@ -182,6 +182,13 @@
|
|||
-- @param #cc.experimental::FrameBuffer fbo
|
||||
-- @return Camera#Camera self (return value: cc.Camera)
|
||||
|
||||
--------------------------------
|
||||
-- Whether or not the viewprojection matrix was updated since the last frame.<br>
|
||||
-- return True if the viewprojection matrix was updated since the last frame.
|
||||
-- @function [parent=#Camera] isViewProjectionUpdated
|
||||
-- @param self
|
||||
-- @return bool#bool ret (return value: bool)
|
||||
|
||||
--------------------------------
|
||||
--
|
||||
-- @function [parent=#Camera] initPerspective
|
||||
|
@ -251,6 +258,15 @@
|
|||
-- @param self
|
||||
-- @return Camera#Camera ret (return value: cc.Camera)
|
||||
|
||||
--------------------------------
|
||||
--
|
||||
-- @function [parent=#Camera] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #mat4_table parentTransform
|
||||
-- @param #unsigned int parentFlags
|
||||
-- @return Camera#Camera self (return value: cc.Camera)
|
||||
|
||||
--------------------------------
|
||||
--
|
||||
-- @function [parent=#Camera] Camera
|
||||
|
|
|
@ -77519,6 +77519,53 @@ int lua_cocos2dx_Camera_setFrameBufferObject(lua_State* tolua_S)
|
|||
|
||||
return 0;
|
||||
}
|
||||
int lua_cocos2dx_Camera_isViewProjectionUpdated(lua_State* tolua_S)
|
||||
{
|
||||
int argc = 0;
|
||||
cocos2d::Camera* cobj = nullptr;
|
||||
bool ok = true;
|
||||
|
||||
#if COCOS2D_DEBUG >= 1
|
||||
tolua_Error tolua_err;
|
||||
#endif
|
||||
|
||||
|
||||
#if COCOS2D_DEBUG >= 1
|
||||
if (!tolua_isusertype(tolua_S,1,"cc.Camera",0,&tolua_err)) goto tolua_lerror;
|
||||
#endif
|
||||
|
||||
cobj = (cocos2d::Camera*)tolua_tousertype(tolua_S,1,0);
|
||||
|
||||
#if COCOS2D_DEBUG >= 1
|
||||
if (!cobj)
|
||||
{
|
||||
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Camera_isViewProjectionUpdated'", nullptr);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
argc = lua_gettop(tolua_S)-1;
|
||||
if (argc == 0)
|
||||
{
|
||||
if(!ok)
|
||||
{
|
||||
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Camera_isViewProjectionUpdated'", nullptr);
|
||||
return 0;
|
||||
}
|
||||
bool ret = cobj->isViewProjectionUpdated();
|
||||
tolua_pushboolean(tolua_S,(bool)ret);
|
||||
return 1;
|
||||
}
|
||||
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Camera:isViewProjectionUpdated",argc, 0);
|
||||
return 0;
|
||||
|
||||
#if COCOS2D_DEBUG >= 1
|
||||
tolua_lerror:
|
||||
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_isViewProjectionUpdated'.",&tolua_err);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
int lua_cocos2dx_Camera_initPerspective(lua_State* tolua_S)
|
||||
{
|
||||
int argc = 0;
|
||||
|
@ -77911,6 +77958,7 @@ int lua_register_cocos2dx_Camera(lua_State* tolua_S)
|
|||
tolua_function(tolua_S,"getFarPlane",lua_cocos2dx_Camera_getFarPlane);
|
||||
tolua_function(tolua_S,"applyFrameBufferObject",lua_cocos2dx_Camera_applyFrameBufferObject);
|
||||
tolua_function(tolua_S,"setFrameBufferObject",lua_cocos2dx_Camera_setFrameBufferObject);
|
||||
tolua_function(tolua_S,"isViewProjectionUpdated",lua_cocos2dx_Camera_isViewProjectionUpdated);
|
||||
tolua_function(tolua_S,"initPerspective",lua_cocos2dx_Camera_initPerspective);
|
||||
tolua_function(tolua_S,"createOrthographic", lua_cocos2dx_Camera_createOrthographic);
|
||||
tolua_function(tolua_S,"getVisitingCamera", lua_cocos2dx_Camera_getVisitingCamera);
|
||||
|
|
|
@ -2080,6 +2080,7 @@ int register_all_cocos2dx(lua_State* tolua_S);
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif // __cocos2dx_h__
|
||||
|
|
Loading…
Reference in New Issue