Merge pull request #11694 from CocosRobot/update_lua_bindings_1430804693

[AUTO]: updating luabinding & jsbinding automatically

cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_3d_auto_api.js

@@ -342,7 +342,7 @@ int
 
 /**
  * @method getRootCount
- * @return {int}
+ * @return {long}
  */
 getRootCount : function (
 )
@@ -364,7 +364,7 @@ bone3d
 
 /**
  * @method getBoneCount
- * @return {int}
+ * @return {long}
  */
 getBoneCount : function (
 )
@@ -512,7 +512,7 @@ materialdatas
 
 /**
  * @method getMeshCount
- * @return {int}
+ * @return {long}
  */
 getMeshCount : function (
 )
@@ -927,7 +927,7 @@ isVisible : function (
 
 /**
  * @method getIndexCount
- * @return {int}
+ * @return {long}
  */
 getIndexCount : function (
 )
@@ -955,7 +955,7 @@ meshindexdata
 
 /**
  * @method getMeshVertexAttribCount
- * @return {int}
+ * @return {long}
  */
 getMeshVertexAttribCount : function (
 )

cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js

@@ -1444,7 +1444,7 @@ getAnchorPoint : function (
 
 /**
  * @method getNumberOfRunningActions
- * @return {int}
+ * @return {long}
  */
 getNumberOfRunningActions : function (
 )
@@ -1472,7 +1472,7 @@ isVisible : function (
 
 /**
  * @method getChildrenCount
- * @return {int}
+ * @return {long}
  */
 getChildrenCount : function (
 )
@@ -5751,6 +5751,18 @@ str
     return ;
 },
 
+/**
+ * @method getSuitableFOpen
+ * @param {String} arg0
+ * @return {String}
+ */
+getSuitableFOpen : function (
+str 
+)
+{
+    return ;
+},
+
 /**
  * @method setWritablePath
  * @param {String} arg0
@@ -6756,7 +6768,7 @@ node
 /**
  * @method getNumberOfRunningActionsInTarget
  * @param {cc.Node} arg0
- * @return {int}
+ * @return {long}
  */
 getNumberOfRunningActionsInTarget : function (
 node 
@@ -10209,7 +10221,7 @@ mat4
 
 /**
  * @method getUniformCount
- * @return {int}
+ * @return {long}
  */
 getUniformCount : function (
 )
@@ -10263,7 +10275,7 @@ int
 
 /**
  * @method getVertexAttribCount
- * @return {int}
+ * @return {long}
  */
 getVertexAttribCount : function (
 )
@@ -10456,7 +10468,7 @@ getBlendFunc : function (
 
 /**
  * @method getQuadsToDraw
- * @return {int}
+ * @return {long}
  */
 getQuadsToDraw : function (
 )
@@ -10494,10 +10506,10 @@ int
 
 /**
  * @method setQuadsToDraw
- * @param {int} arg0
+ * @param {long} arg0
  */
 setQuadsToDraw : function (
-int 
+long 
 )
 {
 },
@@ -11333,12 +11345,12 @@ bool
 /**
  * @method initWithTexture
  * @param {cc.Texture2D} arg0
- * @param {int} arg1
+ * @param {long} arg1
  * @return {bool}
  */
 initWithTexture : function (
 texture2d, 
-int 
+long 
 )
 {
     return false;
@@ -11357,7 +11369,7 @@ getBlendFunc : function (
 /**
  * @method lowestAtlasIndexInChild
  * @param {cc.Sprite} arg0
- * @return {int}
+ * @return {long}
  */
 lowestAtlasIndexInChild : function (
 sprite 
@@ -11370,7 +11382,7 @@ sprite
  * @method atlasIndexForChild
  * @param {cc.Sprite} arg0
  * @param {int} arg1
- * @return {int}
+ * @return {long}
  */
 atlasIndexForChild : function (
 sprite, 
@@ -11393,12 +11405,12 @@ textureatlas
 /**
  * @method initWithFile
  * @param {String} arg0
- * @param {int} arg1
+ * @param {long} arg1
  * @return {bool}
  */
 initWithFile : function (
 str, 
-int 
+long 
 )
 {
     return false;
@@ -11435,11 +11447,11 @@ getTextureAtlas : function (
 /**
  * @method insertQuadFromSprite
  * @param {cc.Sprite} arg0
- * @param {int} arg1
+ * @param {long} arg1
  */
 insertQuadFromSprite : function (
 sprite, 
-int 
+long 
 )
 {
 },
@@ -11457,12 +11469,12 @@ texture2d
 /**
  * @method rebuildIndexInOrder
  * @param {cc.Sprite} arg0
- * @param {int} arg1
+ * @param {long} arg1
- * @return {int}
+ * @return {long}
  */
 rebuildIndexInOrder : function (
 sprite, 
-int 
+long 
 )
 {
     return 0;
@@ -11471,7 +11483,7 @@ int
 /**
  * @method highestAtlasIndexInChild
  * @param {cc.Sprite} arg0
- * @return {int}
+ * @return {long}
  */
 highestAtlasIndexInChild : function (
 sprite 
@@ -11482,11 +11494,11 @@ sprite
 
 /**
  * @method removeChildAtIndex
- * @param {int} arg0
+ * @param {long} arg0
  * @param {bool} arg1
  */
 removeChildAtIndex : function (
-int, 
+long, 
 bool 
 )
 {
@@ -11515,12 +11527,12 @@ blendfunc
 /**
  * @method create
  * @param {String} arg0
- * @param {int} arg1
+ * @param {long} arg1
  * @return {cc.SpriteBatchNode}
  */
 create : function (
 str, 
-int 
+long 
 )
 {
     return cc.SpriteBatchNode;
@@ -11529,12 +11541,12 @@ int
 /**
  * @method createWithTexture
  * @param {cc.Texture2D} arg0
- * @param {int} arg1
+ * @param {long} arg1
  * @return {cc.SpriteBatchNode}
  */
 createWithTexture : function (
 texture2d, 
-int 
+long 
 )
 {
     return cc.SpriteBatchNode;
@@ -15219,7 +15231,7 @@ spriteframe
 
 /**
  * @method getAtlasIndex
- * @return {int}
+ * @return {long}
  */
 getAtlasIndex : function (
 )
@@ -15250,11 +15262,11 @@ getBlendFunc : function (
 /**
  * @method setDisplayFrameWithAnimationName
  * @param {String} arg0
- * @param {int} arg1
+ * @param {long} arg1
  */
 setDisplayFrameWithAnimationName : function (
 str, 
-int 
+long 
 )
 {
 },
@@ -15291,10 +15303,10 @@ isDirty : function (
 
 /**
  * @method setAtlasIndex
- * @param {int} arg0
+ * @param {long} arg0
  */
 setAtlasIndex : function (
-int 
+long 
 )
 {
 },
@@ -15487,7 +15499,7 @@ hasPremultipliedAlpha : function (
 
 /**
  * @method getDataLen
- * @return {int}
+ * @return {long}
  */
 getDataLen : function (
 )
@@ -15624,7 +15636,7 @@ getMipmaps : function (
 /**
  * @method initWithRawData
  * @param {unsigned char} arg0
- * @param {int} arg1
+ * @param {long} arg1
  * @param {int} arg2
  * @param {int} arg3
  * @param {int} arg4
@@ -15633,7 +15645,7 @@ getMipmaps : function (
  */
 initWithRawData : function (
 char, 
-int, 
+long, 
 int, 
 int, 
 int, 

cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_extension_auto_api.js

@@ -2144,7 +2144,7 @@ reset : function (
 
 /**
  * @method getIdx
- * @return {int}
+ * @return {long}
  */
 getIdx : function (
 )
@@ -2154,10 +2154,10 @@ getIdx : function (
 
 /**
  * @method setIdx
- * @param {int} arg0
+ * @param {long} arg0
  */
 setIdx : function (
-int 
+long 
 )
 {
 },
@@ -2190,10 +2190,10 @@ cc.TableView = {
 
 /**
  * @method updateCellAtIndex
- * @param {int} arg0
+ * @param {long} arg0
  */
 updateCellAtIndex : function (
-int 
+long 
 )
 {
 },
@@ -2238,10 +2238,10 @@ getVerticalFillOrder : function (
 
 /**
  * @method removeCellAtIndex
- * @param {int} arg0
+ * @param {long} arg0
  */
 removeCellAtIndex : function (
-int 
+long 
 )
 {
 },
@@ -2280,21 +2280,21 @@ reloadData : function (
 
 /**
  * @method insertCellAtIndex
- * @param {int} arg0
+ * @param {long} arg0
  */
 insertCellAtIndex : function (
-int 
+long 
 )
 {
 },
 
 /**
  * @method cellAtIndex
- * @param {int} arg0
+ * @param {long} arg0
  * @return {cc.TableViewCell}
  */
 cellAtIndex : function (
-int 
+long 
 )
 {
     return cc.TableViewCell;

cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_studio_auto_api.js

@@ -405,7 +405,7 @@ str
 
 /**
  * @method getMovementCount
- * @return {int}
+ * @return {long}
  */
 getMovementCount : function (
 )
@@ -1776,7 +1776,7 @@ bool
 
 /**
  * @method getMovementCount
- * @return {int}
+ * @return {long}
  */
 getMovementCount : function (
 )

cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js

@@ -2090,7 +2090,7 @@ size
 
 /**
  * @method getStringLength
- * @return {int}
+ * @return {long}
  */
 getStringLength : function (
 )
@@ -2244,7 +2244,7 @@ ccui.TextAtlas = {
 
 /**
  * @method getStringLength
- * @return {int}
+ * @return {long}
  */
 getStringLength : function (
 )
@@ -2839,7 +2839,7 @@ ccui.ListView = {
 /**
  * @method getIndex
  * @param {ccui.Widget} arg0
- * @return {int}
+ * @return {long}
  */
 getIndex : function (
 widget 
@@ -2888,17 +2888,17 @@ getItems : function (
 
 /**
  * @method removeItem
- * @param {int} arg0
+ * @param {long} arg0
  */
 removeItem : function (
-int 
+long 
 )
 {
 },
 
 /**
  * @method getCurSelectedIndex
- * @return {int}
+ * @return {long}
  */
 getCurSelectedIndex : function (
 )
@@ -2908,10 +2908,10 @@ getCurSelectedIndex : function (
 
 /**
  * @method insertDefaultItem
- * @param {int} arg0
+ * @param {long} arg0
  */
 insertDefaultItem : function (
-int 
+long 
 )
 {
 },
@@ -2962,11 +2962,11 @@ getItemsMargin : function (
 
 /**
  * @method getItem
- * @param {int} arg0
+ * @param {long} arg0
  * @return {ccui.Widget}
  */
 getItem : function (
-int 
+long 
 )
 {
     return ccui.Widget;
@@ -3001,11 +3001,11 @@ pushBackDefaultItem : function (
 /**
  * @method insertCustomItem
  * @param {ccui.Widget} arg0
- * @param {int} arg1
+ * @param {long} arg1
  */
 insertCustomItem : function (
 widget, 
-int 
+long 
 )
 {
 },
@@ -3988,7 +3988,7 @@ str
 
 /**
  * @method getStringLength
- * @return {int}
+ * @return {long}
  */
 getStringLength : function (
 )
@@ -4068,7 +4068,7 @@ getCustomScrollThreshold : function (
 
 /**
  * @method getCurPageIndex
- * @return {int}
+ * @return {long}
  */
 getCurPageIndex : function (
 )
@@ -4079,12 +4079,12 @@ getCurPageIndex : function (
 /**
  * @method addWidgetToPage
  * @param {ccui.Widget} arg0
- * @param {int} arg1
+ * @param {long} arg1
  * @param {bool} arg2
  */
 addWidgetToPage : function (
 widget, 
-int, 
+long, 
 bool 
 )
 {
@@ -4102,11 +4102,11 @@ isUsingCustomScrollThreshold : function (
 
 /**
  * @method getPage
- * @param {int} arg0
+ * @param {long} arg0
  * @return {ccui.Layout}
  */
 getPage : function (
-int 
+long 
 )
 {
     return ccui.Layout;
@@ -4156,20 +4156,20 @@ int
 
 /**
  * @method scrollToPage
- * @param {int} arg0
+ * @param {long} arg0
  */
 scrollToPage : function (
-int 
+long 
 )
 {
 },
 
 /**
  * @method removePageAtIndex
- * @param {int} arg0
+ * @param {long} arg0
  */
 removePageAtIndex : function (
-int 
+long 
 )
 {
 },

cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp

@@ -16014,6 +16014,28 @@ bool js_cocos2dx_FileUtils_fullPathFromRelativeFile(JSContext *cx, uint32_t argc
     JS_ReportError(cx, "js_cocos2dx_FileUtils_fullPathFromRelativeFile : wrong number of arguments: %d, was expecting %d", argc, 2);
     return false;
 }
+bool js_cocos2dx_FileUtils_getSuitableFOpen(JSContext *cx, uint32_t argc, jsval *vp)
+{
+    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+    bool ok = true;
+    JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
+    js_proxy_t *proxy = jsb_get_js_proxy(obj);
+    cocos2d::FileUtils* cobj = (cocos2d::FileUtils *)(proxy ? proxy->ptr : NULL);
+    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_FileUtils_getSuitableFOpen : Invalid Native Object");
+    if (argc == 1) {
+        std::string arg0;
+        ok &= jsval_to_std_string(cx, args.get(0), &arg0);
+        JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_FileUtils_getSuitableFOpen : Error processing arguments");
+        std::string ret = cobj->getSuitableFOpen(arg0);
+        jsval jsret = JSVAL_NULL;
+        jsret = std_string_to_jsval(cx, ret);
+        args.rval().set(jsret);
+        return true;
+    }
+
+    JS_ReportError(cx, "js_cocos2dx_FileUtils_getSuitableFOpen : wrong number of arguments: %d, was expecting %d", argc, 1);
+    return false;
+}
 bool js_cocos2dx_FileUtils_setWritablePath(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -16244,6 +16266,7 @@ void js_register_cocos2dx_FileUtils(JSContext *cx, JS::HandleObject global) {
         JS_FN("isFileExist", js_cocos2dx_FileUtils_isFileExist, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("purgeCachedEntries", js_cocos2dx_FileUtils_purgeCachedEntries, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("fullPathFromRelativeFile", js_cocos2dx_FileUtils_fullPathFromRelativeFile, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE),
+        JS_FN("getSuitableFOpen", js_cocos2dx_FileUtils_getSuitableFOpen, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("setWritablePath", js_cocos2dx_FileUtils_setWritablePath, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("setPopupNotify", js_cocos2dx_FileUtils_setPopupNotify, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("isDirectoryExist", js_cocos2dx_FileUtils_isDirectoryExist, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),

cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp

@@ -877,6 +877,7 @@ bool js_cocos2dx_FileUtils_addSearchPath(JSContext *cx, uint32_t argc, jsval *vp
 bool js_cocos2dx_FileUtils_isFileExist(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_FileUtils_purgeCachedEntries(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_FileUtils_fullPathFromRelativeFile(JSContext *cx, uint32_t argc, jsval *vp);
+bool js_cocos2dx_FileUtils_getSuitableFOpen(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_FileUtils_setWritablePath(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_FileUtils_setPopupNotify(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_FileUtils_isDirectoryExist(JSContext *cx, uint32_t argc, jsval *vp);