Fix the problem that Label switch CacheMode is invalid in Editor. (cocos#5493)

caryliu1999 · jareguo · commit 94144e364133 · 2019-09-30T22:05:16.000+08:00
* Fix the problem that Label switch CacheMode is invalid in Editor.

* modify by comment
diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js
@@ -488,7 +488,9 @@ let Label = cc.Class({
                 if (oldValue === CacheMode.CHAR) {
                     this._ttfTexture = null;
                 }
-
+                
+                this._resetAssembler();
+                this._applyFontTexture(true);
                 this._lazyUpdateRenderData();
             },
             animatable: false
diff --git a/cocos2d/core/renderer/webgl/assemblers/label/2d/bmfont.js b/cocos2d/core/renderer/webgl/assemblers/label/2d/bmfont.js
@@ -58,7 +58,9 @@ export default class WebglBmfontAssembler extends BmfontAssembler {
         _dataOffset = 0;
     }
 
-    updateColor () {}
+    _getColor (comp) {
+        return comp.node._color._val;
+    }
 
     appendQuad (comp, texture, rect, rotated, x, y, scale) {
         let renderData = this._renderData;
@@ -72,7 +74,7 @@ export default class WebglBmfontAssembler extends BmfontAssembler {
             texh = texture.height,
             rectWidth = rect.width,
             rectHeight = rect.height,
-            color = comp.node._color._val;
+            color = this._getColor(comp);
 
         let l, b, r, t;
         let floatsPerVert = this.floatsPerVert;
diff --git a/cocos2d/core/renderer/webgl/assemblers/label/2d/letter.js b/cocos2d/core/renderer/webgl/assemblers/label/2d/letter.js
@@ -33,9 +33,13 @@ export default class WebglLetterFontAssembler extends LetterFontAssembler {
         return comp.requestRenderData();
     }
 
+    _getColor (comp) {
+        WHITE._fastSetA(comp.node._color.a);
+        return WHITE._val;
+    }
+
     updateColor (comp) {
-        WHITE._fastSetA(comp.node.color.a);
-        let color = WHITE._val;
+        let color = this._getColor(comp);
 
         super.updateColor(comp, color);
     }
diff --git a/cocos2d/core/renderer/webgl/assemblers/label/2d/ttf.js b/cocos2d/core/renderer/webgl/assemblers/label/2d/ttf.js
@@ -43,7 +43,7 @@ export default class WebglTTFAssembler extends TTFAssembler {
     }
 
     updateColor (comp) {
-        WHITE._fastSetA(comp.node.color.a);
+        WHITE._fastSetA(comp.node._color.a);
         let color = WHITE._val;
 
         super.updateColor(comp, color);

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,13 @@ export default class WebglLetterFontAssembler extends LetterFontAssembler {`
`33`	`33`	`return comp.requestRenderData();`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ _getColor (comp) {`
	`37`	`+ WHITE._fastSetA(comp.node._color.a);`
	`38`	`+ return WHITE._val;`
	`39`	`+ }`
	`40`	`+`
`36`	`41`	`updateColor (comp) {`
`37`		`- WHITE._fastSetA(comp.node.color.a);`
`38`		`- let color = WHITE._val;`
	`42`	`+ let color = this._getColor(comp);`
`39`	`43`
`40`	`44`	`super.updateColor(comp, color);`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export default class WebglTTFAssembler extends TTFAssembler {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`updateColor (comp) {`
`46`		`- WHITE._fastSetA(comp.node.color.a);`
	`46`	`+ WHITE._fastSetA(comp.node._color.a);`
`47`	`47`	`let color = WHITE._val;`
`48`	`48`
`49`	`49`	`super.updateColor(comp, color);`