Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically #19390

Merged
merged 1 commit into from
Feb 13, 2019
Merged

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically #19390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6733,6 +6733,16 @@ supportsMapBuffer : function (
return false;
},

/**
* @method getInfoAsMap
* @return {map_object}
*/
getInfoAsMap : function (
)
{
return map_object;
},

/**
* @method destroyInstance
*/
Expand Down
19 changes: 19 additions & 0 deletions cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17897,6 +17897,24 @@ bool js_cocos2dx_Configuration_supportsMapBuffer(JSContext *cx, uint32_t argc, j
JS_ReportError(cx, "js_cocos2dx_Configuration_supportsMapBuffer : wrong number of arguments: %d, was expecting %d", argc, 0);
return false;
}
bool js_cocos2dx_Configuration_getInfoAsMap(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::Configuration* cobj = (cocos2d::Configuration *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Configuration_getInfoAsMap : Invalid Native Object");
if (argc == 0) {
const cocos2d::ValueMap& ret = cobj->getInfoAsMap();
JS::RootedValue jsret(cx);
jsret = ccvaluemap_to_jsval(cx, ret);
args.rval().set(jsret);
return true;
}

JS_ReportError(cx, "js_cocos2dx_Configuration_getInfoAsMap : wrong number of arguments: %d, was expecting %d", argc, 0);
return false;
}
bool js_cocos2dx_Configuration_destroyInstance(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
Expand Down Expand Up @@ -17967,6 +17985,7 @@ void js_register_cocos2dx_Configuration(JSContext *cx, JS::HandleObject global)
JS_FN("getValue", js_cocos2dx_Configuration_getValue, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("gatherGPUInfo", js_cocos2dx_Configuration_gatherGPUInfo, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("supportsMapBuffer", js_cocos2dx_Configuration_supportsMapBuffer, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getInfoAsMap", js_cocos2dx_Configuration_getInfoAsMap, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FS_END
};

Expand Down
1 change: 1 addition & 0 deletions cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,6 +1004,7 @@ bool js_cocos2dx_Configuration_getMaxTextureUnits(JSContext *cx, uint32_t argc,
bool js_cocos2dx_Configuration_getValue(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Configuration_gatherGPUInfo(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Configuration_supportsMapBuffer(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Configuration_getInfoAsMap(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Configuration_destroyInstance(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Configuration_getInstance(JSContext *cx, uint32_t argc, jsval *vp);

Expand Down