diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js index dab9455d65..fe528d151b 100644 --- a/cocos2d/core/components/CCLabel.js +++ b/cocos2d/core/components/CCLabel.js @@ -350,8 +350,12 @@ var Label = cc.Class({ this._bmFontOriginalSize = value.fontSize; } + if (this._renderData) { + RenderData.free(this._renderData); + this._renderData = null; + } + this._fontAtlas = null; this._material = null; - this._clearData(); this._activateMaterial(); this._updateRenderData(); }, @@ -424,19 +428,8 @@ var Label = cc.Class({ }, onEnable: function () { + this._super(); this._activateMaterial(); - this.node._renderComponent = this; - }, - - onDisable: function () { - this._clearData(); - this.node._renderComponent = null; - }, - - _clearData: function () { - RenderData.free(this._renderData); - this._renderData = null; - this._fontData = null; }, _activateMaterial: function () { diff --git a/cocos2d/core/components/CCRenderComponent.js b/cocos2d/core/components/CCRenderComponent.js index f792b07fd4..7699d3159a 100644 --- a/cocos2d/core/components/CCRenderComponent.js +++ b/cocos2d/core/components/CCRenderComponent.js @@ -59,6 +59,9 @@ var RenderComponent = cc.Class({ onDisable () { this.node._renderComponent = null; + }, + + onDestroy () { if (this._renderData) { RenderData.free(this._renderData); this._renderData = null; diff --git a/cocos2d/core/graphics/graphics.js b/cocos2d/core/graphics/graphics.js index 1a820c6280..4556bf9f60 100644 --- a/cocos2d/core/graphics/graphics.js +++ b/cocos2d/core/graphics/graphics.js @@ -222,13 +222,8 @@ var Graphics = cc.Class({ }, onEnable: function () { + this._super(); this._activateMaterial(); - this.node._renderComponent = this; - }, - - onDisable: function () { - this.clear(true); - this.node._renderComponent = null; }, _activateMaterial: function () { diff --git a/cocos2d/core/renderer/assemblers/label/bmfont-assembler.js b/cocos2d/core/renderer/assemblers/label/bmfont-assembler.js index 2fc9da51d9..87f8f6447b 100644 --- a/cocos2d/core/renderer/assemblers/label/bmfont-assembler.js +++ b/cocos2d/core/renderer/assemblers/label/bmfont-assembler.js @@ -101,7 +101,7 @@ let _contentSize = cc.size(); module.exports = { createData (comp) { - return new RenderData(); + return RenderData.alloc(); }, update (comp) { @@ -515,7 +515,6 @@ module.exports = { }, _shrinkLabelToContentSize (lambda) { - let fontData = comp._fontData; let fontSize = _fontSize; let originalLineHeight = _lineHeight; let fontAtlas = _fontAtlas; @@ -524,7 +523,7 @@ module.exports = { let tempLetterDefinition = fontAtlas.cloneLetterDefinition(); let flag = true; - while (lambda(fontData)) { + while (lambda()) { ++i; let newFontSize = fontSize - i; @@ -542,7 +541,7 @@ module.exports = { } else { this._multilineTextWrapByChar(); } - this._computeAlignmentOffset(fontData); + this._computeAlignmentOffset(); } _lineHeight = originalLineHeight; diff --git a/cocos2d/core/renderer/assemblers/label/ttf-assembler.js b/cocos2d/core/renderer/assemblers/label/ttf-assembler.js index 982758d428..f3a75a012d 100644 --- a/cocos2d/core/renderer/assemblers/label/ttf-assembler.js +++ b/cocos2d/core/renderer/assemblers/label/ttf-assembler.js @@ -42,7 +42,7 @@ let _isUnderline = false; module.exports = { createData (comp) { - let renderData = new RenderData(); + let renderData = RenderData.alloc(); renderData.dataLength = 4; renderData.vertexCount = 4; diff --git a/cocos2d/motion-streak/CCMotionStreak.js b/cocos2d/motion-streak/CCMotionStreak.js index 106175945f..5fc0d95271 100644 --- a/cocos2d/motion-streak/CCMotionStreak.js +++ b/cocos2d/motion-streak/CCMotionStreak.js @@ -208,19 +208,14 @@ var MotionStreak = cc.Class({ }, onEnable: function () { + this._super(); this._activateMaterial(); - this.node._renderComponent = this; this._applyFadeTime(); }, - onDisable: function () { - RenderData.free(this._renderData); - this._material = null; - this._renderData = null; - this.node._renderComponent = null; - }, - _activateMaterial: function () { + if (this._material) return; + let url = this._texture; let texture = cc.textureUtil.loadImage(url); let material = renderer.materialUtil.get(url);