From e769890ddc9c19bdf834d61cabfaab56b7f2e7cf Mon Sep 17 00:00:00 2001 From: zhangbin Date: Thu, 13 Oct 2016 18:37:04 +0800 Subject: [PATCH] Add method insertChildBefore for Creator issue 4335. --- native/cocos/2d/CCNode.cpp | 60 ++++++++++++++++++- native/cocos/2d/CCNode.h | 10 ++++ .../auto/api/jsb_cocos2dx_auto_api.js | 12 ++++ .../js-bindings/auto/jsb_cocos2dx_auto.cpp | 39 ++++++++++++ .../js-bindings/auto/jsb_cocos2dx_auto.hpp | 1 + 5 files changed, 120 insertions(+), 2 deletions(-) diff --git a/native/cocos/2d/CCNode.cpp b/native/cocos/2d/CCNode.cpp index 1d1e7d6508..b85c46ed0c 100644 --- a/native/cocos/2d/CCNode.cpp +++ b/native/cocos/2d/CCNode.cpp @@ -881,6 +881,57 @@ void Node::addChild(Node* child, int localZOrder, const std::string &name) addChildHelper(child, localZOrder, INVALID_TAG, name, false); } +void Node::insertChildBefore(Node* child, Node* relativeChild) +{ + CCASSERT(child != nullptr && relativeChild != nullptr, "Argument must be non-nil"); + CCASSERT(child->_parent == nullptr, "child already added. It can't be added again"); + CCASSERT(relativeChild->_parent == this, "The relateChild is not a child of this node"); + + if (child == nullptr) { + return; + } + if (child->_parent != nullptr) + { + log("child already added. It can't be added again"); + return; + } + + if (relativeChild->_parent != this) + { + log("The relativeChild is not a child of this node"); + return; + } + + // make sure the index of relativeChild is right + if (_reorderChildDirty) + { + sortAllChildren(); + } + + // do insert +#if CC_ENABLE_GC_FOR_NATIVE_OBJECTS + auto sEngine = ScriptEngineManager::getInstance()->getScriptEngine(); + if (sEngine) + { + sEngine->retainScriptObject(this, child); + } +#endif // CC_ENABLE_GC_FOR_NATIVE_OBJECTS + _transformUpdated = true; + child->_setLocalZOrder(relativeChild->getLocalZOrder()); + auto idx = _children.getIndex(relativeChild); + _children.insert(idx, child); + + // update the arrival order + for (auto i = idx, n = _children.size(); i < n; ++i) + { + auto childNode = _children.at(i); + childNode->updateOrderOfArrival(); + } + + child->setParent(this); + postInsertChild(child); +} + void Node::addChildHelper(Node* child, int localZOrder, int tag, const std::string &name, bool setTag) { if (child == nullptr) { @@ -906,6 +957,11 @@ void Node::addChildHelper(Node* child, int localZOrder, int tag, const std::stri child->setParent(this); child->updateOrderOfArrival(); + postInsertChild(child); +} + +void Node::postInsertChild(Node* child) +{ if( _running ) { child->onEnter(); @@ -915,12 +971,12 @@ void Node::addChildHelper(Node* child, int localZOrder, int tag, const std::stri child->onEnterTransitionDidFinish(); } } - + if (_cascadeColorEnabled) { updateCascadeColor(); } - + if (_cascadeOpacityEnabled) { updateCascadeOpacity(); diff --git a/native/cocos/2d/CCNode.h b/native/cocos/2d/CCNode.h index 5896957aa4..d72f052a3c 100644 --- a/native/cocos/2d/CCNode.h +++ b/native/cocos/2d/CCNode.h @@ -1734,6 +1734,15 @@ CC_CONSTRUCTOR_ACCESS: virtual ~Node(); virtual bool init(); + + /** + * Insert a child before the relative node. + * This method is added for Creator issue : + * https://github.com/cocos-creator/fireball/issues/4335 + * @param child The child will be inserted + * @param relativeChild The relative child where will be inserted + */ + void insertChildBefore(Node* child, Node* relativeChild); protected: /// lazy allocs @@ -1770,6 +1779,7 @@ protected: private: void addChildHelper(Node* child, int localZOrder, int tag, const std::string &name, bool setTag); + void postInsertChild(Node* child); protected: 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 007afaca8a..fbbd64501b 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 @@ -1564,6 +1564,18 @@ float { }, +/** + * @method insertChildBefore + * @param {cc.Node} arg0 + * @param {cc.Node} arg1 + */ +insertChildBefore : function ( +node, +node +) +{ +}, + /** * @method isRunning * @return {bool} 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 27e09e99ca..fb2a6f0968 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -3957,6 +3957,44 @@ bool js_cocos2dx_Node_getPosition(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_Node_getPosition : wrong number of arguments"); return false; } +bool js_cocos2dx_Node_insertChildBefore(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::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_insertChildBefore : Invalid Native Object"); + if (argc == 2) { + cocos2d::Node* arg0 = nullptr; + cocos2d::Node* arg1 = nullptr; + do { + if (args.get(0).isNull()) { arg0 = nullptr; break; } + if (!args.get(0).isObject()) { ok = false; break; } + js_proxy_t *jsProxy; + JS::RootedObject tmpObj(cx, args.get(0).toObjectOrNull()); + jsProxy = jsb_get_js_proxy(tmpObj); + arg0 = (cocos2d::Node*)(jsProxy ? jsProxy->ptr : NULL); + JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object"); + } while (0); + do { + if (args.get(1).isNull()) { arg1 = nullptr; break; } + if (!args.get(1).isObject()) { ok = false; break; } + js_proxy_t *jsProxy; + JS::RootedObject tmpObj(cx, args.get(1).toObjectOrNull()); + jsProxy = jsb_get_js_proxy(tmpObj); + arg1 = (cocos2d::Node*)(jsProxy ? jsProxy->ptr : NULL); + JSB_PRECONDITION2( arg1, cx, false, "Invalid Native Object"); + } while (0); + JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Node_insertChildBefore : Error processing arguments"); + cobj->insertChildBefore(arg0, arg1); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Node_insertChildBefore : wrong number of arguments: %d, was expecting %d", argc, 2); + return false; +} bool js_cocos2dx_Node_isRunning(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -5126,6 +5164,7 @@ void js_register_cocos2dx_Node(JSContext *cx, JS::HandleObject global) { JS_FN("getScheduler", js_cocos2dx_Node_getScheduler, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setActionManager", js_cocos2dx_Node_setActionManager, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getPosition", js_cocos2dx_Node_getPosition, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("insertChildBefore", js_cocos2dx_Node_insertChildBefore, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("isRunning", js_cocos2dx_Node_isRunning, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getParent", js_cocos2dx_Node_getParent, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getWorldToNodeTransform3D", js_cocos2dx_Node_getWorldToNodeTransform, 0, 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 ccb1dc17e3..6ba4d39a2e 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp @@ -206,6 +206,7 @@ bool js_cocos2dx_Node_getLocalZOrder(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_getScheduler(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_setActionManager(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_getPosition(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Node_insertChildBefore(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_isRunning(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_getParent(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_getWorldToNodeTransform(JSContext *cx, uint32_t argc, jsval *vp);