diff --git a/native/cocos/editor-support/creator/CCGraphicsNode.cpp b/native/cocos/editor-support/creator/CCGraphicsNode.cpp index e8b7114219..94a37f9eb6 100644 --- a/native/cocos/editor-support/creator/CCGraphicsNode.cpp +++ b/native/cocos/editor-support/creator/CCGraphicsNode.cpp @@ -214,7 +214,7 @@ void GraphicsNode::arc(float cx, float cy, float r, float startAngle, float endA // Clamp angles da = endAngle - startAngle; - if (!counterclockwise) { + if (counterclockwise) { if (absf(da) >= PI_2) { da = PI_2; } else { @@ -233,7 +233,7 @@ void GraphicsNode::arc(float cx, float cy, float r, float startAngle, float endA hda = (da / (float)ndivs) / 2.0f; kappa = absf(4.0f / 3.0f * (1.0f - cosf(hda)) / sinf(hda)); - if (counterclockwise) { + if (!counterclockwise) { kappa = -kappa; } diff --git a/native/cocos/platform/CCGLView.cpp b/native/cocos/platform/CCGLView.cpp index f763d025ba..187ea51b60 100644 --- a/native/cocos/platform/CCGLView.cpp +++ b/native/cocos/platform/CCGLView.cpp @@ -101,6 +101,7 @@ GLContextAttrs GLView::getGLContextAttrs() GLView::GLView() : _scaleX(1.0f) , _scaleY(1.0f) +, _antiAliasEnabled(true) , _resolutionPolicy(ResolutionPolicy::UNKNOWN) { } @@ -465,4 +466,30 @@ void GLView::renderScene(Scene* scene, Renderer* renderer) scene->render(renderer, Mat4::IDENTITY, nullptr); } +bool GLView::isAntiAliasEnabled() const +{ + return _antiAliasEnabled; +} + +void GLView::enableAntiAlias(bool enabled) +{ + if (_antiAliasEnabled == enabled) { + return; + } + _antiAliasEnabled = enabled; + + cocos2d::Vector list = Director::getInstance()->getTextureCache()->getAllTextures(); + for (size_t i = 0; i < list.size(); i++) { + Texture2D* tex = list.at(i); + if (tex) { + if (enabled) { + tex->setAntiAliasTexParameters(); + } + else { + tex->setAliasTexParameters(); + } + } + } +} + NS_CC_END diff --git a/native/cocos/platform/CCGLView.h b/native/cocos/platform/CCGLView.h index 31cf3e9e71..e22cbca28b 100644 --- a/native/cocos/platform/CCGLView.h +++ b/native/cocos/platform/CCGLView.h @@ -374,6 +374,19 @@ public: */ ResolutionPolicy getResolutionPolicy() const { return _resolutionPolicy; } + /** Returns whether the current enable on anti-alias. + * + * @return The antiAlias enabled. + */ + bool isAntiAliasEnabled() const; + + /** Whether to Enable on anti-alias. + * + * @param enabled The Enable or not anti-alias. + */ + void enableAntiAlias(bool enabled); + + #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) virtual HWND getWin32Window() = 0; #endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) */ @@ -400,6 +413,8 @@ protected: Rect _viewPortRect; // the view name std::string _viewName; + // anti alias state + bool _antiAliasEnabled; float _scaleX; float _scaleY; diff --git a/native/cocos/renderer/CCTexture2D.cpp b/native/cocos/renderer/CCTexture2D.cpp index 45a84ef3ee..752644aa69 100644 --- a/native/cocos/renderer/CCTexture2D.cpp +++ b/native/cocos/renderer/CCTexture2D.cpp @@ -458,6 +458,7 @@ Texture2D::Texture2D() , _alphaTexture(nullptr) { s_allGLTexture2D.insert(this); + _antialiasEnabled = Director::getInstance()->getOpenGLView()->isAntiAliasEnabled(); } Texture2D::~Texture2D() diff --git a/native/cocos/renderer/CCTextureCache.cpp b/native/cocos/renderer/CCTextureCache.cpp index 73e85e19fa..e377d514e6 100644 --- a/native/cocos/renderer/CCTextureCache.cpp +++ b/native/cocos/renderer/CCTextureCache.cpp @@ -457,6 +457,15 @@ bool TextureCache::reloadTexture(const std::string& fileName) return ret; } +cocos2d::Vector TextureCache::getAllTextures() const +{ + cocos2d::Vector result; + for( auto it=_textures.begin(); it!=_textures.end(); ++it ) { + result.pushBack(it->second); + } + return result; +} + // TextureCache - Remove void TextureCache::removeAllTextures() diff --git a/native/cocos/renderer/CCTextureCache.h b/native/cocos/renderer/CCTextureCache.h index cf9a97f9c6..52fdebd64b 100644 --- a/native/cocos/renderer/CCTextureCache.h +++ b/native/cocos/renderer/CCTextureCache.h @@ -37,6 +37,7 @@ THE SOFTWARE. #include #include "base/CCRef.h" +#include "base/CCVector.h" #include "renderer/CCTexture2D.h" #include "platform/CCImage.h" @@ -149,6 +150,13 @@ public: */ bool reloadTexture(const std::string& fileName); + /** + * get all textures. + * + * @return all textures. + */ + cocos2d::Vector getAllTextures() const; + /** Purges the dictionary of loaded textures. * Call this method if you receive the "Memory Warning". * In the short term: it will free some resources preventing your app from being killed. diff --git a/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js b/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js index b0191d115b..35f6bee192 100644 --- a/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js +++ b/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js @@ -2162,6 +2162,16 @@ bool { }, +/** + * @method isAntiAliasEnabled + * @return {bool} + */ +isAntiAliasEnabled : function ( +) +{ + return false; +}, + /** * @method setScissorInPoints * @param {float} arg0 @@ -2360,6 +2370,16 @@ getScissorRect : function ( return cc.Rect; }, +/** + * @method enableAntiAlias + * @param {bool} arg0 + */ +enableAntiAlias : function ( +bool +) +{ +}, + /** * @method getRetinaFactor * @return {int} @@ -19366,6 +19386,16 @@ func { }, +/** + * @method getAllTextures + * @return {Array} + */ +getAllTextures : function ( +) +{ + return new Array(); +}, + /** * @method getDescription * @return {String} diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 416d17e4dd..91ee225e33 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -5502,6 +5502,24 @@ bool js_cocos2dx_GLView_setIMEKeyboardState(JSContext *cx, uint32_t argc, jsval JS_ReportError(cx, "js_cocos2dx_GLView_setIMEKeyboardState : wrong number of arguments: %d, was expecting %d", argc, 1); return false; } +bool js_cocos2dx_GLView_isAntiAliasEnabled(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::GLView* cobj = (cocos2d::GLView *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_GLView_isAntiAliasEnabled : Invalid Native Object"); + if (argc == 0) { + bool ret = cobj->isAntiAliasEnabled(); + jsval jsret = JSVAL_NULL; + jsret = BOOLEAN_TO_JSVAL(ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_GLView_isAntiAliasEnabled : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_GLView_setScissorInPoints(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -5872,6 +5890,26 @@ bool js_cocos2dx_GLView_getScissorRect(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_GLView_getScissorRect : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } +bool js_cocos2dx_GLView_enableAntiAlias(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::GLView* cobj = (cocos2d::GLView *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_GLView_enableAntiAlias : Invalid Native Object"); + if (argc == 1) { + bool arg0; + arg0 = JS::ToBoolean(args.get(0)); + JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_GLView_enableAntiAlias : Error processing arguments"); + cobj->enableAntiAlias(arg0); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_GLView_enableAntiAlias : wrong number of arguments: %d, was expecting %d", argc, 1); + return false; +} bool js_cocos2dx_GLView_getRetinaFactor(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -6020,6 +6058,7 @@ void js_register_cocos2dx_GLView(JSContext *cx, JS::HandleObject global) { JS_FN("setContentScaleFactor", js_cocos2dx_GLView_setContentScaleFactor, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getContentScaleFactor", js_cocos2dx_GLView_getContentScaleFactor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setIMEKeyboardState", js_cocos2dx_GLView_setIMEKeyboardState, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("isAntiAliasEnabled", js_cocos2dx_GLView_isAntiAliasEnabled, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setScissorInPoints", js_cocos2dx_GLView_setScissorInPoints, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getViewName", js_cocos2dx_GLView_getViewName, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("isOpenGLReady", js_cocos2dx_GLView_isOpenGLReady, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -6038,6 +6077,7 @@ void js_register_cocos2dx_GLView(JSContext *cx, JS::HandleObject global) { JS_FN("renderScene", js_cocos2dx_GLView_renderScene, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setViewPortInPoints", js_cocos2dx_GLView_setViewPortInPoints, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getScissorRect", js_cocos2dx_GLView_getScissorRect, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("enableAntiAlias", js_cocos2dx_GLView_enableAntiAlias, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getRetinaFactor", js_cocos2dx_GLView_getRetinaFactor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setViewName", js_cocos2dx_GLView_setViewName, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getVisibleRect", js_cocos2dx_GLView_getVisibleRect, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -53648,6 +53688,24 @@ bool js_cocos2dx_TextureCache_addImageAsync(JSContext *cx, uint32_t argc, jsval JS_ReportError(cx, "js_cocos2dx_TextureCache_addImageAsync : wrong number of arguments: %d, was expecting %d", argc, 2); return false; } +bool js_cocos2dx_TextureCache_getAllTextures(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::TextureCache* cobj = (cocos2d::TextureCache *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_TextureCache_getAllTextures : Invalid Native Object"); + if (argc == 0) { + cocos2d::Vector ret = cobj->getAllTextures(); + jsval jsret = JSVAL_NULL; + jsret = ccvector_to_jsval(cx, ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_TextureCache_getAllTextures : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_TextureCache_getDescription(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -53941,6 +53999,7 @@ void js_register_cocos2dx_TextureCache(JSContext *cx, JS::HandleObject global) { JS_FN("removeTextureForKey", js_cocos2dx_TextureCache_removeTextureForKey, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("removeAllTextures", js_cocos2dx_TextureCache_removeAllTextures, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("addImageAsync", js_cocos2dx_TextureCache_addImageAsync, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("getAllTextures", js_cocos2dx_TextureCache_getAllTextures, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getDescription", js_cocos2dx_TextureCache_getDescription, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getCachedTextureInfo", js_cocos2dx_TextureCache_getCachedTextureInfo, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("addImage", js_cocos2dx_TextureCache_addImage, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp index 8bf6479ec9..9259defa9b 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp @@ -278,6 +278,7 @@ bool js_cocos2dx_GLView_getViewPortRect(JSContext *cx, uint32_t argc, jsval *vp) bool js_cocos2dx_GLView_setContentScaleFactor(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_GLView_getContentScaleFactor(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_GLView_setIMEKeyboardState(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_GLView_isAntiAliasEnabled(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_GLView_setScissorInPoints(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_GLView_getViewName(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_GLView_isOpenGLReady(JSContext *cx, uint32_t argc, jsval *vp); @@ -296,6 +297,7 @@ bool js_cocos2dx_GLView_isRetinaDisplay(JSContext *cx, uint32_t argc, jsval *vp) bool js_cocos2dx_GLView_renderScene(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_GLView_setViewPortInPoints(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_GLView_getScissorRect(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_GLView_enableAntiAlias(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_GLView_getRetinaFactor(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_GLView_setViewName(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_GLView_getVisibleRect(JSContext *cx, uint32_t argc, jsval *vp); @@ -3489,6 +3491,7 @@ bool js_cocos2dx_TextureCache_unbindAllImageAsync(JSContext *cx, uint32_t argc, bool js_cocos2dx_TextureCache_removeTextureForKey(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_TextureCache_removeAllTextures(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_TextureCache_addImageAsync(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_TextureCache_getAllTextures(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_TextureCache_getDescription(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_TextureCache_getCachedTextureInfo(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_TextureCache_addImage(JSContext *cx, uint32_t argc, jsval *vp); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp index a4a14fe03e..5f7b3bad27 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp @@ -1,11 +1,33 @@ -#include "scripting/js-bindings/auto/jsb_creator_auto.hpp" -#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "jsb_creator_auto.hpp" +#include "cocos2d_specifics.hpp" #include "creator/CCScale9Sprite.h" #include "creator/CCGraphicsNode.h" template -static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) -{ +static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) { + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedValue initializing(cx); + bool isNewValid = true; + JS::RootedObject global(cx, ScriptingCore::getInstance()->getGlobalObject()); + isNewValid = JS_GetProperty(cx, global, "initializing", &initializing) && initializing.toBoolean(); + if (isNewValid) + { + TypeTest t; + js_type_class_t *typeClass = nullptr; + std::string typeName = t.s_name(); + auto typeMapIter = _js_global_type_map.find(typeName); + CCASSERT(typeMapIter != _js_global_type_map.end(), "Can't find the class type!"); + typeClass = typeMapIter->second; + CCASSERT(typeClass, "The value is null."); + + JS::RootedObject proto(cx, typeClass->proto.ref()); + JS::RootedObject parent(cx, typeClass->parentProto.ref()); + JS::RootedObject _tmp(cx, JS_NewObject(cx, typeClass->jsclass, proto, parent)); + + args.rval().set(OBJECT_TO_JSVAL(_tmp)); + return true; + } + JS_ReportError(cx, "Constructor for the requested class is not available, please refer to the API reference."); return false; } @@ -46,7 +68,7 @@ bool js_creator_Scale9SpriteV2_setTexture(JSContext *cx, uint32_t argc, jsval *v arg0 = (cocos2d::Texture2D*)(jsProxy ? jsProxy->ptr : NULL); JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object"); } while (0); - if (!ok) { ok = true; break; } + if (!ok) { break; } bool ret = cobj->setTexture(arg0); jsval jsret = JSVAL_NULL; jsret = BOOLEAN_TO_JSVAL(ret); @@ -60,7 +82,7 @@ bool js_creator_Scale9SpriteV2_setTexture(JSContext *cx, uint32_t argc, jsval *v if (argc == 1) { std::string arg0; ok &= jsval_to_std_string(cx, args.get(0), &arg0); - if (!ok) { ok = true; break; } + if (!ok) { break; } bool ret = cobj->setTexture(arg0); jsval jsret = JSVAL_NULL; jsret = BOOLEAN_TO_JSVAL(ret); @@ -156,7 +178,7 @@ bool js_creator_Scale9SpriteV2_setInsetBottom(JSContext *cx, uint32_t argc, jsva JSB_PRECONDITION2( cobj, cx, false, "js_creator_Scale9SpriteV2_setInsetBottom : Invalid Native Object"); if (argc == 1) { double arg0 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); JSB_PRECONDITION2(ok, cx, false, "js_creator_Scale9SpriteV2_setInsetBottom : Error processing arguments"); cobj->setInsetBottom(arg0); args.rval().setUndefined(); @@ -176,7 +198,7 @@ bool js_creator_Scale9SpriteV2_setFillRange(JSContext *cx, uint32_t argc, jsval JSB_PRECONDITION2( cobj, cx, false, "js_creator_Scale9SpriteV2_setFillRange : Invalid Native Object"); if (argc == 1) { double arg0 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); JSB_PRECONDITION2(ok, cx, false, "js_creator_Scale9SpriteV2_setFillRange : Error processing arguments"); cobj->setFillRange(arg0); args.rval().setUndefined(); @@ -232,7 +254,7 @@ bool js_creator_Scale9SpriteV2_setInsetTop(JSContext *cx, uint32_t argc, jsval * JSB_PRECONDITION2( cobj, cx, false, "js_creator_Scale9SpriteV2_setInsetTop : Invalid Native Object"); if (argc == 1) { double arg0 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); JSB_PRECONDITION2(ok, cx, false, "js_creator_Scale9SpriteV2_setInsetTop : Error processing arguments"); cobj->setInsetTop(arg0); args.rval().setUndefined(); @@ -296,11 +318,12 @@ bool js_creator_Scale9SpriteV2_setFillCenter(JSContext *cx, uint32_t argc, jsval bool ok = true; if (argc == 2) { double arg0 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - if (!ok) { ok = true; break; } + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + if (!ok) { break; } double arg1 = 0; - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); - if (!ok) { ok = true; break; } + ok = true; + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); + if (!ok) { break; } cobj->setFillCenter(arg0, arg1); args.rval().setUndefined(); return true; @@ -312,7 +335,7 @@ bool js_creator_Scale9SpriteV2_setFillCenter(JSContext *cx, uint32_t argc, jsval if (argc == 1) { cocos2d::Vec2 arg0; ok &= jsval_to_vector2(cx, args.get(0), &arg0); - if (!ok) { ok = true; break; } + if (!ok) { break; } cobj->setFillCenter(arg0); args.rval().setUndefined(); return true; @@ -345,7 +368,7 @@ bool js_creator_Scale9SpriteV2_setSpriteFrame(JSContext *cx, uint32_t argc, jsva arg0 = (cocos2d::SpriteFrame*)(jsProxy ? jsProxy->ptr : NULL); JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object"); } while (0); - if (!ok) { ok = true; break; } + if (!ok) { break; } bool ret = cobj->setSpriteFrame(arg0); jsval jsret = JSVAL_NULL; jsret = BOOLEAN_TO_JSVAL(ret); @@ -359,7 +382,7 @@ bool js_creator_Scale9SpriteV2_setSpriteFrame(JSContext *cx, uint32_t argc, jsva if (argc == 1) { std::string arg0; ok &= jsval_to_std_string(cx, args.get(0), &arg0); - if (!ok) { ok = true; break; } + if (!ok) { break; } bool ret = cobj->setSpriteFrame(arg0); jsval jsret = JSVAL_NULL; jsret = BOOLEAN_TO_JSVAL(ret); @@ -404,7 +427,7 @@ bool js_creator_Scale9SpriteV2_initWithTexture(JSContext *cx, uint32_t argc, jsv if (argc == 1) { std::string arg0; ok &= jsval_to_std_string(cx, args.get(0), &arg0); - if (!ok) { ok = true; break; } + if (!ok) { break; } bool ret = cobj->initWithTexture(arg0); jsval jsret = JSVAL_NULL; jsret = BOOLEAN_TO_JSVAL(ret); @@ -426,7 +449,7 @@ bool js_creator_Scale9SpriteV2_initWithTexture(JSContext *cx, uint32_t argc, jsv arg0 = (cocos2d::Texture2D*)(jsProxy ? jsProxy->ptr : NULL); JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object"); } while (0); - if (!ok) { ok = true; break; } + if (!ok) { break; } bool ret = cobj->initWithTexture(arg0); jsval jsret = JSVAL_NULL; jsret = BOOLEAN_TO_JSVAL(ret); @@ -522,7 +545,7 @@ bool js_creator_Scale9SpriteV2_setFillStart(JSContext *cx, uint32_t argc, jsval JSB_PRECONDITION2( cobj, cx, false, "js_creator_Scale9SpriteV2_setFillStart : Invalid Native Object"); if (argc == 1) { double arg0 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); JSB_PRECONDITION2(ok, cx, false, "js_creator_Scale9SpriteV2_setFillStart : Error processing arguments"); cobj->setFillStart(arg0); args.rval().setUndefined(); @@ -565,10 +588,11 @@ bool js_creator_Scale9SpriteV2_setBlendFunc(JSContext *cx, uint32_t argc, jsval if (argc == 2) { unsigned int arg0 = 0; ok &= jsval_to_uint32(cx, args.get(0), &arg0); - if (!ok) { ok = true; break; } + if (!ok) { break; } unsigned int arg1 = 0; + ok = true; ok &= jsval_to_uint32(cx, args.get(1), &arg1); - if (!ok) { ok = true; break; } + if (!ok) { break; } cobj->setBlendFunc(arg0, arg1); args.rval().setUndefined(); return true; @@ -580,7 +604,7 @@ bool js_creator_Scale9SpriteV2_setBlendFunc(JSContext *cx, uint32_t argc, jsval if (argc == 1) { cocos2d::BlendFunc arg0; ok &= jsval_to_blendfunc(cx, args.get(0), &arg0); - if (!ok) { ok = true; break; } + if (!ok) { break; } cobj->setBlendFunc(arg0); args.rval().setUndefined(); return true; @@ -636,7 +660,7 @@ bool js_creator_Scale9SpriteV2_setInsetLeft(JSContext *cx, uint32_t argc, jsval JSB_PRECONDITION2( cobj, cx, false, "js_creator_Scale9SpriteV2_setInsetLeft : Invalid Native Object"); if (argc == 1) { double arg0 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); JSB_PRECONDITION2(ok, cx, false, "js_creator_Scale9SpriteV2_setInsetLeft : Error processing arguments"); cobj->setInsetLeft(arg0); args.rval().setUndefined(); @@ -661,7 +685,7 @@ bool js_creator_Scale9SpriteV2_initWithSpriteFrame(JSContext *cx, uint32_t argc, if (argc == 1) { std::string arg0; ok &= jsval_to_std_string(cx, args.get(0), &arg0); - if (!ok) { ok = true; break; } + if (!ok) { break; } bool ret = cobj->initWithSpriteFrame(arg0); jsval jsret = JSVAL_NULL; jsret = BOOLEAN_TO_JSVAL(ret); @@ -683,7 +707,7 @@ bool js_creator_Scale9SpriteV2_initWithSpriteFrame(JSContext *cx, uint32_t argc, arg0 = (cocos2d::SpriteFrame*)(jsProxy ? jsProxy->ptr : NULL); JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object"); } while (0); - if (!ok) { ok = true; break; } + if (!ok) { break; } bool ret = cobj->initWithSpriteFrame(arg0); jsval jsret = JSVAL_NULL; jsret = BOOLEAN_TO_JSVAL(ret); @@ -725,7 +749,7 @@ bool js_creator_Scale9SpriteV2_setInsetRight(JSContext *cx, uint32_t argc, jsval JSB_PRECONDITION2( cobj, cx, false, "js_creator_Scale9SpriteV2_setInsetRight : Invalid Native Object"); if (argc == 1) { double arg0 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); JSB_PRECONDITION2(ok, cx, false, "js_creator_Scale9SpriteV2_setInsetRight : Error processing arguments"); cobj->setInsetRight(arg0); args.rval().setUndefined(); @@ -760,23 +784,37 @@ bool js_creator_Scale9SpriteV2_constructor(JSContext *cx, uint32_t argc, jsval * JS::CallArgs args = JS::CallArgsFromVp(argc, vp); bool ok = true; creator::Scale9SpriteV2* cobj = new (std::nothrow) creator::Scale9SpriteV2(); - - js_type_class_t *typeClass = js_get_type_from_native(cobj); - + cocos2d::Ref *_ccobj = dynamic_cast(cobj); + if (_ccobj) { + _ccobj->autorelease(); + } + TypeTest t; + js_type_class_t *typeClass = nullptr; + std::string typeName = t.s_name(); + auto typeMapIter = _js_global_type_map.find(typeName); + CCASSERT(typeMapIter != _js_global_type_map.end(), "Can't find the class type!"); + typeClass = typeMapIter->second; + CCASSERT(typeClass, "The value is null."); + JS::RootedObject proto(cx, typeClass->proto.ref()); + JS::RootedObject parent(cx, typeClass->parentProto.ref()); + JS::RootedObject obj(cx, JS_NewObject(cx, typeClass->jsclass, proto, parent)); + args.rval().set(OBJECT_TO_JSVAL(obj)); // link the native object with the javascript object - JS::RootedObject jsobj(cx, jsb_ref_create_jsobject(cx, cobj, typeClass, "creator::Scale9SpriteV2")); - args.rval().set(OBJECT_TO_JSVAL(jsobj)); - if (JS_HasProperty(cx, jsobj, "_ctor", &ok) && ok) - ScriptingCore::getInstance()->executeFunctionWithOwner(OBJECT_TO_JSVAL(jsobj), "_ctor", args); + js_proxy_t* p = jsb_new_proxy(cobj, obj); + AddNamedObjectRoot(cx, &p->obj, "creator::Scale9SpriteV2"); + if (JS_HasProperty(cx, obj, "_ctor", &ok) && ok) + ScriptingCore::getInstance()->executeFunctionWithOwner(OBJECT_TO_JSVAL(obj), "_ctor", args); return true; -} -static bool js_creator_Scale9SpriteV2_ctor(JSContext *cx, uint32_t argc, jsval *vp) +}static bool js_creator_Scale9SpriteV2_ctor(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); creator::Scale9SpriteV2 *nobj = new (std::nothrow) creator::Scale9SpriteV2(); - auto newproxy = jsb_new_proxy(nobj, obj); - jsb_ref_init(cx, &newproxy->obj, nobj, "creator::Scale9SpriteV2"); + if (nobj) { + nobj->autorelease(); + } + js_proxy_t* p = jsb_new_proxy(nobj, obj); + AddNamedObjectRoot(cx, &p->obj, "creator::Scale9SpriteV2"); bool isFound = false; if (JS_HasProperty(cx, obj, "_ctor", &isFound) && isFound) ScriptingCore::getInstance()->executeFunctionWithOwner(OBJECT_TO_JSVAL(obj), "_ctor", args); @@ -784,9 +822,11 @@ static bool js_creator_Scale9SpriteV2_ctor(JSContext *cx, uint32_t argc, jsval * return true; } - extern JSObject *jsb_cocos2d_Node_prototype; +void js_creator_Scale9SpriteV2_finalize(JSFreeOp *fop, JSObject *obj) { + CCLOGINFO("jsbindings: finalizing JS object %p (Scale9SpriteV2)", obj); +} void js_register_creator_Scale9SpriteV2(JSContext *cx, JS::HandleObject global) { jsb_creator_Scale9SpriteV2_class = (JSClass *)calloc(1, sizeof(JSClass)); @@ -798,9 +838,11 @@ void js_register_creator_Scale9SpriteV2(JSContext *cx, JS::HandleObject global) jsb_creator_Scale9SpriteV2_class->enumerate = JS_EnumerateStub; jsb_creator_Scale9SpriteV2_class->resolve = JS_ResolveStub; jsb_creator_Scale9SpriteV2_class->convert = JS_ConvertStub; + jsb_creator_Scale9SpriteV2_class->finalize = js_creator_Scale9SpriteV2_finalize; jsb_creator_Scale9SpriteV2_class->flags = JSCLASS_HAS_RESERVED_SLOTS(2); static JSPropertySpec properties[] = { + JS_PSG("__nativeObj", js_is_native_obj, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_PS_END }; @@ -852,16 +894,11 @@ void js_register_creator_Scale9SpriteV2(JSContext *cx, JS::HandleObject global) NULL, // no static properties st_funcs); - JS::RootedObject proto(cx, jsb_creator_Scale9SpriteV2_prototype); - JS::RootedValue className(cx, std_string_to_jsval(cx, "Scale9SpriteV2")); - JS_SetProperty(cx, proto, "_className", className); - JS_SetProperty(cx, proto, "__nativeObj", JS::TrueHandleValue); - JS_SetProperty(cx, proto, "__is_ref", JS::TrueHandleValue); // add the proto and JSClass to the type->js info hash table + JS::RootedObject proto(cx, jsb_creator_Scale9SpriteV2_prototype); jsb_register_class(cx, jsb_creator_Scale9SpriteV2_class, proto, parent_proto); anonEvaluate(cx, global, "(function () { cc.Scale9SpriteV2.extend = cc.Class.extend; })()"); } - JSClass *jsb_creator_GraphicsNode_class; JSObject *jsb_creator_GraphicsNode_prototype; @@ -878,10 +915,10 @@ bool js_creator_GraphicsNode_quadraticCurveTo(JSContext *cx, uint32_t argc, jsva double arg1 = 0; double arg2 = 0; double arg3 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); - ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); - ok &= JS::ToNumber( cx, args.get(3), &arg3) && !std::isnan(arg3); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !isnan(arg2); + ok &= JS::ToNumber( cx, args.get(3), &arg3) && !isnan(arg3); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_quadraticCurveTo : Error processing arguments"); cobj->quadraticCurveTo(arg0, arg1, arg2, arg3); args.rval().setUndefined(); @@ -902,8 +939,8 @@ bool js_creator_GraphicsNode_moveTo(JSContext *cx, uint32_t argc, jsval *vp) if (argc == 2) { double arg0 = 0; double arg1 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_moveTo : Error processing arguments"); cobj->moveTo(arg0, arg1); args.rval().setUndefined(); @@ -924,8 +961,8 @@ bool js_creator_GraphicsNode_lineTo(JSContext *cx, uint32_t argc, jsval *vp) if (argc == 2) { double arg0 = 0; double arg1 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_lineTo : Error processing arguments"); cobj->lineTo(arg0, arg1); args.rval().setUndefined(); @@ -966,11 +1003,11 @@ bool js_creator_GraphicsNode_arc(JSContext *cx, uint32_t argc, jsval *vp) double arg3 = 0; double arg4 = 0; bool arg5; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); - ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); - ok &= JS::ToNumber( cx, args.get(3), &arg3) && !std::isnan(arg3); - ok &= JS::ToNumber( cx, args.get(4), &arg4) && !std::isnan(arg4); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !isnan(arg2); + ok &= JS::ToNumber( cx, args.get(3), &arg3) && !isnan(arg3); + ok &= JS::ToNumber( cx, args.get(4), &arg4) && !isnan(arg4); arg5 = JS::ToBoolean(args.get(5)); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_arc : Error processing arguments"); cobj->arc(arg0, arg1, arg2, arg3, arg4, arg5); @@ -1030,10 +1067,10 @@ bool js_creator_GraphicsNode_ellipse(JSContext *cx, uint32_t argc, jsval *vp) double arg1 = 0; double arg2 = 0; double arg3 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); - ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); - ok &= JS::ToNumber( cx, args.get(3), &arg3) && !std::isnan(arg3); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !isnan(arg2); + ok &= JS::ToNumber( cx, args.get(3), &arg3) && !isnan(arg3); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_ellipse : Error processing arguments"); cobj->ellipse(arg0, arg1, arg2, arg3); args.rval().setUndefined(); @@ -1053,7 +1090,7 @@ bool js_creator_GraphicsNode_setLineWidth(JSContext *cx, uint32_t argc, jsval *v JSB_PRECONDITION2( cobj, cx, false, "js_creator_GraphicsNode_setLineWidth : Invalid Native Object"); if (argc == 1) { double arg0 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_setLineWidth : Error processing arguments"); cobj->setLineWidth(arg0); args.rval().setUndefined(); @@ -1129,9 +1166,9 @@ bool js_creator_GraphicsNode_circle(JSContext *cx, uint32_t argc, jsval *vp) double arg0 = 0; double arg1 = 0; double arg2 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); - ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !isnan(arg2); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_circle : Error processing arguments"); cobj->circle(arg0, arg1, arg2); args.rval().setUndefined(); @@ -1155,11 +1192,11 @@ bool js_creator_GraphicsNode_roundRect(JSContext *cx, uint32_t argc, jsval *vp) double arg2 = 0; double arg3 = 0; double arg4 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); - ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); - ok &= JS::ToNumber( cx, args.get(3), &arg3) && !std::isnan(arg3); - ok &= JS::ToNumber( cx, args.get(4), &arg4) && !std::isnan(arg4); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !isnan(arg2); + ok &= JS::ToNumber( cx, args.get(3), &arg3) && !isnan(arg3); + ok &= JS::ToNumber( cx, args.get(4), &arg4) && !isnan(arg4); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_roundRect : Error processing arguments"); cobj->roundRect(arg0, arg1, arg2, arg3, arg4); args.rval().setUndefined(); @@ -1184,12 +1221,12 @@ bool js_creator_GraphicsNode_bezierCurveTo(JSContext *cx, uint32_t argc, jsval * double arg3 = 0; double arg4 = 0; double arg5 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); - ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); - ok &= JS::ToNumber( cx, args.get(3), &arg3) && !std::isnan(arg3); - ok &= JS::ToNumber( cx, args.get(4), &arg4) && !std::isnan(arg4); - ok &= JS::ToNumber( cx, args.get(5), &arg5) && !std::isnan(arg5); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !isnan(arg2); + ok &= JS::ToNumber( cx, args.get(3), &arg3) && !isnan(arg3); + ok &= JS::ToNumber( cx, args.get(4), &arg4) && !isnan(arg4); + ok &= JS::ToNumber( cx, args.get(5), &arg5) && !isnan(arg5); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_bezierCurveTo : Error processing arguments"); cobj->bezierCurveTo(arg0, arg1, arg2, arg3, arg4, arg5); args.rval().setUndefined(); @@ -1213,11 +1250,11 @@ bool js_creator_GraphicsNode_arcTo(JSContext *cx, uint32_t argc, jsval *vp) double arg2 = 0; double arg3 = 0; double arg4 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); - ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); - ok &= JS::ToNumber( cx, args.get(3), &arg3) && !std::isnan(arg3); - ok &= JS::ToNumber( cx, args.get(4), &arg4) && !std::isnan(arg4); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !isnan(arg2); + ok &= JS::ToNumber( cx, args.get(3), &arg3) && !isnan(arg3); + ok &= JS::ToNumber( cx, args.get(4), &arg4) && !isnan(arg4); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_arcTo : Error processing arguments"); cobj->arcTo(arg0, arg1, arg2, arg3, arg4); args.rval().setUndefined(); @@ -1240,10 +1277,10 @@ bool js_creator_GraphicsNode_fillRect(JSContext *cx, uint32_t argc, jsval *vp) double arg1 = 0; double arg2 = 0; double arg3 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); - ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); - ok &= JS::ToNumber( cx, args.get(3), &arg3) && !std::isnan(arg3); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !isnan(arg2); + ok &= JS::ToNumber( cx, args.get(3), &arg3) && !isnan(arg3); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_fillRect : Error processing arguments"); cobj->fillRect(arg0, arg1, arg2, arg3); args.rval().setUndefined(); @@ -1339,7 +1376,7 @@ bool js_creator_GraphicsNode_setDeviceRatio(JSContext *cx, uint32_t argc, jsval JSB_PRECONDITION2( cobj, cx, false, "js_creator_GraphicsNode_setDeviceRatio : Invalid Native Object"); if (argc == 1) { double arg0 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_setDeviceRatio : Error processing arguments"); cobj->setDeviceRatio(arg0); args.rval().setUndefined(); @@ -1362,10 +1399,10 @@ bool js_creator_GraphicsNode_rect(JSContext *cx, uint32_t argc, jsval *vp) double arg1 = 0; double arg2 = 0; double arg3 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); - ok &= JS::ToNumber( cx, args.get(1), &arg1) && !std::isnan(arg1); - ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); - ok &= JS::ToNumber( cx, args.get(3), &arg3) && !std::isnan(arg3); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); + ok &= JS::ToNumber( cx, args.get(1), &arg1) && !isnan(arg1); + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !isnan(arg2); + ok &= JS::ToNumber( cx, args.get(3), &arg3) && !isnan(arg3); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_rect : Error processing arguments"); cobj->rect(arg0, arg1, arg2, arg3); args.rval().setUndefined(); @@ -1439,7 +1476,7 @@ bool js_creator_GraphicsNode_setMiterLimit(JSContext *cx, uint32_t argc, jsval * JSB_PRECONDITION2( cobj, cx, false, "js_creator_GraphicsNode_setMiterLimit : Invalid Native Object"); if (argc == 1) { double arg0 = 0; - ok &= JS::ToNumber( cx, args.get(0), &arg0) && !std::isnan(arg0); + ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0); JSB_PRECONDITION2(ok, cx, false, "js_creator_GraphicsNode_setMiterLimit : Error processing arguments"); cobj->setMiterLimit(arg0); args.rval().setUndefined(); @@ -1534,39 +1571,58 @@ bool js_creator_GraphicsNode_create(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); if (argc == 0) { - - auto ret = creator::GraphicsNode::create(); - js_type_class_t *typeClass = js_get_type_from_native(ret); - JS::RootedObject jsret(cx, jsb_ref_autoreleased_create_jsobject(cx, ret, typeClass, "creator::GraphicsNode")); - args.rval().set(OBJECT_TO_JSVAL(jsret)); + creator::GraphicsNode* ret = creator::GraphicsNode::create(); + jsval jsret = JSVAL_NULL; + do { + if (ret) { + js_proxy_t *jsProxy = js_get_or_create_proxy(cx, (creator::GraphicsNode*)ret); + jsret = OBJECT_TO_JSVAL(jsProxy->obj); + } else { + jsret = JSVAL_NULL; + } + } while (0); + args.rval().set(jsret); return true; } JS_ReportError(cx, "js_creator_GraphicsNode_create : wrong number of arguments"); return false; } - bool js_creator_GraphicsNode_constructor(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); bool ok = true; creator::GraphicsNode* cobj = new (std::nothrow) creator::GraphicsNode(); - - js_type_class_t *typeClass = js_get_type_from_native(cobj); - + cocos2d::Ref *_ccobj = dynamic_cast(cobj); + if (_ccobj) { + _ccobj->autorelease(); + } + TypeTest t; + js_type_class_t *typeClass = nullptr; + std::string typeName = t.s_name(); + auto typeMapIter = _js_global_type_map.find(typeName); + CCASSERT(typeMapIter != _js_global_type_map.end(), "Can't find the class type!"); + typeClass = typeMapIter->second; + CCASSERT(typeClass, "The value is null."); + JS::RootedObject proto(cx, typeClass->proto.ref()); + JS::RootedObject parent(cx, typeClass->parentProto.ref()); + JS::RootedObject obj(cx, JS_NewObject(cx, typeClass->jsclass, proto, parent)); + args.rval().set(OBJECT_TO_JSVAL(obj)); // link the native object with the javascript object - JS::RootedObject jsobj(cx, jsb_ref_create_jsobject(cx, cobj, typeClass, "creator::GraphicsNode")); - args.rval().set(OBJECT_TO_JSVAL(jsobj)); - if (JS_HasProperty(cx, jsobj, "_ctor", &ok) && ok) - ScriptingCore::getInstance()->executeFunctionWithOwner(OBJECT_TO_JSVAL(jsobj), "_ctor", args); + js_proxy_t* p = jsb_new_proxy(cobj, obj); + AddNamedObjectRoot(cx, &p->obj, "creator::GraphicsNode"); + if (JS_HasProperty(cx, obj, "_ctor", &ok) && ok) + ScriptingCore::getInstance()->executeFunctionWithOwner(OBJECT_TO_JSVAL(obj), "_ctor", args); return true; -} -static bool js_creator_GraphicsNode_ctor(JSContext *cx, uint32_t argc, jsval *vp) +}static bool js_creator_GraphicsNode_ctor(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); creator::GraphicsNode *nobj = new (std::nothrow) creator::GraphicsNode(); - auto newproxy = jsb_new_proxy(nobj, obj); - jsb_ref_init(cx, &newproxy->obj, nobj, "creator::GraphicsNode"); + if (nobj) { + nobj->autorelease(); + } + js_proxy_t* p = jsb_new_proxy(nobj, obj); + AddNamedObjectRoot(cx, &p->obj, "creator::GraphicsNode"); bool isFound = false; if (JS_HasProperty(cx, obj, "_ctor", &isFound) && isFound) ScriptingCore::getInstance()->executeFunctionWithOwner(OBJECT_TO_JSVAL(obj), "_ctor", args); @@ -1574,9 +1630,11 @@ static bool js_creator_GraphicsNode_ctor(JSContext *cx, uint32_t argc, jsval *vp return true; } - extern JSObject *jsb_cocos2d_Node_prototype; +void js_creator_GraphicsNode_finalize(JSFreeOp *fop, JSObject *obj) { + CCLOGINFO("jsbindings: finalizing JS object %p (GraphicsNode)", obj); +} void js_register_creator_GraphicsNode(JSContext *cx, JS::HandleObject global) { jsb_creator_GraphicsNode_class = (JSClass *)calloc(1, sizeof(JSClass)); @@ -1588,9 +1646,11 @@ void js_register_creator_GraphicsNode(JSContext *cx, JS::HandleObject global) { jsb_creator_GraphicsNode_class->enumerate = JS_EnumerateStub; jsb_creator_GraphicsNode_class->resolve = JS_ResolveStub; jsb_creator_GraphicsNode_class->convert = JS_ConvertStub; + jsb_creator_GraphicsNode_class->finalize = js_creator_GraphicsNode_finalize; jsb_creator_GraphicsNode_class->flags = JSCLASS_HAS_RESERVED_SLOTS(2); static JSPropertySpec properties[] = { + JS_PSG("__nativeObj", js_is_native_obj, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_PS_END }; @@ -1646,16 +1706,11 @@ void js_register_creator_GraphicsNode(JSContext *cx, JS::HandleObject global) { NULL, // no static properties st_funcs); - JS::RootedObject proto(cx, jsb_creator_GraphicsNode_prototype); - JS::RootedValue className(cx, std_string_to_jsval(cx, "GraphicsNode")); - JS_SetProperty(cx, proto, "_className", className); - JS_SetProperty(cx, proto, "__nativeObj", JS::TrueHandleValue); - JS_SetProperty(cx, proto, "__is_ref", JS::TrueHandleValue); // add the proto and JSClass to the type->js info hash table + JS::RootedObject proto(cx, jsb_creator_GraphicsNode_prototype); jsb_register_class(cx, jsb_creator_GraphicsNode_class, proto, parent_proto); anonEvaluate(cx, global, "(function () { cc.GraphicsNode.extend = cc.Class.extend; })()"); } - void register_all_creator(JSContext* cx, JS::HandleObject obj) { // Get the ns JS::RootedObject ns(cx); diff --git a/native/tools/tojs/creator.ini b/native/tools/tojs/creator.ini index d57a7a029e..97674c8da2 100755 --- a/native/tools/tojs/creator.ini +++ b/native/tools/tojs/creator.ini @@ -63,4 +63,4 @@ base_classes_to_skip = Ref abstract_classes = Helper LayoutManager AbstractCheckButton # Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. -script_control_cpp = yes +script_control_cpp = no