Merge pull request #13589 from Popov72/fix-psys-update

sebavan · web-flow · commit 1a26b0643973 · 2023-03-06T15:22:29.000+01:00
Particle systems: Fix crash when setting updateInAnimate to true
diff --git a/packages/dev/core/src/Particles/gpuParticleSystem.ts b/packages/dev/core/src/Particles/gpuParticleSystem.ts
@@ -1540,7 +1540,7 @@ export class GPUParticleSystem extends BaseParticleSystem implements IDisposable
 
     /** @internal */
     public _update(emitterWM?: Matrix): void {
-        if (!this.emitter) {
+        if (!this.emitter || !this._targetBuffer) {
             return;
         }
 
diff --git a/packages/dev/core/src/ShadersWGSL/gpuUpdateParticles.compute.fx b/packages/dev/core/src/ShadersWGSL/gpuUpdateParticles.compute.fx
@@ -169,7 +169,7 @@ fn getRandomVec4(offset : f32, vertexID : f32) -> vec4<f32> {
     return textureLoad(randomTexture, vec2<i32>(i32(vertexID * offset / params.currentCount * f32(params.randomTextureSize)) % params.randomTextureSize, 0), 0);
 }
 
-@stage(compute) @workgroup_size(64)
+@compute @workgroup_size(64)
 fn main(@builtin(global_invocation_id) GlobalInvocationID : vec3<u32>) {
     let index : u32 = GlobalInvocationID.x;
     let vertexID : f32 = f32(index);

Original file line number	Diff line number	Diff line change
`@@ -1540,7 +1540,7 @@ export class GPUParticleSystem extends BaseParticleSystem implements IDisposable`
`1540`	`1540`
`1541`	`1541`	`/** @internal */`
`1542`	`1542`	`public _update(emitterWM?: Matrix): void {`
`1543`		`- if (!this.emitter) {`
	`1543`	`+ if (!this.emitter \|\| !this._targetBuffer) {`
`1544`	`1544`	`return;`
`1545`	`1545`	`}`
`1546`	`1546`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ fn getRandomVec4(offset : f32, vertexID : f32) -> vec4<f32> {`
`169`	`169`	`return textureLoad(randomTexture, vec2<i32>(i32(vertexID * offset / params.currentCount * f32(params.randomTextureSize)) % params.randomTextureSize, 0), 0);`
`170`	`170`	`}`
`171`	`171`
`172`		`-@stage(compute) @workgroup_size(64)`
	`172`	`+@compute @workgroup_size(64)`
`173`	`173`	`fn main(@builtin(global_invocation_id) GlobalInvocationID : vec3<u32>) {`
`174`	`174`	`let index : u32 = GlobalInvocationID.x;`
`175`	`175`	`let vertexID : f32 = f32(index);`