Merge pull request #2691 from dingpinglv/Iss2684_LabelBMFont

Fixed a bug of cc.Layer that its bake function doesn't work when the layer has a parent node

Author: dingpinglv

cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

@@ -252,7 +252,7 @@ cc.Node.RenderCmd.prototype = {
         // transform for canvas
         var t = this.getNodeToParentTransform(),
             worldT = this._worldTransform;         //get the world transform
-
+        this._cacheDirty = true;
         if (parentCmd) {
             var pt = parentCmd._worldTransform;
             // cc.AffineTransformConcat is incorrect at get world transform
@@ -447,7 +447,7 @@ cc.Node.RenderCmd.prototype = {
 
     proto.setDirtyFlag = function (dirtyFlag) {
         cc.Node.RenderCmd.prototype.setDirtyFlag.call(this, dirtyFlag);
-        this._setCacheDirty();
+        this._setCacheDirty();                  //TODO it should remove from here.
         if(this._cachedParent)
             this._cachedParent.setDirtyFlag(dirtyFlag);
     };

cocos2d/core/layers/CCLayerCanvasRenderCmd.js

@@ -55,7 +55,7 @@
 
             if (!this._bakeSprite){
                 this._bakeSprite = new cc.BakeSprite();
-                this._bakeSprite._parent = this._node;
+                this._bakeSprite.setAnchorPoint(0,0);
             }
         }
     };
@@ -93,19 +93,8 @@
             var ctx = bakeContext.getContext();
             locBakeSprite.resetCanvasSize(boundingBox.width, boundingBox.height);
 
-            var anchor = locBakeSprite.getAnchorPointInPoints(), locPos = node._position;
-            if(node._ignoreAnchorPointForPosition){
-                //bakeContext.translate(0 - boundingBox.x + locPos.x, boundingBox.height + boundingBox.y - locPos.y);
-                bakeContext.setOffset(0 - boundingBox.x, ctx.canvas.height - boundingBox.height + boundingBox.y );
-                //reset the bake sprite's position
-                locBakeSprite.setPosition(anchor.x + boundingBox.x - locPos.x, anchor.y + boundingBox.y - locPos.y);
-            } else {
-                var selfAnchor = this.getAnchorPointInPoints();
-                var selfPos = {x: locPos.x - selfAnchor.x, y: locPos.y - selfAnchor.y};
-                //bakeContext.translate(0 - boundingBox.x + selfPos.x, boundingBox.height + boundingBox.y - selfPos.y);
-                bakeContext.setOffset(0 - boundingBox.x, ctx.canvas.height - boundingBox.height + boundingBox.y);
-                locBakeSprite.setPosition(anchor.x + boundingBox.x - selfPos.x, anchor.y + boundingBox.y - selfPos.y);
-            }
+            bakeContext.setOffset(0 - boundingBox.x, ctx.canvas.height - boundingBox.height + boundingBox.y );
+            locBakeSprite.setPosition(boundingBox.x, boundingBox.y);
 
             //visit for canvas
             node.sortAllChildren();
@@ -114,7 +103,7 @@
                 children[i].visit(this);
             }
             cc.renderer._renderingToCacheCanvas(bakeContext, this.__instanceId);
-            locBakeSprite.transform(this);                   //because bake sprite's position was changed at rendering.
+            locBakeSprite.transform();                   //because bake sprite's position was changed at rendering.
             this._cacheDirty = false;
         }
     };
@@ -234,19 +223,9 @@
             var bakeContext = locBakeSprite.getCacheContext();
             var ctx = bakeContext.getContext();
             locBakeSprite.resetCanvasSize(boundingBox.width, boundingBox.height);
-            var anchor = locBakeSprite.getAnchorPointInPoints(), locPos = node._position;
-            if(node._ignoreAnchorPointForPosition){
-                //bakeContext.translate(0 - boundingBox.x + locPos.x, boundingBox.height + boundingBox.y - locPos.y);
-                bakeContext.setOffset(0 - boundingBox.x, ctx.canvas.height - boundingBox.height + boundingBox.y );
-                //reset the bake sprite's position
-                locBakeSprite.setPosition(anchor.x + boundingBox.x - locPos.x, anchor.y + boundingBox.y - locPos.y);
-            } else {
-                var selfAnchor = this.getAnchorPointInPoints();
-                var selfPos = {x: locPos.x - selfAnchor.x, y: locPos.y - selfAnchor.y};
-                //bakeContext.translate(0 - boundingBox.x + selfPos.x, boundingBox.height + boundingBox.y - selfPos.y);
-                bakeContext.setOffset(0 - boundingBox.x, ctx.canvas.height - boundingBox.height + boundingBox.y);
-                locBakeSprite.setPosition(anchor.x + boundingBox.x - selfPos.x, anchor.y + boundingBox.y - selfPos.y);
-            }
+
+            bakeContext.setOffset(0 - boundingBox.x, ctx.canvas.height - boundingBox.height + boundingBox.y );
+            locBakeSprite.setPosition(boundingBox.x, boundingBox.y);
 
             var child;
             cc.renderer._turnToCacheMode(this.__instanceId);
@@ -268,7 +247,7 @@
             } else
                 cc.renderer.pushRenderCommand(this);
             cc.renderer._renderingToCacheCanvas(bakeContext, this.__instanceId);
-            locBakeSprite.transform(this);
+            locBakeSprite.transform();
             this._cacheDirty = false;
         }
     };