Issue cocos2d#2416: correct a mistake of cc.SpriteBatchNode

Author: dingpinglv

cocos2d/core/base-nodes/CCNode.js

@@ -1438,7 +1438,6 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
         child.arrivalOrder = cc.s_globalOrderOfArrival;
         cc.s_globalOrderOfArrival++;
         child._setLocalZOrder(zOrder);
-        this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.orderDirty);
     },
 
     /**

cocos2d/core/sprites/CCSpriteBatchNode.js

@@ -410,7 +410,7 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
             cc.log(cc._LogInfos.CCSpriteBatchNode_insertQuadFromSprite);
             return;
         }
-        this._renderCmd.checkAtlasCapacity(index);
+        this._renderCmd.insertQuad(sprite, index);
 
         //
         // update the quad directly. Don't add the sprite to the scene graph
@@ -422,9 +422,6 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
         // XXX: so, it should be AFTER the insertQuad
         sprite.dirty = true;
         sprite.updateTransform();
-
-        //sprite._renderCmd._setCachedParent(this._renderCmd);    //TODO need move to renderCmd
-        this._children.splice(index, 0, sprite);
     },
 
     /**
@@ -458,11 +455,7 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
         sprite.atlasIndex = index;
         sprite.dirty = true;
 
-        var locTextureAtlas = this.getTextureAtlas();
-        if (locTextureAtlas.totalQuads >= locTextureAtlas.capacity)
-            this.increaseAtlasCapacity();
-
-        locTextureAtlas.insertQuad(sprite.quad, index);
+        this._renderCmd.insertQuad(sprite, index);
         this._descendants.splice(index, 0, sprite);
 
         // update indices
@@ -497,6 +490,7 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
 
         this._descendants.push(sprite);
         var index = this._descendants.length - 1;
+
         sprite.atlasIndex = index;
         this._renderCmd.insertQuad(sprite, index);
 

cocos2d/core/sprites/CCSpriteBatchNodeCanvasRenderCmd.js

@@ -41,7 +41,11 @@
         this._texture = texture;
     };
 
-    proto.insertQuad = function(){};
+    proto.insertQuad = function(sprite, index){
+        var node = this._node;
+        node._children.splice(index, 0, sprite);
+        //sprite._renderCmd._setCachedParent(this._renderCmd);    //TODO need move to renderCmd
+    };
 
     proto.increaseAtlasCapacity = function(){};
 

cocos2d/tilemap/CCTMXLayer.js

@@ -455,6 +455,9 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
             return;
         }
 
+        console.log("textureAtlas capacity:" + this.textureAtlas.capacity + "   textureAtlas totalQuads:" + this.textureAtlas.totalQuads);
+        console.log("x:" + pos.x + "   y:" + pos.y);
+
         flags = flags || 0;
         this._setNodeDirtyForCache();
         var currentFlags = this.getTileFlagsAt(pos);