Merge branch 'Iss2416_RefactorRenderer' of https://github.com/dingpinglv/cocos2d-html5 into Iss2416_RefactorRenderer

Author: dingpinglv

cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js

@@ -142,6 +142,7 @@
             context.globalCompositeOperation = "destination-over";
             context.drawImage(locCache, 0, 0);
             context.restore();
+            this._dirtyFlag = 0;
         } else {
             context.restore();
         }
@@ -209,6 +210,7 @@
         }
 
         cc.renderer.pushRenderCommand(this._rendererRestoreCmd);
+        this._dirtyFlag = 0;
     };
 
     cc.ClippingNode.CanvasRenderCmd._sharedCache = null;

cocos2d/core/layers/CCLayerCanvasRenderCmd.js

@@ -127,6 +127,7 @@
 
         //the bakeSprite is drawing
         this._bakeSprite.visit(this);
+        this._dirtyFlag = 0;
     };
 
     proto._bakeForAddChild = function(child){
@@ -290,6 +291,7 @@
         //the bakeSprite is drawing
         this._bakeSprite._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
         this._bakeSprite.visit(this);
+        this._dirtyFlag = 0;
     };
 
     proto._getBoundingBoxForBake = function(){

cocos2d/core/sprites/CCSpriteBatchNode.js

@@ -422,6 +422,7 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
         // XXX: so, it should be AFTER the insertQuad
         sprite.dirty = true;
         sprite.updateTransform();
+        this._renderCmd.cutting(sprite, index);
     },
 
     /**

cocos2d/core/sprites/CCSpriteBatchNodeCanvasRenderCmd.js

@@ -41,11 +41,7 @@
         this._texture = texture;
     };
 
-    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.insertQuad = function(sprite, index){};
 
     proto.increaseAtlasCapacity = function(){};
 
@@ -69,4 +65,10 @@
     proto.getTextureAtlas = function(){};
 
     proto.setTextureAtlas = function(textureAtlas){};
+
+    proto.cutting = function(sprite, index){
+        var node = this._node;
+        //sprite._renderCmd._setCachedParent(this._renderCmd);    //TODO need move to renderCmd
+        node._children.splice(index, 0, sprite);
+    }
 })();

cocos2d/core/sprites/CCSpriteBatchNodeWebGLRenderCmd.js

@@ -225,4 +225,6 @@
             this._textureAtlas = textureAtlas;
         }
     };
+
+    proto.cutting = function(){};
 })();

cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js

@@ -108,7 +108,8 @@
     proto.visit = function(parentCmd){
         var node = this._node;
         this._syncStatus(parentCmd);
-        node.sprite.visit(parentCmd);
+        node.sprite.visit(this);
+        this._dirtyFlag = 0;
     };
 
     proto.draw = function(){
@@ -130,7 +131,7 @@
         for (var i = 0; i < childrenLen; i++) {
             var getChild = locChildren[i];
             if (getChild != selfSprite)
-                getChild.visit();
+                getChild.visit(this);
         }
         node.end();
     };

cocos2d/tilemap/CCTMXLayer.js

@@ -125,12 +125,6 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
         return this._renderCmd.getTexture();
     },
 
-    //set the cache dirty flag for canvas
-    _setNodeDirtyForCache: function () {
-        this._renderCmd._cacheDirty  = true;
-        this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
-    },
-
     /**
      * Gets layer size.
      * @return {cc.Size}
@@ -360,6 +354,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
             tile.anchorX = 0;
 	        tile.anchorY = 0;
             tile.opacity = this._opacity;
+            tile._renderCmd._cachedParent = this._renderCmd;
 
             var indexForZ = this._atlasIndexForExistantZ(z);
             this.addSpriteWithoutQuad(tile, indexForZ, z);
@@ -859,7 +854,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
             this._reusedTile.initWithTexture(this._renderCmd._texture, rect, false);
             this._reusedTile.batchNode = this;
             this._reusedTile.parent = this;
-            this._reusedTile._cachedParent = this._renderCmd;
+            this._reusedTile._renderCmd._cachedParent = this._renderCmd;
         }
         return this._reusedTile;
     },

cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js

@@ -56,6 +56,11 @@
         }
     };
 
+    //set the cache dirty flag for canvas
+    proto._setNodeDirtyForCache = function () {
+        this._cacheDirty  = true;
+    };
+
     proto._renderingChildToCache = function (scaleX, scaleY) {
         if (this._cacheDirty) {
             var locCacheCmds = this._childrenRenderCmds, locCacheContext = this._cacheContext, locCanvas = this._cacheCanvas;
@@ -174,6 +179,7 @@
             this._cacheDirty = false
         }
         cc.renderer.pushRenderCommand(this);
+        this._dirtyFlag = 0;
     };
 
     proto.initImageSize = function(){