diff --git a/native/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp b/native/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp index 3bf49819fc..d15f889a8b 100644 --- a/native/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp +++ b/native/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp @@ -1815,9 +1815,7 @@ jsval c_string_to_jsval(JSContext* cx, const char* v, size_t length /* = -1 */) jsval ccpoint_to_jsval(JSContext* cx, const Point& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "x", v.x, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "y", v.y, JSPROP_ENUMERATE | JSPROP_PERMANENT); @@ -1831,9 +1829,7 @@ jsval ccacceleration_to_jsval(JSContext* cx, const Acceleration& v) { JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "x", v.x, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "y", v.y, JSPROP_ENUMERATE | JSPROP_PERMANENT) && @@ -1847,9 +1843,7 @@ jsval ccacceleration_to_jsval(JSContext* cx, const Acceleration& v) jsval ccrect_to_jsval(JSContext* cx, const Rect& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "x", v.origin.x, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "y", v.origin.y, JSPROP_ENUMERATE | JSPROP_PERMANENT) && @@ -1863,9 +1857,7 @@ jsval ccrect_to_jsval(JSContext* cx, const Rect& v) jsval ccsize_to_jsval(JSContext* cx, const Size& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "width", v.width, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "height", v.height, JSPROP_ENUMERATE | JSPROP_PERMANENT); @@ -1877,9 +1869,7 @@ jsval ccsize_to_jsval(JSContext* cx, const Size& v) jsval cccolor4b_to_jsval(JSContext* cx, const Color4B& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "r", (int32_t)v.r, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "g", (int32_t)v.g, JSPROP_ENUMERATE | JSPROP_PERMANENT) && @@ -1893,9 +1883,7 @@ jsval cccolor4b_to_jsval(JSContext* cx, const Color4B& v) jsval cccolor4f_to_jsval(JSContext* cx, const Color4F& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "r", (int32_t)(v.r * 255), JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "g", (int32_t)(v.g * 255), JSPROP_ENUMERATE | JSPROP_PERMANENT) && @@ -1909,9 +1897,7 @@ jsval cccolor4f_to_jsval(JSContext* cx, const Color4F& v) jsval cccolor3b_to_jsval(JSContext* cx, const Color3B& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "r", (int32_t)v.r, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "g", (int32_t)v.g, JSPROP_ENUMERATE | JSPROP_PERMANENT) && @@ -1924,9 +1910,7 @@ jsval cccolor3b_to_jsval(JSContext* cx, const Color3B& v) jsval ccaffinetransform_to_jsval(JSContext* cx, const AffineTransform& t) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "a", t.a, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "b", t.b, JSPROP_ENUMERATE | JSPROP_PERMANENT) && @@ -1971,9 +1955,7 @@ jsval uniform_to_jsval(JSContext* cx, const cocos2d::Uniform* uniform) jsval FontDefinition_to_jsval(JSContext* cx, const FontDefinition& t) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); JS::RootedValue prop(cx); bool ok = true; @@ -2521,9 +2503,7 @@ jsval matrix_to_jsval(JSContext *cx, const cocos2d::Mat4& v) jsval vector2_to_jsval(JSContext *cx, const cocos2d::Vec2& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "x", v.x, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "y", v.y, JSPROP_ENUMERATE | JSPROP_PERMANENT); @@ -2535,9 +2515,7 @@ jsval vector2_to_jsval(JSContext *cx, const cocos2d::Vec2& v) jsval vector3_to_jsval(JSContext *cx, const cocos2d::Vec3& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "x", v.x, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "y", v.y, JSPROP_ENUMERATE | JSPROP_PERMANENT) && @@ -2550,9 +2528,7 @@ jsval vector3_to_jsval(JSContext *cx, const cocos2d::Vec3& v) jsval vector4_to_jsval(JSContext *cx, const cocos2d::Vec4& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "x", v.x, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "y", v.y, JSPROP_ENUMERATE | JSPROP_PERMANENT) && @@ -2566,9 +2542,7 @@ jsval vector4_to_jsval(JSContext *cx, const cocos2d::Vec4& v) jsval blendfunc_to_jsval(JSContext *cx, const cocos2d::BlendFunc& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "src", (uint32_t)v.src, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "dst", (uint32_t)v.dst, JSPROP_ENUMERATE | JSPROP_PERMANENT); @@ -2598,9 +2572,7 @@ jsval vector_vec2_to_jsval(JSContext *cx, const std::vector& v) jsval std_map_string_string_to_jsval(JSContext* cx, const std::map& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject jsRet(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject jsRet(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); for (auto iter = v.begin(); iter != v.end(); ++iter) { @@ -2646,9 +2618,7 @@ bool jsval_to_resourcedata(JSContext *cx, JS::HandleValue v, ResourceData* ret) jsval resourcedata_to_jsval(JSContext* cx, const ResourceData& v) { - JS::RootedObject proto(cx); - JS::RootedObject parent(cx); - JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, proto, parent)); + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); if (!tmp) return JSVAL_NULL; bool ok = JS_DefineProperty(cx, tmp, "type", v.type, JSPROP_ENUMERATE | JSPROP_PERMANENT) && JS_DefineProperty(cx, tmp, "file", JS::RootedValue(cx, std_string_to_jsval(cx, v.file)), JSPROP_ENUMERATE | JSPROP_PERMANENT) && @@ -2658,3 +2628,18 @@ jsval resourcedata_to_jsval(JSContext* cx, const ResourceData& v) } return JSVAL_NULL; } + +jsval asset_to_jsval(JSContext* cx, const cocos2d::extension::Manifest::Asset& v) +{ + JS::RootedObject tmp(cx, JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr())); + if (!tmp) return JSVAL_NULL; + bool ok = JS_DefineProperty(cx, tmp, "md5", JS::RootedValue(cx, std_string_to_jsval(cx, v.md5)), JSPROP_ENUMERATE | JSPROP_PERMANENT) && + JS_DefineProperty(cx, tmp, "path", JS::RootedValue(cx, std_string_to_jsval(cx, v.path)), JSPROP_ENUMERATE | JSPROP_PERMANENT) && + JS_DefineProperty(cx, tmp, "compressed", v.compressed, JSPROP_ENUMERATE | JSPROP_PERMANENT) && + JS_DefineProperty(cx, tmp, "size", v.size, JSPROP_ENUMERATE | JSPROP_PERMANENT) && + JS_DefineProperty(cx, tmp, "downloadState", (int)v.downloadState, JSPROP_ENUMERATE | JSPROP_PERMANENT); + if (ok) { + return OBJECT_TO_JSVAL(tmp); + } + return JSVAL_NULL; +} diff --git a/native/cocos/scripting/js-bindings/manual/js_manual_conversions.h b/native/cocos/scripting/js-bindings/manual/js_manual_conversions.h index 988aea4290..1418ef1606 100644 --- a/native/cocos/scripting/js-bindings/manual/js_manual_conversions.h +++ b/native/cocos/scripting/js-bindings/manual/js_manual_conversions.h @@ -39,6 +39,7 @@ #include "math/CCAffineTransform.h" #include "platform/CCPlatformMacros.h" #include "renderer/CCGLProgram.h" +#include "extensions/assets-manager/Manifest.h" #include "scripting/js-bindings/manual/spidermonkey_specifics.h" #include "scripting/js-bindings/manual/js-BindingsExport.h" @@ -283,7 +284,7 @@ jsval FontDefinition_to_jsval(JSContext* cx, const cocos2d::FontDefinition& t); jsval quaternion_to_jsval(JSContext* cx, const cocos2d::Quaternion& q); jsval uniform_to_jsval(JSContext* cx, const cocos2d::Uniform* uniform); jsval resourcedata_to_jsval(JSContext* cx, const cocos2d::ResourceData& v); - +jsval asset_to_jsval(JSContext* cx, const cocos2d::extension::Manifest::Asset& v); // forward declaration template diff --git a/native/cocos/scripting/js-bindings/script/extension/jsb_cocos2d_extension.js b/native/cocos/scripting/js-bindings/script/extension/jsb_cocos2d_extension.js index 87dca831ee..8db738808e 100644 --- a/native/cocos/scripting/js-bindings/script/extension/jsb_cocos2d_extension.js +++ b/native/cocos/scripting/js-bindings/script/extension/jsb_cocos2d_extension.js @@ -29,6 +29,14 @@ */ jsb.AssetsManager = cc.AssetsManager; delete cc.AssetsManager; +/** + * @type {Object} + * @name jsb.Manifest + * please refer to this document to know how to use it: http://www.cocos2d-x.org/docs/manual/framework/html5/v3/assets-manager/en + * Only available in JSB + */ +jsb.Manifest = cc.Manifest; +delete cc.Manifest; /** * @type {Object} * @name jsb.EventListenerAssetsManager @@ -224,6 +232,11 @@ cc.CONTROL_STEPPER_LABELFONT = "CourierNewPSMT"; cc.AUTOREPEAT_DELTATIME = 0.15; cc.AUTOREPEAT_INCREASETIME_INCREMENT = 12; +jsb.Manifest.DownloadState = { + UNSTARTED: 0, + DOWNLOADING: 1, + SUCCESSED: 2 +}; jsb.EventAssetsManager.ERROR_NO_LOCAL_MANIFEST = 0; jsb.EventAssetsManager.ERROR_DOWNLOAD_MANIFEST = 1; diff --git a/native/tools/bindings-generator b/native/tools/bindings-generator index 9a35f9e741..3c08f259df 160000 --- a/native/tools/bindings-generator +++ b/native/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 9a35f9e7419ed57de5527307c6333ff96b8a048f +Subproject commit 3c08f259df65c30866d92b6b8e51bb1c63d72aed