From 283f5c17d62793f846bb703cd58426579d84d049 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 7 Mar 2018 10:49:58 +0800 Subject: [PATCH] Improve render data management by RenderComponent --- cocos2d/core/components/CCLabel.js | 5 ++--- cocos2d/core/components/CCMask.js | 5 ++--- cocos2d/core/components/CCRenderComponent.js | 21 ++++++++++++++++--- cocos2d/core/components/CCSprite.js | 4 ++-- cocos2d/core/graphics/graphics.js | 12 ++++------- .../assemblers/graphics/graphics-assembler.js | 9 ++++---- .../assemblers/label/bmfont-assembler.js | 3 +-- .../assemblers/label/ttf-assembler.js | 3 +-- .../renderer/assemblers/mask-assembler.js | 3 +-- .../assemblers/motion-streak-assembler.js | 3 +-- .../assemblers/particle-system-assembler.js | 3 +-- .../renderer/assemblers/spine-assembler.js | 5 ++--- .../renderer/assemblers/sprite/bar-filled.js | 3 +-- .../assemblers/sprite/radial-filled.js | 3 +-- .../core/renderer/assemblers/sprite/simple.js | 3 +-- .../core/renderer/assemblers/sprite/sliced.js | 3 +-- .../assemblers/sprite/sprite-assembler.js | 1 - .../core/renderer/assemblers/sprite/tiled.js | 3 +-- .../assemblers/tmx-layer-assembler.js | 7 +------ cocos2d/motion-streak/CCMotionStreak.js | 1 - cocos2d/tilemap/CCTiledLayer.js | 1 - extensions/dragonbones/ArmatureDisplay.js | 1 - .../dragonbones/dragonblones-assembler.js | 8 +------ extensions/spine/Skeleton.js | 8 ++----- 24 files changed, 48 insertions(+), 70 deletions(-) diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js index 78f2a7de4c..0ec63f45ce 100644 --- a/cocos2d/core/components/CCLabel.js +++ b/cocos2d/core/components/CCLabel.js @@ -26,7 +26,6 @@ const RenderComponent = require('./CCRenderComponent'); const renderer = require('../renderer'); const renderEngine = require('../renderer/render-engine'); - const RenderData = renderEngine.RenderData; const SpriteMaterial = renderEngine.SpriteMaterial; /** @@ -351,7 +350,7 @@ var Label = cc.Class({ } if (this._renderData) { - RenderData.free(this._renderData); + this.destroyRenderData(this._renderData); this._renderData = null; } this._fontAtlas = null; @@ -378,7 +377,7 @@ var Label = cc.Class({ set: function(value) { if (this._isSystemFontUsed === value) return; - RenderData.free(this._renderData); + this.destroyRenderData(this._renderData); this._renderData = null; if (CC_EDITOR) { diff --git a/cocos2d/core/components/CCMask.js b/cocos2d/core/components/CCMask.js index a9407674d6..1ddbb9ab04 100644 --- a/cocos2d/core/components/CCMask.js +++ b/cocos2d/core/components/CCMask.js @@ -25,7 +25,6 @@ const renderEngine = require('../renderer/render-engine'); const gfx = renderEngine.gfx; -const RenderData = renderEngine.RenderData; const StencilMaterial = renderEngine.StencilMaterial; const RenderComponent = require('./CCRenderComponent'); @@ -104,8 +103,8 @@ let Mask = cc.Class({ this.alphaThreshold = 0; } if (this._renderData) { - this._renderData.uvDirty = true; - this._renderData.vertDirty = true; + this.destroyRenderData(this._renderData); + this._renderData = null; } this._updateMaterial(); }, diff --git a/cocos2d/core/components/CCRenderComponent.js b/cocos2d/core/components/CCRenderComponent.js index 7699d3159a..721993e14c 100644 --- a/cocos2d/core/components/CCRenderComponent.js +++ b/cocos2d/core/components/CCRenderComponent.js @@ -49,6 +49,7 @@ var RenderComponent = cc.Class({ this._material = null; this._customMaterial = false; this._renderData = null; + this.__allocedDatas = []; this._vertexFormat = defaultVertexFormat; this._toPostHandle = false; }, @@ -62,9 +63,23 @@ var RenderComponent = cc.Class({ }, onDestroy () { - if (this._renderData) { - RenderData.free(this._renderData); - this._renderData = null; + for (let i = 0, l = this.__allocedDatas.length; i < l; i++) { + RenderData.free(this.__allocedDatas[i]); + } + this.__allocedDatas.length = 0; + }, + + requestRenderData () { + let data = RenderData.alloc(); + this.__allocedDatas.push(data); + return data; + }, + + destroyRenderData (data) { + let index = this.__allocedDatas.indexOf(data); + if (index !== -1) { + this.__allocedDatas.splice(index, 1); + RenderData.free(data); } }, diff --git a/cocos2d/core/components/CCSprite.js b/cocos2d/core/components/CCSprite.js index 4cdce32767..b243c8bd92 100644 --- a/cocos2d/core/components/CCSprite.js +++ b/cocos2d/core/components/CCSprite.js @@ -235,7 +235,7 @@ var Sprite = cc.Class({ }, set: function (value) { if (this._type !== value) { - RenderData.free(this._renderData); + this.destroyRenderData(this._renderData); this._renderData = null; this._type = value; } @@ -262,7 +262,7 @@ var Sprite = cc.Class({ set: function(value) { if (value !== this._fillType) { if (value === FillType.RADIAL || this._fillType === FillType.RADIAL) { - RenderData.free(this._renderData); + this.destroyRenderData(this._renderData); this._renderData = null; } else if (this._renderData) { diff --git a/cocos2d/core/graphics/graphics.js b/cocos2d/core/graphics/graphics.js index 66fc58faab..07d11dd8a5 100644 --- a/cocos2d/core/graphics/graphics.js +++ b/cocos2d/core/graphics/graphics.js @@ -27,7 +27,6 @@ const RenderComponent = require('../components/CCRenderComponent'); const renderer = require('../renderer'); const renderEngine = require('../renderer/render-engine'); const SpriteMaterial = renderEngine.SpriteMaterial; -const RenderData = renderEngine.RenderData; const Helper = require('./helper'); const Types = require('./types'); @@ -228,11 +227,8 @@ let Graphics = cc.Class({ onDestroy () { this._super(); - let datas = this._renderDatas; - for (let i = 0, l = datas.length; i < l; i++) { - RenderData.free(datas[i]); - } - datas.length = 0; + // all requested render data will be destroyed by RenderComponent + this._renderDatas.length = 0; }, _activateMaterial () { @@ -428,9 +424,9 @@ let Graphics = cc.Class({ if (clean) { this._paths.length = 0; this._points.length = 0; - + // manually destroy render datas for (let i = 0, l = datas.length; i < l; i++) { - RenderData.free(datas[i]); + this.destroyRenderData(datas[i]); } datas.length = 0; } diff --git a/cocos2d/core/renderer/assemblers/graphics/graphics-assembler.js b/cocos2d/core/renderer/assemblers/graphics/graphics-assembler.js index fae5b37c9e..32ad385df3 100644 --- a/cocos2d/core/renderer/assemblers/graphics/graphics-assembler.js +++ b/cocos2d/core/renderer/assemblers/graphics/graphics-assembler.js @@ -36,7 +36,6 @@ const MAX_INDICE = MAX_VERTEX * 2; const js = require('../../../platform/js'); const assembler = require('../assembler'); const renderEngine = require('../../render-engine'); -const RenderData = renderEngine.RenderData; const math = renderEngine.math; const PI = Math.PI; @@ -72,7 +71,7 @@ let graphicsAssembler = js.addon({ updateRenderData (graphics) { let datas = graphics._renderDatas; if (datas.length === 0) { - datas.push(RenderData.alloc()); + datas.push(graphics.requestRenderData()); } for (let i = 0, l = datas.length; i < l; i++) { @@ -128,14 +127,14 @@ let graphicsAssembler = js.addon({ let maxVertsCount = renderData.dataLength + cverts; if (maxVertsCount > MAX_VERTEX || maxVertsCount * 3 > MAX_INDICE) { - renderData = RenderData.alloc(); + renderData = graphics.requestRenderData(); } return renderData; }, stroke (graphics) { if (graphics._renderDatas.length === 0) { - graphics._renderDatas.push(RenderData.alloc()); + graphics._renderDatas.push(graphics.requestRenderData()); } _curColor = graphics._strokeColor._val; @@ -148,7 +147,7 @@ let graphicsAssembler = js.addon({ fill (graphics) { if (graphics._renderDatas.length === 0) { - graphics._renderDatas.push(RenderData.alloc()); + graphics._renderDatas.push(graphics.requestRenderData()); } _curColor = graphics._fillColor._val; diff --git a/cocos2d/core/renderer/assemblers/label/bmfont-assembler.js b/cocos2d/core/renderer/assemblers/label/bmfont-assembler.js index 75a7eb0143..78d55a71de 100644 --- a/cocos2d/core/renderer/assemblers/label/bmfont-assembler.js +++ b/cocos2d/core/renderer/assemblers/label/bmfont-assembler.js @@ -24,7 +24,6 @@ ****************************************************************************/ const renderEngine = require('../../render-engine'); -const RenderData = renderEngine.RenderData; const Label = require('../../../components/CCLabel'); const Overflow = Label.Overflow; @@ -137,7 +136,7 @@ let _maxLineWidth = 0; module.exports = { createData (comp) { - return RenderData.alloc(); + return comp.requestRenderData(); }, update (comp) { diff --git a/cocos2d/core/renderer/assemblers/label/ttf-assembler.js b/cocos2d/core/renderer/assemblers/label/ttf-assembler.js index 87a2e0a880..c64a1f6e99 100644 --- a/cocos2d/core/renderer/assemblers/label/ttf-assembler.js +++ b/cocos2d/core/renderer/assemblers/label/ttf-assembler.js @@ -24,7 +24,6 @@ ****************************************************************************/ const renderEngine = require('../../render-engine'); -const RenderData = renderEngine.RenderData; const Label = require('../../../components/CCLabel'); const LabelOutline = require('../../../components/CCLabelOutline'); @@ -73,7 +72,7 @@ let _isUnderline = false; module.exports = { createData (comp) { - let renderData = RenderData.alloc(); + let renderData = comp.requestRenderData(); renderData.dataLength = 4; renderData.vertexCount = 4; diff --git a/cocos2d/core/renderer/assemblers/mask-assembler.js b/cocos2d/core/renderer/assemblers/mask-assembler.js index cc74c680b8..6b7994f22f 100644 --- a/cocos2d/core/renderer/assemblers/mask-assembler.js +++ b/cocos2d/core/renderer/assemblers/mask-assembler.js @@ -27,7 +27,6 @@ const StencilManager = require('../stencil-manager'); const Node = require('../../CCNode'); const Mask = require('../../components/CCMask'); const renderEngine = require('../render-engine'); -const RenderData = renderEngine.RenderData; const js = require('../../platform/js'); const assembler = require('./assembler'); @@ -81,7 +80,7 @@ let maskFrontAssembler = js.addon({ } else { // for updateGraphics calculation - mask._renderData = RenderData.alloc(); + mask._renderData = mask.requestRenderData(); } } let renderData = mask._renderData; diff --git a/cocos2d/core/renderer/assemblers/motion-streak-assembler.js b/cocos2d/core/renderer/assemblers/motion-streak-assembler.js index 2a85622c21..5c144d9a45 100644 --- a/cocos2d/core/renderer/assemblers/motion-streak-assembler.js +++ b/cocos2d/core/renderer/assemblers/motion-streak-assembler.js @@ -27,7 +27,6 @@ const js = require('../../platform/js'); const assembler = require('./assembler'); const MotionStreak = require('../../../motion-streak/CCMotionStreak'); const renderEngine = require('../render-engine'); -const RenderData = renderEngine.RenderData; function Point (point, dir) { this.point = point || cc.v2(); @@ -96,7 +95,7 @@ var motionStreakAssembler = js.addon({ update (comp, dt) { let renderData = comp._renderData; if (!renderData) { - renderData = comp._renderData = RenderData.alloc(); + renderData = comp._renderData = comp.requestRenderData(); } if (CC_EDITOR && !comp.preview) return; diff --git a/cocos2d/core/renderer/assemblers/particle-system-assembler.js b/cocos2d/core/renderer/assemblers/particle-system-assembler.js index 0673418e12..02c0ed4842 100644 --- a/cocos2d/core/renderer/assemblers/particle-system-assembler.js +++ b/cocos2d/core/renderer/assemblers/particle-system-assembler.js @@ -27,7 +27,6 @@ const js = require('../../platform/js'); const assembler = require('./assembler'); const ParticleSystem = require('../../../particle/CCParticleSystem'); const renderEngine = require('../render-engine'); -const RenderData = renderEngine.RenderData; var particleSystemAssembler = js.addon({ useModel: true, @@ -55,7 +54,7 @@ var particleSystemAssembler = js.addon({ updateRenderData (comp) { if (!comp._renderData) { - comp._renderData = RenderData.alloc(); + comp._renderData = comp.requestRenderData(); comp._renderData.dataLength = 0; } diff --git a/cocos2d/core/renderer/assemblers/spine-assembler.js b/cocos2d/core/renderer/assemblers/spine-assembler.js index 9501f13fd5..3be861b815 100644 --- a/cocos2d/core/renderer/assemblers/spine-assembler.js +++ b/cocos2d/core/renderer/assemblers/spine-assembler.js @@ -31,7 +31,6 @@ const renderer = require('../'); const renderEngine = require('../render-engine'); const gfx = renderEngine.gfx; const SpriteMaterial = renderEngine.SpriteMaterial; -const RenderData = renderEngine.RenderData; let _sharedMaterials = {}; @@ -149,7 +148,7 @@ var spineAssembler = js.addon({ let attachment, slot; let dataId = 0, datas = comp._renderDatas, data = datas[dataId], newData = false; if (!data) { - data = datas[dataId] = RenderData.alloc(); + data = datas[dataId] = comp.requestRenderData(); } data.dataLength = 0; let indices; @@ -204,7 +203,7 @@ var spineAssembler = js.addon({ // gen new data dataId++; if (!datas[dataId]) { - data = datas[dataId] = RenderData.alloc(); + data = datas[dataId] = comp.requestRenderData(); } data.dataLength = vertexCount; data.effect = currEffect; diff --git a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js index 40517222ac..dfb67c8bd4 100644 --- a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js @@ -25,13 +25,12 @@ const Sprite = require('../../../components/CCSprite'); const FillType = Sprite.FillType; -const RenderData = require('../../render-engine').RenderData; const simpleRenderUtil = require('./simple'); module.exports = { createData (sprite) { - let renderData = RenderData.alloc(); + let renderData = sprite.requestRenderData(); renderData.dataLength = 4; renderData.vertexCount = 4; renderData.indiceCount = 6; diff --git a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js index e03e9b7988..0f22ec5399 100644 --- a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js @@ -24,7 +24,6 @@ ****************************************************************************/ const Sprite = require('../../../components/CCSprite'); -const RenderData = require('../../render-engine').RenderData; const simpleRenderUtil = require('./simple'); @@ -40,7 +39,7 @@ module.exports = { _triangles: [], createData (sprite) { - return RenderData.alloc(); + return sprite.requestRenderData(); }, update (sprite) { diff --git a/cocos2d/core/renderer/assemblers/sprite/simple.js b/cocos2d/core/renderer/assemblers/sprite/simple.js index 58bfefed86..b1a271decc 100644 --- a/cocos2d/core/renderer/assemblers/sprite/simple.js +++ b/cocos2d/core/renderer/assemblers/sprite/simple.js @@ -24,11 +24,10 @@ ****************************************************************************/ const Sprite = require('../../../components/CCSprite'); -const RenderData = require('../../render-engine').RenderData; module.exports = { createData (sprite) { - let renderData = RenderData.alloc(); + let renderData = sprite.requestRenderData(); renderData.dataLength = 4; renderData.vertexCount = 4; renderData.indiceCount = 6; diff --git a/cocos2d/core/renderer/assemblers/sprite/sliced.js b/cocos2d/core/renderer/assemblers/sprite/sliced.js index f43328f434..43813fc167 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sliced.js +++ b/cocos2d/core/renderer/assemblers/sprite/sliced.js @@ -25,11 +25,10 @@ const Sprite = require('../../../components/CCSprite'); const FillType = Sprite.FillType; -const RenderData = require('../../render-engine').RenderData; module.exports = { createData (sprite) { - let renderData = RenderData.alloc(); + let renderData = sprite.requestRenderData(); renderData.dataLength = 4; renderData.vertexCount = 16; renderData.indiceCount = 54; diff --git a/cocos2d/core/renderer/assemblers/sprite/sprite-assembler.js b/cocos2d/core/renderer/assemblers/sprite/sprite-assembler.js index 3209b35439..0fd3c10842 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sprite-assembler.js +++ b/cocos2d/core/renderer/assemblers/sprite/sprite-assembler.js @@ -29,7 +29,6 @@ const Sprite = require('../../../components/CCSprite'); const renderEngine = require('../../render-engine'); const SpriteType = Sprite.Type; const FillType = Sprite.FillType; -const RenderData = renderEngine.RenderData; const simpleRenderUtil = require('./simple'); const slicedRenderUtil = require('./sliced'); diff --git a/cocos2d/core/renderer/assemblers/sprite/tiled.js b/cocos2d/core/renderer/assemblers/sprite/tiled.js index 8989eb46c9..2b2e88fbef 100644 --- a/cocos2d/core/renderer/assemblers/sprite/tiled.js +++ b/cocos2d/core/renderer/assemblers/sprite/tiled.js @@ -24,11 +24,10 @@ ****************************************************************************/ const Sprite = require('../../../components/CCSprite'); -const RenderData = require('../../render-engine').RenderData; module.exports = { createData (sprite) { - return RenderData.alloc(); + return sprite.requestRenderData(); }, update (sprite) { diff --git a/cocos2d/core/renderer/assemblers/tmx-layer-assembler.js b/cocos2d/core/renderer/assemblers/tmx-layer-assembler.js index 1979974984..e22787edfd 100644 --- a/cocos2d/core/renderer/assemblers/tmx-layer-assembler.js +++ b/cocos2d/core/renderer/assemblers/tmx-layer-assembler.js @@ -29,7 +29,6 @@ const TiledMap = require('../../../tilemap/CCTiledMap'); const js = require('../../platform/js'); const assembler = require('./assembler'); const renderEngine = require('../render-engine'); -const RenderData = renderEngine.RenderData; const Orientation = TiledMap.Orientation; const TileFlag = TiledMap.TileFlag; @@ -45,14 +44,10 @@ let _mat4_temp = mat4.create(); let _vec3_temp = vec3.create(); let tmxAssembler = js.addon({ - createData (comp) { - return RenderData.alloc(); - }, - updateRenderData (comp) { let renderData = comp._renderData; if (!renderData) { - renderData = comp._renderData = this.createData(comp); + renderData = comp._renderData = comp.requestRenderData(); } let size = comp.node._contentSize; diff --git a/cocos2d/motion-streak/CCMotionStreak.js b/cocos2d/motion-streak/CCMotionStreak.js index 1d59f909d0..c7e06ea290 100644 --- a/cocos2d/motion-streak/CCMotionStreak.js +++ b/cocos2d/motion-streak/CCMotionStreak.js @@ -27,7 +27,6 @@ const RenderComponent = require('../core/components/CCRenderComponent'); const renderer = require('../core/renderer'); const renderEngine = require('../core/renderer/render-engine'); const SpriteMaterial = renderEngine.SpriteMaterial; -const RenderData = renderEngine.RenderData; /** * !#en diff --git a/cocos2d/tilemap/CCTiledLayer.js b/cocos2d/tilemap/CCTiledLayer.js index 46e4dedab0..66197573a8 100644 --- a/cocos2d/tilemap/CCTiledLayer.js +++ b/cocos2d/tilemap/CCTiledLayer.js @@ -26,7 +26,6 @@ const RenderComponent = require('../core/components/CCRenderComponent'); const renderer = require('../core/renderer'); const renderEngine = require('../core/renderer/render-engine'); const SpriteMaterial = renderEngine.SpriteMaterial; -const RenderData = renderEngine.RenderData; /** * !#en Render the TMX layer. diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js index f9057bd35b..288ae5a3c9 100644 --- a/extensions/dragonbones/ArmatureDisplay.js +++ b/extensions/dragonbones/ArmatureDisplay.js @@ -26,7 +26,6 @@ const RenderComponent = require('../../cocos2d/core/components/CCRenderComponent'); const renderer = require('../../cocos2d/core/renderer'); const renderEngine = require('../../cocos2d/core/renderer/render-engine'); -const RenderData = renderEngine.RenderData; const SpriteMaterial = renderEngine.SpriteMaterial; let EventTarget = require('../../cocos2d/core/event/event-target'); diff --git a/extensions/dragonbones/dragonblones-assembler.js b/extensions/dragonbones/dragonblones-assembler.js index 9e3629345a..95d945b785 100644 --- a/extensions/dragonbones/dragonblones-assembler.js +++ b/extensions/dragonbones/dragonblones-assembler.js @@ -26,7 +26,6 @@ const Armature = require('./ArmatureDisplay'); const renderEngine = require('../../cocos2d/core/renderer/render-engine'); -const RenderData = renderEngine.RenderData; const math = renderEngine.math; const js = require('../../cocos2d/core/platform/js'); @@ -43,11 +42,6 @@ let _vbuf, _uintbuf, _worldMatrix; let armatureAssembler = js.addon({ - - createData (comp) { - return RenderData.alloc(); - }, - updateRenderData (comp) { this.datas.length = 0; @@ -58,7 +52,7 @@ let armatureAssembler = js.addon({ let renderData = comp._renderData; if (!renderData) { - renderData = comp._renderData = this.createData(comp); + renderData = comp._renderData = comp.requestRenderData(); } let size = comp.node._contentSize; diff --git a/extensions/spine/Skeleton.js b/extensions/spine/Skeleton.js index 33dd32d51d..9aad4b7bd0 100644 --- a/extensions/spine/Skeleton.js +++ b/extensions/spine/Skeleton.js @@ -27,7 +27,6 @@ const TrackEntryListeners = require('./track-entry-listeners'); const RenderComponent = require('../../cocos2d/core/components/CCRenderComponent'); const spine = require('./lib/spine'); const renderEngine = require('../../cocos2d/core/renderer/render-engine'); -const RenderData = renderEngine.RenderData; const SpriteMaterial = renderEngine.SpriteMaterial; const Node = require('../../cocos2d/core/CCNode'); const Graphics = require('../../cocos2d/core/graphics/graphics'); @@ -392,12 +391,9 @@ sp.Skeleton = cc.Class({ onDestroy () { this._super(); - // TODO: avoid free twice render data shared between debug renderer and skeleton - // this._debugNode.destroy(); + this._debugNode.destroy(); this._debugRenderer.clear(); - for (let i = 0; i < this._renderDatas.length; i++) { - RenderData.free(this._renderDatas[i]); - } + // Render datas will be destroyed automatically by RenderComponent.onDestroy this._renderDatas.length = 0; },