Skip to content

Particle System: Add a parameter to also clone textures when cloning a particle system #13318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2022
Merged

Particle System: Add a parameter to also clone textures when cloning a particle system #13318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/dev/core/src/Particles/gpuParticleSystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,9 +1808,10 @@ export class GPUParticleSystem extends BaseParticleSystem implements IDisposable
* Clones the particle system.
* @param name The name of the cloned object
* @param newEmitter The new emitter to use
* @param cloneTexture Also clone the textures if true
* @returns the cloned particle system
*/
public clone(name: string, newEmitter: any): GPUParticleSystem {
public clone(name: string, newEmitter: any, cloneTexture = false): GPUParticleSystem {
const custom = { ...this._customWrappers };
let program: any = null;
const engine = this._engine as any;
Expand All @@ -1831,7 +1832,7 @@ export class GPUParticleSystem extends BaseParticleSystem implements IDisposable
}
}

const serialization = this.serialize();
const serialization = this.serialize(cloneTexture);
const result = GPUParticleSystem.Parse(serialization, this._scene || this._engine, this._rootUrl);
result.name = name;
result.customShader = program;
Expand Down
5 changes: 3 additions & 2 deletions packages/dev/core/src/Particles/particleSystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2232,9 +2232,10 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
* Clones the particle system.
* @param name The name of the cloned object
* @param newEmitter The new emitter to use
* @param cloneTexture Also clone the textures if true
* @returns the cloned particle system
*/
public clone(name: string, newEmitter: any): ParticleSystem {
public clone(name: string, newEmitter: any, cloneTexture = false): ParticleSystem {
const custom = { ...this._customWrappers };
let program: any = null;
const engine = this._engine as Engine;
Expand All @@ -2251,7 +2252,7 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
}
}

const serialization = this.serialize();
const serialization = this.serialize(cloneTexture);
const result = ParticleSystem.Parse(serialization, this._scene || this._engine, this._rootUrl);
result.name = name;
result.customShader = program;
Expand Down