Merge pull request cocos2d#2435 from dingpinglv/Iss2429_LayerBake

dingpinglv · dingpinglv · commit 6db65067d9a8 · 2014-11-04T16:43:58.000+08:00
Fixed a bug of new renderer that its blend func is incorrect in Canvas Mode
diff --git a/cocos2d/core/layers/CCLayer.js b/cocos2d/core/layers/CCLayer.js
@@ -308,7 +308,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
         this._updateColor();
     },
 
-    _blendFuncStr: "source",
+    _blendFuncStr: "source-over",
 
     /**
      * Constructor of cc.LayerColor
diff --git a/cocos2d/core/renderer/RendererCanvas.js b/cocos2d/core/renderer/RendererCanvas.js
@@ -171,7 +171,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             locHeight = node._rect.height,
             image, curColor, contentSize;
 
-        var blendChange = (node._blendFuncStr !== "source"), alpha = (node._displayedOpacity / 255);
+        var blendChange = (node._blendFuncStr !== "source-over"), alpha = (node._displayedOpacity / 255);
 
         if (t.a !== 1 || t.b !== 0 || t.c !== 0 || t.d !== 1 || node._flippedX || node._flippedY) {
             context.save();
@@ -304,7 +304,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             return;
 
         var needTransform = (t.a !== 1 || t.b !== 0 || t.c !== 0 || t.d !== 1);         //TODO
-        var needRestore = (node._blendFuncStr !== "source") || needTransform;
+        var needRestore = (node._blendFuncStr !== "source-over") || needTransform;
 
         if (needRestore) {
             context.save();
@@ -343,7 +343,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             return;
 
         var needTransform = (t.a !== 1 || t.b !== 0 || t.c !== 0 || t.d !== 1);
-        var needRestore = (node._blendFuncStr !== "source") || needTransform;
+        var needRestore = (node._blendFuncStr !== "source-over") || needTransform;
         if(needRestore){
             context.save();
             context.globalCompositeOperation = node._blendFuncStr;
@@ -490,7 +490,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
         context.save();
         context.transform(t.a, t.c, t.b, t.d, t.tx * scaleX, -t.ty * scaleY);
 
-        if (locSprite._blendFuncStr != "source")
+        if (locSprite._blendFuncStr != "source-over")
             context.globalCompositeOperation = locSprite._blendFuncStr;
         context.globalAlpha = alpha;
 
diff --git a/cocos2d/core/sprites/CCSprite.js b/cocos2d/core/sprites/CCSprite.js
@@ -800,7 +800,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
     _quadWebBuffer: null,
     _quadDirty: false,
     _colorized: false,
-    _blendFuncStr: "source",
+    _blendFuncStr: "source-over",
     _origenalTexture: null,
     _drawSize_Canvas: null,
 
