From 9cd4dd5abafd98e4958d14bc44756ca36769a9f4 Mon Sep 17 00:00:00 2001 From: zilongshanren Date: Wed, 16 Mar 2016 14:44:29 +0800 Subject: [PATCH] reuse textDirty dirty flag --- cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js | 3 +-- cocos2d/core/label/CCSGLabel.js | 8 ++++---- cocos2d/core/label/CCSGLabelCanvasRenderCmd.js | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js b/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js index 1d6e22e114..b7facce48e 100644 --- a/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js +++ b/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js @@ -44,8 +44,7 @@ _ccsg.Node._dirtyFlags = { orderDirty: 1 << 5, textDirty: 1 << 6, gradientDirty: 1 << 7, - labelDirty: 1 << 8, - COUNT: 9 + COUNT: 8 }; cc.js.get(_ccsg.Node._dirtyFlags, 'all', function () { var count = _ccsg.Node._dirtyFlags.COUNT; diff --git a/cocos2d/core/label/CCSGLabel.js b/cocos2d/core/label/CCSGLabel.js index a417992ea1..b5cfcf8d60 100644 --- a/cocos2d/core/label/CCSGLabel.js +++ b/cocos2d/core/label/CCSGLabel.js @@ -436,7 +436,7 @@ _ccsg.Label = _ccsg.Node.extend({ if (CC_EDITOR) { this._updateLabel(); } else { - this._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.labelDirty); + this._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.textDirty); } }, _createRenderCmd: function() { @@ -449,19 +449,19 @@ _ccsg.Label = _ccsg.Node.extend({ getContentSize: function() { if (!CC_EDITOR && !cc.sizeEqualToSize(this._contentSize, this._renderCmd._realRenderingSize)) { - this._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.labelDirty); + this._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.textDirty); } return _ccsg.Node.prototype.getContentSize.call(this); }, _getWidth: function () { if (!CC_EDITOR && !cc.sizeEqualToSize(this._contentSize, this._renderCmd._realRenderingSize)) { - this._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.labelDirty); + this._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.textDirty); } return _ccsg.Node.prototype._getWidth.call(this); }, _getHeight: function () { if (!CC_EDITOR && !cc.sizeEqualToSize(this._contentSize, this._renderCmd._realRenderingSize)) { - this._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.labelDirty); + this._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.textDirty); } return _ccsg.Node.prototype._getHeight.call(this); }, diff --git a/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js b/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js index b6d617b5c9..ff2364862e 100644 --- a/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js +++ b/cocos2d/core/label/CCSGLabelCanvasRenderCmd.js @@ -44,7 +44,7 @@ if(colorDirty || opacityDirty){ this._updateColor(); - }else if(locFlag & flags.labelDirty) { + }else if(locFlag & flags.textDirty) { this._rebuildLabelSkin(); } @@ -79,7 +79,7 @@ if(colorDirty || opacityDirty){ this._updateColor(); - } else if(locFlag & flags.labelDirty) { + } else if(locFlag & flags.textDirty) { this._rebuildLabelSkin(); } @@ -438,7 +438,7 @@ }; proto._rebuildLabelSkin = function () { - this._dirtyFlag = this._dirtyFlag & _ccsg.Node._dirtyFlags.labelDirty ^ this._dirtyFlag; + this._dirtyFlag = this._dirtyFlag & _ccsg.Node._dirtyFlags.textDirty ^ this._dirtyFlag; var node = this._node; this._realRenderingSize = _ccsg.Node.prototype.getContentSize.call(node);