Fix the display error of particle system 2d. (#7707)

* Fix the display error of particle system 2d.

* fix public
This commit is contained in:
cary
2020-11-05 17:23:37 +08:00
committed by GitHub
parent 594ea62016
commit 89bfa22581
3 changed files with 27 additions and 36 deletions
+21 -10
View File
@@ -106,6 +106,7 @@ export class Simulator {
public active = false;
public uvFilled = 0;
public finished = false;
public declare renderData;
private readyToPlay = true;
private elapsed = 0;
private emitCounter = 0;
@@ -233,12 +234,7 @@ export class Simulator {
};
public updateUVs (force?: boolean) {
const assembler = this.sys.assembler;
if (!assembler) {
return;
}
const renderData = assembler.renderData;
const renderData = this.renderData;
if (renderData && this.sys._renderSpriteFrame) {
const vbuf = renderData.vData;
const uv = this.sys._renderSpriteFrame.uv;
@@ -328,7 +324,6 @@ export class Simulator {
const psys = this.sys;
const node = psys.node;
const particles = this.particles;
const assembler = this.sys.assembler!;
// Calculate pos
node.updateWorldTransform();
@@ -364,10 +359,10 @@ export class Simulator {
}
// Request buffer for particles
const renderData = assembler.renderData;
const renderData = this.renderData;
const particleCount = particles.length;
assembler.reset();
assembler.requestData(particleCount * formatBytes, particleCount * 6);
renderData.reset();
this.requestData(particleCount * 4, particleCount * 6);
// Fill up uvs
if (particleCount > this.uvFilled) {
@@ -471,4 +466,20 @@ export class Simulator {
psys._finishedSimulation();
}
}
requestData (vertexCount: number, indicesCount: number) {
let offset = this.renderData.indicesCount;
this.renderData.request(vertexCount, indicesCount);
const count = this.renderData.indicesCount / 6;
const buffer = this.renderData.iData;
for (let i = offset; i < count; i++) {
const vId = i * 4;
buffer[offset++] = vId;
buffer[offset++] = vId + 1;
buffer[offset++] = vId + 2;
buffer[offset++] = vId + 1;
buffer[offset++] = vId + 3;
buffer[offset++] = vId + 2;
}
}
}
@@ -30,38 +30,18 @@ import { UI } from '../core/renderer/ui/ui';
import { PositionType } from './define';
export const ParticleAssembler: IAssembler = {
renderData: MeshRenderData,
createData (comp: ParticleSystem2D) {
this.renderData = MeshRenderData.add();
},
requestData (vertexCount: number, indicesCount: number) {
let offset = this.renderData.indicesCount;
this.renderData.request(vertexCount, indicesCount);
const count = this.renderData.indicesCount / 6;
const buffer = this.renderData.iData;
for (let i = offset; i < count; i++) {
const vId = i * 4;
buffer[offset++] = vId;
buffer[offset++] = vId + 1;
buffer[offset++] = vId + 2;
buffer[offset++] = vId + 1;
buffer[offset++] = vId + 3;
buffer[offset++] = vId + 2;
}
},
reset () {
this.renderData.reset();
return MeshRenderData.add();
},
updateRenderData () {
},
fillBuffers (comp: ParticleSystem2D, renderer: UI) {
if (comp === null) {
return;
}
const renderData = this.renderData;
if (renderData.vertexCount === 0 || renderData.indicesCount == 0) {
const renderData = comp._simulator.renderData;
if (renderData.vertexCount === 0 || renderData.indicesCount === 0) {
return;
}
@@ -97,7 +77,7 @@ export const ParticleAssembler: IAssembler = {
const iLen = renderData.indicesCount;
for (let i = 0; i < iLen; i++) {
iBuf[indicesOffset++] = iData[i];
iBuf[indicesOffset++] = iData[i] + vertexId;
}
}
}
+2 -2
View File
@@ -662,7 +662,7 @@ export class ParticleSystem2D extends UIRenderable {
public aspectRatio: number = 1;
// The temporary SpriteFrame object used for the renderer. Because there is no corresponding asset, it can't be serialized.
public declare _renderSpriteFrame: SpriteFrame | null;
private declare _simulator: Simulator;
public declare _simulator: Simulator;
private declare _previewTimer;
private declare _focused: boolean;
private declare _plistFile;
@@ -800,7 +800,7 @@ bv
}
if (this._assembler && this._assembler.createData){
this._assembler.createData(this);
this._simulator.renderData = this._assembler.createData(this);
}
}