mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
Improve render data management by RenderComponent
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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();
|
||||
},
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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');
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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');
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user