Remove useless code in Sprite for old batch node

Author: pandamicro

CCDebugger.js

@@ -68,7 +68,8 @@ cc._LogInfos = {
     Node_resumeSchedulerAndActions: "resumeSchedulerAndActions is deprecated, please use resume instead.",
     Node_pauseSchedulerAndActions: "pauseSchedulerAndActions is deprecated, please use pause instead.",
     Node__arrayMakeObjectsPerformSelector: "Unknown callback function",
-    Node_reorderChild: "child must be non-null",
+    Node_reorderChild: "cc.Node.reorderChild(): child must be non-null",
+    Node_reorderChild_2: "cc.Node.reorderChild(): this child is not in children list",
     Node_runAction: "cc.Node.runAction(): action must be non-null",
     Node_schedule: "callback function must be non-null",
     Node_schedule_2: "interval must be positive",
@@ -119,7 +120,6 @@ cc._LogInfos = {
     animationCache__parseVersion2_2: "cocos2d: cc.AnimationCache: Animation '%s' refers to frame '%s' which is not currently in the cc.SpriteFrameCache. This frame will not be added to the animation.",
     animationCache_addAnimations_2: "cc.AnimationCache.addAnimations(): Invalid texture file name",
 
-    Sprite_reorderChild: "cc.Sprite.reorderChild(): this child is not in children list",
     Sprite_ignoreAnchorPointForPosition: "cc.Sprite.ignoreAnchorPointForPosition(): it is invalid in cc.Sprite when using SpriteBatchNode",
     Sprite_setDisplayFrameWithAnimationName: "cc.Sprite.setDisplayFrameWithAnimationName(): Frame not found",
     Sprite_setDisplayFrameWithAnimationName_2: "cc.Sprite.setDisplayFrameWithAnimationName(): Invalid frame index",
@@ -130,7 +130,6 @@ cc._LogInfos = {
     Sprite_initWithSpriteFrameName1: " is null, please check.",
     Sprite_initWithFile: "cc.Sprite.initWithFile(): filename should be non-null",
     Sprite_setDisplayFrameWithAnimationName_3: "cc.Sprite.setDisplayFrameWithAnimationName(): animationName must be non-null",
-    Sprite_reorderChild_2: "cc.Sprite.reorderChild(): child should be non-null",
     Sprite_addChild: "cc.Sprite.addChild(): cc.Sprite only supports cc.Sprites as children when using cc.SpriteBatchNode",
     Sprite_addChild_2: "cc.Sprite.addChild(): cc.Sprite only supports a sprite using same texture as children when using cc.SpriteBatchNode",
     Sprite_addChild_3: "cc.Sprite.addChild(): child should be non-null",

cocos2d/core/base-nodes/CCNode.js

@@ -1360,6 +1360,13 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      */
     reorderChild: function (child, zOrder) {
         cc.assert(child, cc._LogInfos.Node_reorderChild);
+        if (this._children.indexOf(child) === -1) {
+            cc.log(cc._LogInfos.Node_reorderChild_2);
+            return;
+        }
+        if (zOrder === child.zIndex) {
+            return;
+        }
         cc.renderer.childrenOrderDirty = this._reorderChildDirty = true;
         child.arrivalOrder = cc.s_globalOrderOfArrival;
         cc.s_globalOrderOfArrival++;

cocos2d/core/sprites/CCSprite.js

@@ -276,8 +276,6 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
      * @param {cc.SpriteBatchNode} batchNode
      */
     useBatchNode: function (batchNode) {
-        this.textureAtlas = batchNode.getTextureAtlas(); // weak ref
-        this._batchNode = batchNode;
     },
 
     /**
@@ -299,94 +297,10 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
         this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
     },
 
-    /**
-     * Sort all children of this sprite node.
-     * @override
-     */
-    sortAllChildren: function () {
-        if (this._reorderChildDirty) {
-            var _children = this._children;
-
-            cc.Node.prototype.sortAllChildren.call(this);
-
-            if (this._batchNode) {
-                this._arrayMakeObjectsPerformSelector(_children, cc.Node._stateCallbackType.sortAllChildren);
-            }
-
-            //don't need to check children recursively, that's done in visit of each child
-            this._reorderChildDirty = false;
-        }
-
-    },
-
-    /**
-     * Reorders a child according to a new z value.  (override cc.Node )
-     * @param {cc.Node} child
-     * @param {Number} zOrder
-     * @override
-     */
-    reorderChild: function (child, zOrder) {
-        cc.assert(child, cc._LogInfos.Sprite_reorderChild_2);
-        if (this._children.indexOf(child) === -1) {
-            cc.log(cc._LogInfos.Sprite_reorderChild);
-            return;
-        }
-
-        if (zOrder === child.zIndex)
-            return;
-
-        if (this._batchNode && !this._reorderChildDirty) {
-            this._setReorderChildDirtyRecursively();
-            this._batchNode.reorderBatch(true);
-        }
-        cc.Node.prototype.reorderChild.call(this, child, zOrder);
-    },
-
-    /**
-     * Removes a child from the sprite.
-     * @param child
-     * @param cleanup  whether or not cleanup all running actions
-     * @override
-     */
-    removeChild: function (child, cleanup) {
-        if (this._batchNode)
-            this._batchNode.removeSpriteFromAtlas(child);
-        cc.Node.prototype.removeChild.call(this, child, cleanup);
-    },
-
-    /**
-     * Removes all children from the container.
-     * @param cleanup whether or not cleanup all running actions
-     * @override
-     */
-    removeAllChildren: function (cleanup) {
-        var locChildren = this._children, locBatchNode = this._batchNode;
-        if (locBatchNode && locChildren != null) {
-            for (var i = 0, len = locChildren.length; i < len; i++)
-                locBatchNode.removeSpriteFromAtlas(locChildren[i]);
-        }
-
-        cc.Node.prototype.removeAllChildren.call(this, cleanup);
-        this._hasChildren = false;
-    },
-
     //
     // cc.Node property overloads
     //
 
-    /**
-     * Sets whether ignore anchor point for positioning
-     * @param {Boolean} relative
-     * @override
-     */
-    ignoreAnchorPointForPosition: function (relative) {
-        if (this._batchNode) {
-            cc.log(cc._LogInfos.Sprite_ignoreAnchorPointForPosition);
-            return;
-        }
-        cc.Node.prototype.ignoreAnchorPointForPosition.call(this, relative);
-    },
-
     /**
      * Sets whether the sprite should be flipped horizontally or not.
      * @param {Boolean} flippedX true if the sprite should be flipped horizontally, false otherwise.
@@ -494,18 +408,6 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
         return this._batchNode;
     },
 
-    _setReorderChildDirtyRecursively: function () {
-        //only set parents flag the first time
-        if (!this._reorderChildDirty) {
-            this._reorderChildDirty = true;
-            var pNode = this._parent;
-            while (pNode && pNode !== this._batchNode) {
-                pNode._setReorderChildDirtyRecursively();
-                pNode = pNode.parent;
-            }
-        }
-    },
-
     // CCTextureProtocol
     /**
      * Returns the texture of the sprite node
@@ -856,20 +758,6 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
      *  layer.addChild(batch);
      */
     setBatchNode: function (spriteBatchNode) {
-        var _t = this;
-        _t._batchNode = spriteBatchNode; // weak reference
-
-        // self render
-        if (!_t._batchNode) {
-            _t.atlasIndex = cc.Sprite.INDEX_NOT_INITIALIZED;
-            _t.textureAtlas = null;
-            _t._recursiveDirty = false;
-            _t.dirty = false;
-        } else {
-            // using batch
-            _t._transformToBatch = cc.affineTransformIdentity();
-            _t.textureAtlas = _t._batchNode.getTextureAtlas(); // weak ref
-        }
     },
 
     // CCTextureProtocol